[sdc] - latest code changes

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

2 files changed, 48 insertions, 120 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 f50192de3c..1f8e6d3331 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
@@ -23,7 +23,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       port_FSB1_Internal_subnetpoolid:
         type: list
         required: true
@@ -41,7 +41,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.VlanRequirements
       port_FSB2_Internal_order:
         type: list
         required: true
@@ -53,7 +53,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       vm_flavor_name:
         type: string
         required: true
@@ -63,7 +63,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.VlanRequirements
       port_FSB2_Internal_network_role:
         type: list
         required: true
@@ -75,7 +75,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.IpRequirements
       port_FSB1_Internal_network_role_tag:
         type: list
         required: true
@@ -87,7 +87,7 @@ node_types:
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: org.openecomp.datatypes.network.VlanRequirements
       port_FSB2_Internal_subnetpoolid:
         type: list
         required: true
@@ -95,11 +95,9 @@ node_types:
         entry_schema:
           type: string
       port_FSB1_Internal_exCP_naming:
-        type: list
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       port_FSB_OAM_network_role:
         type: list
         required: true
@@ -125,11 +123,9 @@ node_types:
         entry_schema:
           type: string
       port_FSB_OAM_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       compute_FSB1_availability_zone:
         type: list
         required: true
@@ -157,21 +153,17 @@ node_types:
         entry_schema:
           type: integer
       port_FSB2_Internal_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       port_FSB2_Internal_mac_address:
         type: string
         required: true
         status: SUPPORTED
       port_FSB2_Internal_exCP_naming:
-        type: list
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       port_FSB1_Internal_order:
         type: list
         required: true
@@ -191,17 +183,13 @@ node_types:
         entry_schema:
           type: string
       port_FSB1_Internal_mac_requirements:
-        type: list
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       port_FSB_OAM_exCP_naming:
-        type: list
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: json
       compute_FSB1_name:
         type: list
         required: true
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 62d483639b..ec54c8d254 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
@@ -23,7 +23,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     port_FSB1_Internal_subnetpoolid:
       type: list
       required: true
@@ -38,7 +38,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.VlanRequirements
     port_FSB2_Internal_order:
       type: list
       required: true
@@ -48,7 +48,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     vm_flavor_name:
       type: string
       required: true
@@ -56,7 +56,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.VlanRequirements
     port_FSB2_Internal_network_role:
       type: list
       required: true
@@ -66,7 +66,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     port_FSB1_Internal_network_role_tag:
       type: list
       required: true
@@ -76,17 +76,15 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.VlanRequirements
     port_FSB2_Internal_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
     port_FSB1_Internal_exCP_naming:
-      type: list
+      type: org.openecomp.datatypes.Naming
       required: true
-      entry_schema:
-        type: json
     port_FSB_OAM_network_role:
       type: list
       required: true
@@ -108,10 +106,8 @@ topology_template:
       entry_schema:
         type: string
     port_FSB_OAM_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     compute_FSB1_availability_zone:
       type: list
       required: true
@@ -135,18 +131,14 @@ topology_template:
       entry_schema:
         type: integer
     port_FSB2_Internal_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     port_FSB2_Internal_mac_address:
       type: string
       required: true
     port_FSB2_Internal_exCP_naming:
-      type: list
+      type: org.openecomp.datatypes.Naming
       required: true
-      entry_schema:
-        type: json
     port_FSB1_Internal_order:
       type: list
       required: true
@@ -163,15 +155,11 @@ topology_template:
       entry_schema:
         type: string
     port_FSB1_Internal_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     port_FSB_OAM_exCP_naming:
-      type: list
+      type: org.openecomp.datatypes.Naming
       required: true
-      entry_schema:
-        type: json
     compute_FSB1_name:
       type: list
       required: true
@@ -187,37 +175,21 @@ topology_template:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input:
-          - port_FSB1_Internal_exCP_naming
-          - index_value
+          get_input: port_FSB1_Internal_exCP_naming
         vlan_requirements:
-          get_input:
-          - port_FSB1_Internal_vlan_requirements
-          - index_value
+          get_input: port_FSB1_Internal_vlan_requirements
         ip_requirements:
-          get_input:
-          - port_FSB1_Internal_ip_requirements
-          - index_value
+          get_input: port_FSB1_Internal_ip_requirements
         network_role_tag:
-          get_input:
-          - port_FSB1_Internal_network_role_tag
-          - index_value
+          get_input: port_FSB1_Internal_network_role_tag
         mac_requirements:
-          get_input:
-          - port_FSB1_Internal_mac_requirements
-          - index_value
+          get_input: port_FSB1_Internal_mac_requirements
         order:
-          get_input:
-          - port_FSB1_Internal_order
-          - index_value
+          get_input: port_FSB1_Internal_order
         network_role:
-          get_input:
-          - port_FSB1_Internal_network_role
-          - index_value
+          get_input: port_FSB1_Internal_network_role
         subnetpoolid:
-          get_input:
-          - port_FSB1_Internal_subnetpoolid
-          - index_value
+          get_input: port_FSB1_Internal_subnetpoolid
         network:
           get_input:
           - port_FSB1_Internal_network
@@ -233,37 +205,21 @@ topology_template:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input:
-          - port_FSB2_Internal_exCP_naming
-          - index_value
+          get_input: port_FSB2_Internal_exCP_naming
         vlan_requirements:
-          get_input:
-          - port_FSB2_Internal_vlan_requirements
-          - index_value
+          get_input: port_FSB2_Internal_vlan_requirements
         ip_requirements:
-          get_input:
-          - port_FSB2_Internal_ip_requirements
-          - index_value
+          get_input: port_FSB2_Internal_ip_requirements
         network_role_tag:
-          get_input:
-          - port_FSB2_Internal_network_role_tag
-          - index_value
+          get_input: port_FSB2_Internal_network_role_tag
         mac_requirements:
-          get_input:
-          - port_FSB2_Internal_mac_requirements
-          - index_value
+          get_input: port_FSB2_Internal_mac_requirements
         order:
-          get_input:
-          - port_FSB2_Internal_order
-          - index_value
+          get_input: port_FSB2_Internal_order
         network_role:
-          get_input:
-          - port_FSB2_Internal_network_role
-          - index_value
+          get_input: port_FSB2_Internal_network_role
         subnetpoolid:
-          get_input:
-          - port_FSB2_Internal_subnetpoolid
-          - index_value
+          get_input: port_FSB2_Internal_subnetpoolid
         network:
           get_input:
           - port_FSB2_Internal_network
@@ -279,37 +235,21 @@ topology_template:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
         exCP_naming:
-          get_input:
-          - port_FSB_OAM_exCP_naming
-          - index_value
+          get_input: port_FSB_OAM_exCP_naming
         vlan_requirements:
-          get_input:
-          - port_FSB_OAM_vlan_requirements
-          - index_value
+          get_input: port_FSB_OAM_vlan_requirements
         ip_requirements:
-          get_input:
-          - port_FSB_OAM_ip_requirements
-          - index_value
+          get_input: port_FSB_OAM_ip_requirements
         network_role_tag:
-          get_input:
-          - port_FSB_OAM_network_role_tag
-          - index_value
+          get_input: port_FSB_OAM_network_role_tag
         mac_requirements:
-          get_input:
-          - port_FSB_OAM_mac_requirements
-          - index_value
+          get_input: port_FSB_OAM_mac_requirements
         order:
-          get_input:
-          - port_FSB_OAM_order
-          - index_value
+          get_input: port_FSB_OAM_order
         network_role:
-          get_input:
-          - port_FSB_OAM_network_role
-          - index_value
+          get_input: port_FSB_OAM_network_role
         subnetpoolid:
-          get_input:
-          - port_FSB_OAM_subnetpoolid
-          - index_value
+          get_input: port_FSB_OAM_subnetpoolid
         fixed_ips:
           get_input: port_FSB_OAM_fixed_ips
         network: