[sdc] - last merges before moving to LF

Change-Id: I0df3ec795f0de84229ea4bb4806ec8f959243557
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

2 files changed, 24 insertions, 72 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 1f8e6d3331..9965624256 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
@@ -13,11 +13,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_FSB_OAM_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_FSB1_Internal_ip_requirements:
         type: list
         required: true
@@ -25,11 +23,9 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_FSB1_Internal_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       compute_FSB1_metadata:
         type: list
         required: true
@@ -43,11 +39,9 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_FSB2_Internal_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_FSB2_Internal_ip_requirements:
         type: list
         required: true
@@ -65,11 +59,9 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_FSB2_Internal_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_FSB_OAM_ip_requirements:
         type: list
         required: true
@@ -77,11 +69,9 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
       port_FSB1_Internal_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_FSB1_Internal_vlan_requirements:
         type: list
         required: true
@@ -89,21 +79,17 @@ node_types:
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
       port_FSB2_Internal_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_FSB1_Internal_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
       port_FSB_OAM_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_FSB_OAM_network:
         type: list
         required: true
@@ -111,17 +97,13 @@ node_types:
         entry_schema:
           type: string
       port_FSB1_Internal_network_role:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_FSB_OAM_subnetpoolid:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
       port_FSB_OAM_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -147,11 +129,9 @@ node_types:
         constraints:
         - greater_or_equal: 0
       port_FSB_OAM_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_FSB2_Internal_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -165,11 +145,9 @@ node_types:
         required: true
         status: SUPPORTED
       port_FSB1_Internal_order:
-        type: list
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: integer
       port_FSB_OAM_fixed_ips:
         type: list
         required: true
@@ -197,11 +175,9 @@ node_types:
         entry_schema:
           type: string
       port_FSB2_Internal_network_role_tag:
-        type: list
+        type: string
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
     attributes:
       FSB1_FSB1_Internal_network_id:
         type: list
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/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml
index ec54c8d254..106cdcd388 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml
@@ -15,20 +15,16 @@ topology_template:
       type: string
       required: true
     port_FSB_OAM_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_FSB1_Internal_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
     port_FSB1_Internal_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     compute_FSB1_metadata:
       type: list
       required: true
@@ -40,10 +36,8 @@ topology_template:
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
     port_FSB2_Internal_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_FSB2_Internal_ip_requirements:
       type: list
       required: true
@@ -58,53 +52,41 @@ topology_template:
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
     port_FSB2_Internal_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_FSB_OAM_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
     port_FSB1_Internal_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_FSB1_Internal_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
     port_FSB2_Internal_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_FSB1_Internal_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
     port_FSB_OAM_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_FSB_OAM_network:
       type: list
       required: true
       entry_schema:
         type: string
     port_FSB1_Internal_network_role:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_FSB_OAM_subnetpoolid:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_FSB_OAM_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -126,10 +108,8 @@ topology_template:
       constraints:
       - greater_or_equal: 0
     port_FSB_OAM_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_FSB2_Internal_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -140,10 +120,8 @@ topology_template:
       type: org.openecomp.datatypes.Naming
       required: true
     port_FSB1_Internal_order:
-      type: list
+      type: integer
       required: true
-      entry_schema:
-        type: integer
     port_FSB_OAM_fixed_ips:
       type: list
       required: true
@@ -166,10 +144,8 @@ topology_template:
       entry_schema:
         type: string
     port_FSB2_Internal_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
   node_templates:
     FSB1_FSB1_Internal:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port