[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 / singleSubstitution / computeWithDiffPortTypeNodeConnectedIn / out / Nested_pd_serverServiceTemplate.yaml

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
index cefeecf..1596446 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithDiffPortTypeNodeConnectedIn/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,13 +11,6 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -33,11 +26,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd02_port_mac_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: json
     vm_flavor_name:
       type: string
       required: true
@@ -59,17 +47,64 @@ topology_template:
     vm_image_name:
       type: string
       required: true
-    port_pd02_port_security_groups:
+    port_pd02_port_replacement_policy:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_pd02_port_replacement_policy:
+    port_pd02_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd01_port_ip_requirements:
+    port_pd01_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    compute_pd_server_user_data_format:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd02_port_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd02_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd02_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd02_port_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd02_port_security_groups:
       type: list
       required: true
       entry_schema:
@@ -79,22 +114,37 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd02_port_ip_requirements:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd02_port_exCP_naming:
       type: list
       required: true
       entry_schema:
         type: json
-    port_pd01_port_network_role_tag:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd02_port_network:
+    port_pd02_port_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_user_data_format:
+    port_pd02_port_network:
       type: list
       required: true
       entry_schema:
@@ -126,10 +176,18 @@ topology_template:
           get_input:
           - port_pd01_port_security_groups
           - index_value
+        exCP_naming:
+          get_input:
+          - port_pd01_port_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd01_port_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_ip_requirements
@@ -142,6 +200,18 @@ topology_template:
           get_input:
           - port_pd01_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_network
@@ -158,10 +228,18 @@ topology_template:
           get_input:
           - port_pd02_port_security_groups
           - index_value
+        exCP_naming:
+          get_input:
+          - port_pd02_port_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd02_port_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd02_port_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd02_port_ip_requirements
@@ -174,6 +252,18 @@ topology_template:
           get_input:
           - port_pd02_port_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd02_port_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd02_port_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd02_port_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd02_port_network