[SDC-29] rebase continue work to align source

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

1 files changed, 119 insertions, 20 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/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/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
index 2c43ee2c01..3a93e4c8b9 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/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/oneAppearancePerPattern/out/Nested_1c1_scalling_instanceServiceTemplate.yaml
@@ -11,7 +11,12 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_1c1_t1_port_fixed_ips:
+    port_1c1_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c1_t2_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -21,21 +26,67 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_1c1_t2_port_ip_requirements:
+    port_1c1_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_1c1_t1_port_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_1c1_t1_port_mac_requirements:
+    vm_image_name:
+      type: string
+      required: true
+    compute_1c1_scalling_instance_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t1_port_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t1_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t2_port_fixed_ips:
       type: list
       required: true
       entry_schema:
         type: json
-    port_1c1_t2_port_network_role_tag:
+    port_1c1_t2_port_network:
       type: list
       required: true
       entry_schema:
         type: string
+    port_1c1_t1_port_fixed_ips:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c1_t1_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c1_t2_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1c1_t1_port_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -43,74 +94,102 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_1c1_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
     port_1c1_t2_port_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    vm_flavor_name:
-      type: string
-      required: true
     compute_1c1_scalling_instance_availability_zone:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t1_port_ip_requirements:
+    port_1c1_t2_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
     port_1c1_t2_port_name:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
-      required: true
     compute_1c1_scalling_instance_scheduler_hints:
       type: list
       required: true
       entry_schema:
         type: json
-    compute_1c1_scalling_instance_name:
+    port_1c1_t2_port_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_1c1_t1_port_name:
+        type: json
+    port_1c1_t1_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t1_port_network:
+    port_1c1_t1_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t2_port_fixed_ips:
+    port_1c1_t1_port_network_role:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_1c1_t2_port_network:
+        type: string
+    port_1c1_t1_port_order:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: integer
   node_templates:
     1c1_scalling_instance_1c1_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c1_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c1_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c1_t1_port_ip_requirements
           - index_value
+        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
+        order:
+          get_input:
+          - port_1c1_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c1_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c1_t1_port_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_1c1_t1_port_fixed_ips
@@ -154,6 +233,14 @@ topology_template:
     1c1_scalling_instance_1c1_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1c1_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1c1_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1c1_t2_port_ip_requirements
@@ -166,6 +253,18 @@ topology_template:
           get_input:
           - port_1c1_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1c1_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1c1_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1c1_t2_port_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_1c1_t2_port_fixed_ips