From b3d4898d9e8452ea0b8d848c048e712d43b8d9a3 Mon Sep 17 00:00:00 2001
From: Michael Lando <ml636r@att.com>
Date: Sun, 11 Jun 2017 14:22:02 +0300
Subject: [SDC-29] rebase continue work to align source

Change-Id: I218f1c5ee23fb2c8314f1c70921d3ad8682c10f4
Signed-off-by: Michael Lando <ml636r@att.com>
---
 ...sted_1c12_scalling_instanceServiceTemplate.yaml | 72 +++++++++++++++++++---
 1 file changed, 63 insertions(+), 9 deletions(-)

(limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.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_1c12_scalling_instanceServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml
index 09698482d3..90c0f22132 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/Nested_1c12_scalling_instanceServiceTemplate.yaml
@@ -11,6 +11,11 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    port_1c1_t1_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     compute_1c12_scalling_instance_scheduler_hints:
       type: list
       required: true
@@ -26,9 +31,11 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
+    port_1c1_t1_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     port_1c1_t1_port_mac_requirements:
       type: list
       required: true
@@ -41,46 +48,93 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_1c1_t1_port_name:
+    vm_flavor_name:
+      type: string
+      required: true
+    compute_1c12_scalling_instance_user_data_format:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
+    port_1c1_t1_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
       type: string
       required: true
-    compute_1c12_scalling_instance_availability_zone:
+    port_1c1_t1_port_name:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t1_port_network:
+    port_1c1_t1_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_1c12_scalling_instance_user_data_format:
+    port_1c1_t1_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    port_1c1_t1_port_ip_requirements:
+    port_1c1_t1_port_network_role:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
+    compute_1c12_scalling_instance_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t1_port_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_1c1_t1_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
   node_templates:
     1c12_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
-- 
cgit 1.2.3-korg