[SDC-29] rebase continue work to align source

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

3 files changed, 216 insertions, 36 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 00cd6b4b90..dc1dc15aaa 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -26,20 +26,12 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: json
-      port_pd01_port_1_ip_requirements:
+      port_pd01_port_0_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
+          type: string
       compute_pd_server_availability_zone:
         type: list
         required: true
@@ -62,17 +54,35 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_mac_requirements:
+      port_pd01_port_1_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: json
+          type: string
+      port_pd01_port_0_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd01_port_1_subnetpoolid:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
       vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_replacement_policy:
+      port_pd01_port_1_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_0_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
@@ -90,6 +100,68 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_pd01_port_0_network_role_tag:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_1_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
+      port_pd01_port_1_order:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: integer
+      port_pd01_port_0_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_1_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_1_mac_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_1_replacement_policy:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_1_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      port_pd01_port_0_vlan_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
index 7a45084d24..17966e0c2f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/out/MainServiceTemplate.yaml
@@ -114,12 +114,6 @@ topology_template:
               is_required: false
             floating_ip_count_required:
               is_required: false
-        port_pd01_port_1_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
@@ -130,17 +124,23 @@ topology_template:
         - AUTO
         vm_flavor_name:
           get_input: pd_flavor_name
-        port_pd01_port_1_mac_requirements:
-        - mac_count_required:
-            is_required: false
         vm_image_name:
           get_input: pd_image_name
-        port_pd01_port_1_replacement_policy:
-        - AUTO
         port_pd01_port_1_network:
         - packet_internal_network
         compute_pd_server_user_data_format:
         - RAW
+        port_pd01_port_1_ip_requirements:
+        - - ip_version: 4
+            ip_count_required:
+              is_required: false
+            floating_ip_count_required:
+              is_required: false
+        port_pd01_port_1_mac_requirements:
+        - mac_count_required:
+            is_required: false
+        port_pd01_port_1_replacement_policy:
+        - AUTO
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/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/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
index 44d11b66e1..560f18e726 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/computeWithSamePortTypeNodeConnectedOut/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/computeWithSamePortTypeNodeConnectedOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -26,18 +26,11 @@ topology_template:
       required: true
       entry_schema:
         type: json
-    port_pd01_port_1_ip_requirements:
+    port_pd01_port_0_network_role:
       type: list
       required: true
       entry_schema:
-        type: json
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
+        type: string
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -56,15 +49,30 @@ topology_template:
     vm_flavor_name:
       type: string
       required: true
-    port_pd01_port_1_mac_requirements:
+    port_pd01_port_1_network_role:
       type: list
       required: true
       entry_schema:
-        type: json
+        type: string
+    port_pd01_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
     vm_image_name:
       type: string
       required: true
-    port_pd01_port_1_replacement_policy:
+    port_pd01_port_1_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_0_subnetpoolid:
       type: list
       required: true
       entry_schema:
@@ -79,6 +87,58 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_pd01_port_0_network_role_tag:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_1_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
+    port_pd01_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_1_mac_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_1_replacement_policy:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pd01_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.nodes.heat.pd_server
@@ -102,18 +162,42 @@ topology_template:
     pd_server_pd01_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_1_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd01_port_1_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_1_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_1_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_1_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_1_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_1_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_1_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_1_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_1_network
@@ -126,18 +210,42 @@ topology_template:
     pd_server_pd01_port_0:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        exCP_naming:
+          get_input:
+          - port_pd01_port_0_exCP_naming
+          - index_value
         replacement_policy:
           get_input:
           - port_pd01_port_0_replacement_policy
           - index_value
+        vlan_requirements:
+          get_input:
+          - port_pd01_port_0_vlan_requirements
+          - index_value
         ip_requirements:
           get_input:
           - port_pd01_port_0_ip_requirements
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_0_network_role_tag
+          - index_value
         mac_requirements:
           get_input:
           - port_pd01_port_0_mac_requirements
           - index_value
+        order:
+          get_input:
+          - port_pd01_port_0_order
+          - index_value
+        network_role:
+          get_input:
+          - port_pd01_port_0_network_role
+          - index_value
+        subnetpoolid:
+          get_input:
+          - port_pd01_port_0_subnetpoolid
+          - index_value
         network:
           get_input:
           - port_pd01_port_0_network