[SDC-29] rebase continue work to align source

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

1 files changed, 169 insertions, 16 deletions

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_FSB2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml
index a4d2f79275..a71818c237 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/generalVf/out/Nested_FSB2ServiceTemplate.yaml
@@ -16,6 +16,94 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_FSB2_Internal2_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
+    port_FSB_OAM_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    compute_FSB2_availability_zone:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal2_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB_OAM_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal1_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB2_Internal1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal2_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    compute_FSB2_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_mac_address:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_FSB_OAM_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal1_network:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB2_Internal2_mac_address:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_FSB_OAM_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     port_FSB2_Internal2_mac_requirements:
       type: list
       required: true
@@ -38,35 +126,32 @@ topology_template:
       default: 0
       constraints:
       - greater_or_equal: 0
-    port_FSB2_Internal2_network:
+    port_FSB_OAM_order:
       type: list
       required: true
       entry_schema:
-        type: string
-    vm_flavor_name:
-      type: string
-      required: true
-    compute_FSB2_availability_zone:
+        type: integer
+    port_FSB2_Internal2_network:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB_OAM_ip_requirements:
+    port_FSB2_Internal2_vlan_requirements:
       type: list
       required: true
       entry_schema:
         type: json
-    port_FSB2_Internal1_ip_requirements:
+    port_FSB2_Internal1_order:
       type: list
       required: true
       entry_schema:
-        type: json
-    compute_FSB2_name:
+        type: integer
+    port_FSB2_Internal2_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB2_Internal1_mac_address:
+    port_FSB2_Internal1_network_role_tag:
       type: list
       required: true
       entry_schema:
@@ -81,25 +166,33 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_FSB_OAM_network:
+    port_FSB2_Internal2_order:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_FSB2_Internal1_network:
+        type: integer
+    port_FSB2_Internal1_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    port_FSB2_Internal2_mac_address:
+    port_FSB_OAM_exCP_naming:
       type: list
       required: true
       entry_schema:
-        type: string
+        type: json
   node_templates:
     FSB2_FSB_OAM:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB_OAM_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB_OAM_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_FSB_OAM_ip_requirements
@@ -112,6 +205,18 @@ topology_template:
           get_input:
           - port_FSB_OAM_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_FSB_OAM_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB_OAM_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB_OAM_subnetpoolid
+          - index_value
         fixed_ips:
           get_input:
           - port_FSB_OAM_fixed_ips
@@ -141,14 +246,38 @@ topology_template:
     FSB2_FSB2_Internal2:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB2_Internal2_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB2_Internal2_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_FSB2_Internal2_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB2_Internal2_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_FSB2_Internal2_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_FSB2_Internal2_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB2_Internal2_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB2_Internal2_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB2_Internal2_network
@@ -165,14 +294,38 @@ topology_template:
     FSB2_FSB2_Internal1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_FSB2_Internal1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_FSB2_Internal1_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_FSB2_Internal1_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_FSB2_Internal1_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_FSB2_Internal1_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_FSB2_Internal1_order
+          - index_value
+        network_role:
+          get_input:
+          - port_FSB2_Internal1_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_FSB2_Internal1_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_FSB2_Internal1_network