[sdc] update code of sdc

Change-Id: If9f37c80b659cb67b34d18e6c019defecca58b9a
Signed-off-by: Michael Lando <ml636r@att.com>

1 files changed, 14 insertions, 34 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index 3a93e4c8b9..a742c1bb24 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
@@ -27,10 +27,8 @@ topology_template:
       entry_schema:
         type: string
     port_1c1_t2_port_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     vm_flavor_name:
       type: string
       required: true
@@ -38,7 +36,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     vm_image_name:
       type: string
       required: true
@@ -61,7 +59,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     port_1c1_t2_port_network:
       type: list
       required: true
@@ -71,7 +69,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     port_1c1_t1_port_vlan_requirements:
       type: list
       required: true
@@ -81,12 +79,10 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     port_1c1_t1_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -105,10 +101,8 @@ topology_template:
       entry_schema:
         type: integer
     port_1c1_t2_port_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     compute_1c1_scalling_instance_availability_zone:
       type: list
       required: true
@@ -167,17 +161,13 @@ topology_template:
           - port_1c1_t1_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1c1_t1_port_ip_requirements
-          - index_value
+          get_input: port_1c1_t1_port_ip_requirements
         network_role_tag:
           get_input:
           - port_1c1_t1_port_network_role_tag
           - index_value
         mac_requirements:
-          get_input:
-          - port_1c1_t1_port_mac_requirements
-          - index_value
+          get_input: port_1c1_t1_port_mac_requirements
         order:
           get_input:
           - port_1c1_t1_port_order
@@ -191,9 +181,7 @@ topology_template:
           - port_1c1_t1_port_subnetpoolid
           - index_value
         fixed_ips:
-          get_input:
-          - port_1c1_t1_port_fixed_ips
-          - index_value
+          get_input: port_1c1_t1_port_fixed_ips
         name:
           get_input:
           - port_1c1_t1_port_name
@@ -242,17 +230,11 @@ topology_template:
           - port_1c1_t2_port_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_1c1_t2_port_ip_requirements
-          - index_value
+          get_input: port_1c1_t2_port_ip_requirements
         network_role_tag:
-          get_input:
-          - port_1c1_t2_port_network_role_tag
-          - index_value
+          get_input: port_1c1_t2_port_network_role_tag
         mac_requirements:
-          get_input:
-          - port_1c1_t2_port_mac_requirements
-          - index_value
+          get_input: port_1c1_t2_port_mac_requirements
         order:
           get_input:
           - port_1c1_t2_port_order
@@ -266,9 +248,7 @@ topology_template:
           - port_1c1_t2_port_subnetpoolid
           - index_value
         fixed_ips:
-          get_input:
-          - port_1c1_t2_port_fixed_ips
-          - index_value
+          get_input: port_1c1_t2_port_fixed_ips
         name:
           get_input:
           - port_1c1_t2_port_name