[SDC-29] rebase continue work to align source

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

3 files changed, 129 insertions, 39 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
index f3b983e920..c91ab33909 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -8,6 +8,42 @@ node_types:
   org.openecomp.resource.abstract.nodes.pd_server:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
+      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
+      compute_pd_server_availability_zone:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      compute_pd_server_name:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_replacement_policy:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: string
+      port_pd01_port_exCP_naming:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: json
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_mac_requirements:
         type: list
         required: true
@@ -30,36 +66,36 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
+      port_pd01_port_order:
+        type: list
+        required: true
         status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      compute_pd_server_availability_zone:
+        entry_schema:
+          type: integer
+      port_pd01_port_subnetpoolid:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      compute_pd_server_name:
+      port_pd01_port_network_role:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_replacement_policy:
+      port_pd01_port_network_role_tag:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
           type: string
-      vm_flavor_name:
-        type: string
+      port_pd01_port_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
+        entry_schema:
+          type: json
       compute_pd_server_user_data_format:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml
index 7997fe0a81..cb58589bfe 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/MainServiceTemplate.yaml
@@ -46,6 +46,21 @@ topology_template:
       directives:
       - substitutable
       properties:
+        compute_pd_server_availability_zone:
+        - get_input: availabilityzone_name
+        - get_input: availabilityzone_name
+        compute_pd_server_name:
+        - get_input:
+          - pd_server_names
+          - 1
+        - get_input:
+          - pd_server_names
+          - 0
+        port_pd01_port_replacement_policy:
+        - AUTO_PORT_1
+        - AUTO_PORT_0
+        vm_flavor_name:
+          get_input: pd_flavor_name
         port_pd01_port_mac_requirements:
         - mac_count_required:
             is_required: false
@@ -67,21 +82,6 @@ topology_template:
         port_pd01_port_network:
         - Network-1
         - Network-0
-        compute_pd_server_availability_zone:
-        - get_input: availabilityzone_name
-        - get_input: availabilityzone_name
-        compute_pd_server_name:
-        - get_input:
-          - pd_server_names
-          - 1
-        - get_input:
-          - pd_server_names
-          - 0
-        port_pd01_port_replacement_policy:
-        - AUTO_PORT_1
-        - AUTO_PORT_0
-        vm_flavor_name:
-          get_input: pd_flavor_name
         compute_pd_server_user_data_format:
         - RAW_SERVER_PD_2
         - RAW_SERVER_PD_1
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml
index 45fd36f894..ce1fbac923 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/scalingInstances/oneComputeTypeOnePort/out/Nested_pd_serverServiceTemplate.yaml
@@ -11,6 +11,36 @@ 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
+      entry_schema:
+        type: string
+    compute_pd_server_name:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_replacement_policy:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pd01_port_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    vm_flavor_name:
+      type: string
+      required: true
     port_pd01_port_mac_requirements:
       type: list
       required: true
@@ -29,31 +59,31 @@ topology_template:
       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
-    compute_pd_server_availability_zone:
+    port_pd01_port_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pd01_port_subnetpoolid:
       type: list
       required: true
       entry_schema:
         type: string
-    compute_pd_server_name:
+    port_pd01_port_network_role:
       type: list
       required: true
       entry_schema:
         type: string
-    port_pd01_port_replacement_policy:
+    port_pd01_port_network_role_tag:
       type: list
       required: true
       entry_schema:
         type: string
-    vm_flavor_name:
-      type: string
+    port_pd01_port_vlan_requirements:
+      type: list
       required: true
+      entry_schema:
+        type: json
     compute_pd_server_user_data_format:
       type: list
       required: true
@@ -82,18 +112,42 @@ topology_template:
     pd_server_pd01_port:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        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
           - index_value
+        network_role_tag:
+          get_input:
+          - port_pd01_port_network_role_tag
+          - index_value
         mac_requirements:
           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