[sdc] update code of sdc

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

1 files changed, 21 insertions, 53 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml
index 42ba1a647f..a9acfcc5c3 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB1ServiceTemplate.yaml
@@ -12,15 +12,11 @@ node_types:
 topology_template:
   inputs:
     port_FSB1_Internal1_mac_address:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_FSB_OAM_network_role_tag:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_FSB1_Internal2_network:
       type: list
       required: true
@@ -40,15 +36,13 @@ topology_template:
       entry_schema:
         type: json
     port_FSB1_Internal2_mac_address:
-      type: list
+      type: string
       required: true
-      entry_schema:
-        type: string
     port_FSB_OAM_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     port_FSB1_Internal1_subnetpoolid:
       type: list
       required: true
@@ -60,10 +54,8 @@ topology_template:
       entry_schema:
         type: string
     port_FSB1_Internal1_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     port_FSB_OAM_network_role:
       type: list
       required: true
@@ -73,7 +65,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     port_FSB1_Internal1_order:
       type: list
       required: true
@@ -100,10 +92,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
@@ -137,15 +127,13 @@ topology_template:
       entry_schema:
         type: string
     port_FSB1_Internal2_mac_requirements:
-      type: list
+      type: org.openecomp.datatypes.network.MacRequirements
       required: true
-      entry_schema:
-        type: json
     port_FSB1_Internal2_ip_requirements:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.network.IpRequirements
     port_FSB1_Internal2_order:
       type: list
       required: true
@@ -155,7 +143,7 @@ topology_template:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: org.openecomp.datatypes.heat.neutron.port.FixedIps
     port_FSB1_Internal1_exCP_naming:
       type: list
       required: true
@@ -194,17 +182,13 @@ topology_template:
           - port_FSB1_Internal2_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_FSB1_Internal2_ip_requirements
-          - index_value
+          get_input: port_FSB1_Internal2_ip_requirements
         network_role_tag:
           get_input:
           - port_FSB1_Internal2_network_role_tag
           - index_value
         mac_requirements:
-          get_input:
-          - port_FSB1_Internal2_mac_requirements
-          - index_value
+          get_input: port_FSB1_Internal2_mac_requirements
         order:
           get_input:
           - port_FSB1_Internal2_order
@@ -222,9 +206,7 @@ topology_template:
           - port_FSB1_Internal2_network
           - index_value
         mac_address:
-          get_input:
-          - port_FSB1_Internal2_mac_address
-          - index_value
+          get_input: port_FSB1_Internal2_mac_address
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -242,17 +224,13 @@ topology_template:
           - port_FSB1_Internal1_vlan_requirements
           - index_value
         ip_requirements:
-          get_input:
-          - port_FSB1_Internal1_ip_requirements
-          - index_value
+          get_input: port_FSB1_Internal1_ip_requirements
         network_role_tag:
           get_input:
           - port_FSB1_Internal1_network_role_tag
           - index_value
         mac_requirements:
-          get_input:
-          - port_FSB1_Internal1_mac_requirements
-          - index_value
+          get_input: port_FSB1_Internal1_mac_requirements
         order:
           get_input:
           - port_FSB1_Internal1_order
@@ -270,9 +248,7 @@ topology_template:
           - port_FSB1_Internal1_network
           - index_value
         mac_address:
-          get_input:
-          - port_FSB1_Internal1_mac_address
-          - index_value
+          get_input: port_FSB1_Internal1_mac_address
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -290,17 +266,11 @@ topology_template:
           - port_FSB_OAM_vlan_requirements
           - index_value
         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
@@ -314,9 +284,7 @@ topology_template:
           - port_FSB_OAM_subnetpoolid
           - index_value
         fixed_ips:
-          get_input:
-          - port_FSB_OAM_fixed_ips
-          - index_value
+          get_input: port_FSB_OAM_fixed_ips
         network:
           get_input:
           - port_FSB_OAM_network
@@ -588,4 +556,4 @@ topology_template:
       - dependency
       link_FSB1_FSB_OAM:
       - FSB1_FSB_OAM
-      - link
\ No newline at end of file
+      - link