commit 51d50f0ef642e0f996a1c8b8d2ef4838bdfec892
author Tal Gitelman <tg851x@intl.att.com> Sun Dec 10 18:55:03 2017 +0200
committer Tal Gitelman <tg851x@intl.att.com> Sun Dec 10 19:33:38 2017 +0200
tree 3ac236a864d74d19b0f5c9020891a7a7e5c31b44
parent b5cc2e0695f195716d6ccdc65e73807a6632ec70

Final commit to master merge from

Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507
Issue-ID: SDC-714
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

catalog-ui/src/app/models.ts

diff --git a/catalog-ui/src/app/models.ts b/catalog-ui/src/app/models.ts
index ec70ebe..0145253 100644
--- a/catalog-ui/src/app/models.ts
+++ b/catalog-ui/src/app/models.ts
@@ -40,6 +40,7 @@
 export * from './models/componentsInstances/componentInstance';
 export * from './models/componentsInstances/resourceInstance';
 export * from './models/componentsInstances/serviceInstance';
+export * from './models/componentsInstances/serviceProxyInstance';
 export * from './models/csar-component';
 //export * from './models/data-type-properties';
 export * from './models/properties-inputs/property-be-model';
@@ -74,7 +75,9 @@
 export * from './models/graph/nodes/common-ci-node-base';
 export * from './models/graph/nodes/composition-graph-nodes/composition-ci-node-base';
 export * from './models/graph/nodes/composition-graph-nodes/composition-ci-node-cp';
+export * from './models/graph/nodes/composition-graph-nodes/composition-ci-node-configuration';
 export * from './models/graph/nodes/composition-graph-nodes/composition-ci-node-service';
+export * from './models/graph/nodes/composition-graph-nodes/composition-ci-node-service-proxy';
 export * from './models/graph/nodes/composition-graph-nodes/composition-ci-node-ucpe-cp';
 export * from './models/graph/nodes/composition-graph-nodes/composition-ci-node-ucpe';
 export * from './models/graph/nodes/composition-graph-nodes/composition-ci-node-vf';
@@ -83,7 +86,7 @@
 export * from './models/graph/nodes/modules-graph-nodes/module-node-base';
 export * from './models/graph/nodes/nodes-factory';
 export * from './models/graph/point';
-export * from './models/graph/relationMenuObjects';
+export * from './models/graph/connectRelationModel';
 export * from './models/graph/relationship';
 export * from './models/heat-parameters';
 export * from './models/input-property-base';
@@ -103,6 +106,8 @@
 export * from './models/component-metadata';
 export * from './models/modal';
 export * from './models/button';
+export * from './models/wizard-step';
+export * from './models/radio-button';
 export * from './models/filter-properties-assignment-data'
 export * from './models/properties-inputs/input-be-model'