[SDC-29] rebase continue work to align source

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

1 files changed, 120 insertions, 30 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
index d6dd992034..a8e64880b2 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/nested-pcm_v0.1ServiceTemplate.yaml
@@ -11,32 +11,90 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    server_group:
+    port_pcm_port_0_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    availabilityzone_name:
+      label: availabilityzone name
       hidden: false
       immutable: false
       type: string
-    connectivityChk:
+      description: availabilityzone name
+    port_pcm_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    pcm_image_name:
+      label: image name
       hidden: false
       immutable: false
-      type: json
-    availabilityzone_name:
-      label: availabilityzone name
+      type: string
+      description: PCRF CM image name
+    port_pcm_port_0_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
+    port_pcm_port_0_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    port_pcm_port_1_subnetpoolid:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    pcm_server_name:
+      label: PCRF CM server name
       hidden: false
       immutable: false
       type: string
-      description: availabilityzone name
-    oam_net_gw:
-      label: CPS network gateway
+      description: PCRF CM server name
+    cps_net_mask:
+      label: CPS network mask
       hidden: false
       immutable: false
       type: string
-      description: CPS network gateway
-    pcm_image_name:
-      label: image name
+      description: CPS network mask
+    port_pcm_port_1_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    port_pcm_port_0_exCP_naming:
+      type: list
+      required: true
+      entry_schema:
+        type: json
+    oam_net_name:
+      label: OAM network name
       hidden: false
       immutable: false
       type: string
-      description: PCRF CM image name
+      description: OAM network name
+    port_pcm_port_1_network_role:
+      type: list
+      required: true
+      entry_schema:
+        type: string
+    server_group:
+      hidden: false
+      immutable: false
+      type: string
+    connectivityChk:
+      hidden: false
+      immutable: false
+      type: json
+    oam_net_gw:
+      label: CPS network gateway
+      hidden: false
+      immutable: false
+      type: string
+      description: CPS network gateway
     security_group_name:
       label: security group name
       hidden: false
@@ -49,6 +107,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network ip
+    port_pcm_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: json
     pcm_flavor_name:
       label: PCRF CM flavor name
       hidden: false
@@ -61,24 +124,12 @@ topology_template:
       immutable: false
       type: string
       description: CPS Cluman Cinder Volume
-    pcm_server_name:
-      label: PCRF CM server name
-      hidden: false
-      immutable: false
-      type: string
-      description: PCRF CM server name
     cps_net_name:
       label: CPS network name
       hidden: false
       immutable: false
       type: string
       description: CPS network name
-    cps_net_mask:
-      label: CPS network mask
-      hidden: false
-      immutable: false
-      type: string
-      description: CPS network mask
     oam_net_ip:
       label: OAM network ip
       hidden: false
@@ -91,12 +142,11 @@ topology_template:
       immutable: false
       type: string
       description: CPS network mask
-    oam_net_name:
-      label: OAM network name
-      hidden: false
-      immutable: false
-      type: string
-      description: OAM network name
+    port_pcm_port_1_order:
+      type: list
+      required: true
+      entry_schema:
+        type: integer
   node_templates:
     pcm_port_1:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
@@ -109,15 +159,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_1_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: oam_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_1_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_1_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_1_vlan_requirements
+          - index_value
         network_role_tag: oam
         network:
           get_input: oam_net_name
+        order:
+          get_input:
+          - port_pcm_port_1_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable
@@ -150,15 +220,35 @@ topology_template:
             is_required: false
         security_groups:
         - get_input: security_group_name
+        network_role:
+          get_input:
+          - port_pcm_port_0_network_role
+          - index_value
         fixed_ips:
         - ip_address:
             get_input: cps_net_ip
+        subnetpoolid:
+          get_input:
+          - port_pcm_port_0_subnetpoolid
+          - index_value
         mac_requirements:
           mac_count_required:
             is_required: false
+        exCP_naming:
+          get_input:
+          - port_pcm_port_0_exCP_naming
+          - index_value
+        vlan_requirements:
+          get_input:
+          - port_pcm_port_0_vlan_requirements
+          - index_value
         network_role_tag: cps
         network:
           get_input: cps_net_name
+        order:
+          get_input:
+          - port_pcm_port_0_order
+          - index_value
       requirements:
       - binding:
           capability: tosca.capabilities.network.Bindable