[SDC-29] rebase continue work to align source

[sdc.git] / openecomp-be / lib / openecomp-sdc-translator-lib / openecomp-sdc-translator-core / src / test / resources / mock / services / heattotosca / fulltest / mixPatterns / twoAppearancePerPatternWithConnectivities / out / Nested_b_single_2b_1ServiceTemplate.yaml

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml
index f867345..a8680d8 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_b_single_2b_1ServiceTemplate.yaml
@@ -11,6 +11,67 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1b_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1b_t1_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    compute_b_single_2b_metadata:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1b_t1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    compute_b_single_2b_scheduler_hints:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1b_t2_port_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_1b_t2_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_1b_t2_port_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1b_t2_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     compute_b_single_2b_availability_zone:
       type: list
       required: true
@@ -28,6 +89,11 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
+    port_1b_t2_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     port_1b_t2_port_ip_requirements:
       type: list
       required: true
@@ -38,42 +104,36 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
-      required: true
     compute_b_single_2b_user_data_format:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_b_single_2b_metadata:
+    port_1b_t1_port_network_role_tag:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_1b_t1_port_ip_requirements:
+        type: string
+    port_1b_t1_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
-        type: json
-    vm_image_name:
-      type: string
-      required: true
+        type: string
     port_1b_t1_port_mac_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    compute_b_single_2b_scheduler_hints:
+    port_1b_t2_port_network:
       type: list
       required: true
       entry_schema:
-        type: json
-    port_1b_t2_port_network:
+        type: string
+    port_1b_t1_port_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: json
   node_templates:
     b_single_2b:
       type: org.openecomp.resource.vfc.nodes.heat.b_single_2b
@@ -105,14 +165,38 @@ topology_template:
     b_single_2b_1b_t1_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1b_t1_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t1_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t1_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1b_t1_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1b_t1_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t1_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t1_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t1_port_subnetpoolid
+          - index_value
         network:
           get_attribute:
           - b_single_2b
@@ -125,14 +209,38 @@ topology_template:
     b_single_2b_1b_t2_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_1b_t2_port_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_1b_t2_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_1b_t2_port_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_1b_t2_port_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_1b_t2_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_1b_t2_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_1b_t2_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_1b_t2_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_1b_t2_port_network