[SDC] Onboarding 1710 rebase.

Change-Id: If3b6b81d221fde13908f1e8160db6f7d9433c535
Signed-off-by: Avi Ziv <avi.ziv@amdocs.com>

1 files changed, 13 insertions, 25 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 9965624256..a42219e96f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -179,41 +179,29 @@ node_types:
         required: true
         status: SUPPORTED
     attributes:
-      FSB1_FSB1_Internal_network_id:
-        type: list
+      FSB1_FSB_OAM_status:
+        type: string
         status: SUPPORTED
-        entry_schema:
-          type: string
-      FSB1_FSB1_Internal_addresses:
-        type: list
+      FSB1_FSB2_Internal_tenant_id:
+        type: string
+        status: SUPPORTED
+      FSB1_FSB1_Internal_network_id:
+        type: string
         status: SUPPORTED
-        entry_schema:
-          type: string
       FSB1_accessIPv6:
-        type: list
+        type: string
         status: SUPPORTED
-        entry_schema:
-          type: string
       FSB1_addresses:
-        type: list
+        type: map
         status: SUPPORTED
         entry_schema:
-          type: string
+          type: org.openecomp.datatypes.heat.novaServer.network.AddressInfo
       FSB1_FSB2_Internal_network_id:
-        type: list
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      FSB1_FSB2_Internal_index:
-        type: list
+        type: string
         status: SUPPORTED
-        entry_schema:
-          type: string
-      FSB1_FSB_OAM_oam_index:
-        type: list
+      FSB1_FSB1_Internal_device_owner:
+        type: string
         status: SUPPORTED
-        entry_schema:
-          type: string
     requirements:
     - dependency_FSB1_FSB1_Internal:
         capability: tosca.capabilities.Node