[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 / generalVf / out / Nested_NCB2ServiceTemplate.yaml

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_NCB2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB2ServiceTemplate.yaml
index 7cfca62..3ff3a61 100644 (file)
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_NCB2ServiceTemplate.yaml
@@ -11,6 +11,52 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
+    compute_NCB2_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    vm_flavor_name:
+      type: string
+      required: true
+    port_NCB2_Internal2_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_NCB2_Internal1_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_image_name:
+      type: string
+      required: true
+    port_NCB2_Internal1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_NCB2_Internal2_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_NCB2_Internal1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_NCB2_Internal1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_NCB2_Internal2_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     index_value:
       type: integer
       description: Index value of this substitution service template runtime instance
@@ -23,30 +69,22 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    compute_NCB2_availability_zone:
-      type: list
-      required: true
-      entry_schema:
-        type: string
     port_NCB2_Internal2_ip_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    vm_flavor_name:
-      type: string
-      required: true
-    port_NCB2_Internal2_mac_requirements:
+    port_NCB2_Internal2_network_role_tag:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
     port_NCB2_Internal2_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_NCB2_Internal1_mac_requirements:
+    port_NCB2_Internal2_vlan_requirements:
       type: list
       required: true
       entry_schema:
@@ -61,14 +99,36 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    vm_image_name:
-      type: string
+    port_NCB2_Internal1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_NCB2_Internal1_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_NCB2_Internal2_order:
+      type: list
       required: true
+      entry_schema:
+        type: integer
     compute_NCB2_name:
       type: list
       required: true
       entry_schema:
         type: string
+    port_NCB2_Internal1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_NCB2_Internal2_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_NCB2_Internal1_ip_requirements:
       type: list
       required: true
@@ -93,14 +153,38 @@ topology_template:
     NCB2_NCB2_Internal1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_NCB2_Internal1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_NCB2_Internal1_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_NCB2_Internal1_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_NCB2_Internal1_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_NCB2_Internal1_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_NCB2_Internal1_order
+          - index_value
+        network_role:
+          get_input:
+          - port_NCB2_Internal1_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_NCB2_Internal1_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_NCB2_Internal1_network
@@ -117,14 +201,38 @@ topology_template:
     NCB2_NCB2_Internal2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_NCB2_Internal2_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_NCB2_Internal2_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_NCB2_Internal2_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_NCB2_Internal2_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_NCB2_Internal2_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_NCB2_Internal2_order
+          - index_value
+        network_role:
+          get_input:
+          - port_NCB2_Internal2_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_NCB2_Internal2_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_NCB2_Internal2_network