[sdc] - latest code changes

Change-Id: I861387094b000367218bb417624fe50d3c37f70e
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

1 files changed, 176 insertions, 149 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml
index fa3ffd61dc..2c5b8abe4c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/twoAppearancePerPatternWithConnectivities/out/MainServiceTemplate.yaml
@@ -100,11 +100,8 @@ topology_template:
       directives:
       - substitutable
       properties:
-        pcm_flavor_name:
-          get_input: pcm_flavor_name
-        service_template_filter:
-          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
         server_group: BE_Affinity_group
+        port_pcm_port_1_network_role_tag: oam
         connectivityChk:
           connectivityTo4PNested_2:
             get_attribute:
@@ -174,9 +171,32 @@ topology_template:
             get_attribute:
             - abstract_1c2_catalog_instance_1
             - 1c2_catalog_instance_instance_name
+        port_pcm_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         pcm_image_name:
           get_input: pcm_image_name
         security_group_name: jsa_security_group
+        port_pcm_port_1_mac_requirements:
+          mac_count_required:
+            is_required: false
+        pcm_flavor_name:
+          get_input: pcm_flavor_name
+        service_template_filter:
+          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
+        port_pcm_port_1_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
+        port_pcm_port_0_network_role_tag: cps
+        port_pcm_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         pcm_server_name:
           get_input:
           - pcm_server_names
@@ -192,11 +212,8 @@ topology_template:
       directives:
       - substitutable
       properties:
-        pcm_flavor_name:
-          get_input: pcm_flavor_name
-        service_template_filter:
-          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
         server_group: BE_Affinity_group
+        port_pcm_port_1_network_role_tag: oam
         connectivityChk:
           connectivityTo1C1_T1_02:
             get_attribute:
@@ -266,9 +283,32 @@ topology_template:
             get_attribute:
             - abstract_1c2_catalog_instance_1
             - 1c2_catalog_instance_instance_name
+        port_pcm_port_0_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         pcm_image_name:
           get_input: pcm_image_name
         security_group_name: jsa_security_group
+        port_pcm_port_1_mac_requirements:
+          mac_count_required:
+            is_required: false
+        pcm_flavor_name:
+          get_input: pcm_flavor_name
+        service_template_filter:
+          substitute_service_template: nested-pcm_v0.1ServiceTemplate.yaml
+        port_pcm_port_1_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
+        port_pcm_port_0_network_role_tag: cps
+        port_pcm_port_0_mac_requirements:
+          mac_count_required:
+            is_required: false
         pcm_server_name:
           get_input:
           - pcm_server_names
@@ -291,11 +331,11 @@ topology_template:
         vm_image_name:
           get_input: pd_image_name
         port_1c2_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         port_1c2_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -314,13 +354,14 @@ topology_template:
         - get_attribute:
           - abstract_1c2_catalog_instance_1
           - 1c2_catalog_instance_instance_name
-        port_1c2_t1_port_network_role_tag: oam
+        port_1c2_t1_port_network_role_tag:
+        - oam
         port_1c2_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         compute_1c2_catalog_instance_scheduler_hints:
         - group: BE_Affinity_group
         service_template_filter:
@@ -348,11 +389,11 @@ topology_template:
         vm_image_name:
           get_input: pd_image_name
         port_1c2_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         port_1c2_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -371,13 +412,14 @@ topology_template:
         - get_attribute:
           - abstract_1c2_catalog_instance_0
           - 1c2_catalog_instance_instance_name
-        port_1c2_t1_port_network_role_tag: oam
+        port_1c2_t1_port_network_role_tag:
+        - oam
         port_1c2_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         compute_1c2_catalog_instance_scheduler_hints:
         - group: BE_Affinity_group
         service_template_filter:
@@ -405,11 +447,11 @@ topology_template:
         vm_image_name:
           get_input: pd_image_name
         port_1c2_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         port_1c2_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -495,13 +537,14 @@ topology_template:
             is_required: false
         compute_1c2_catalog_instance_user_data_format:
         - RAW1
-        port_1c2_t1_port_network_role_tag: oam
+        port_1c2_t1_port_network_role_tag:
+        - oam
         port_1c2_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         compute_1c2_catalog_instance_scheduler_hints:
         - group: BE_Affinity_group
         service_template_filter:
@@ -529,11 +572,11 @@ topology_template:
         vm_image_name:
           get_input: pd_image_name
         port_1c2_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         port_1c2_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -550,13 +593,14 @@ topology_template:
             is_required: false
         compute_1c2_catalog_instance_user_data_format:
         - RAW1
-        port_1c2_t1_port_network_role_tag: oam
+        port_1c2_t1_port_network_role_tag:
+        - oam
         port_1c2_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         compute_1c2_catalog_instance_scheduler_hints:
         - group: BE_Affinity_group
         service_template_filter:
@@ -705,12 +749,13 @@ topology_template:
             - abstract_1c2_catalog_instance_1
             - 1c2_catalog_instance_instance_name
         port_1a_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
-        port_1a_t2_port_network_role_tag: ppds
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
+        port_1a_t2_port_network_role_tag:
+        - ppds
         vm_flavor_name:
           get_input: pd_flavor_name
         port_1a_t2_port_network:
@@ -723,11 +768,11 @@ topology_template:
         vm_image_name:
           get_input: pd_image_name
         port_1a_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         compute_a_single_1a_availability_zone:
         - get_input: availabilityzone_name
         compute_a_single_1a_scheduler_hints:
@@ -858,11 +903,11 @@ topology_template:
         vm_flavor_name:
           get_input: pd_flavor_name
         port_1b_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         vm_image_name:
           get_input: pd_image_name
         compute_b_single_2b_scheduler_hints:
@@ -873,11 +918,11 @@ topology_template:
           mac_count_required:
             is_required: false
         port_1b_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         compute_b_single_2b_name:
         - get_input:
           - b_single_2b_names
@@ -888,7 +933,8 @@ topology_template:
           - a_single_1a_1a_t1_port_tenant_id
         compute_b_single_2b_user_data_format:
         - RAW
-        port_1b_t1_port_network_role_tag: oam
+        port_1b_t1_port_network_role_tag:
+        - oam
         port_1b_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -1011,14 +1057,10 @@ topology_template:
       - substitutable
       properties:
         port_1c1_t1_port_fixed_ips:
-        - - ip_address:
-              get_input:
-              - myIPs
-              - 1
-        - - ip_address:
-              get_input:
-              - myIPs
-              - 1
+        - ip_address:
+            get_input:
+            - myIPs
+            - 1
         port_1c1_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -1038,16 +1080,11 @@ topology_template:
         - RAW1
         - RAW1
         port_1c1_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: true
-            floating_ip_count_required:
-              is_required: false
-        - - ip_version: 4
-            ip_count_required:
-              is_required: true
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         vm_image_name:
           get_input: pd_image_name
         port_1c1_t1_port_name:
@@ -1058,7 +1095,6 @@ topology_template:
         - group: BE_Affinity_group
         port_1c1_t1_port_network:
         - 1c1_scalling_instance_network
-        - 1c1_scalling_instance_network
         service_template_filter:
           substitute_service_template: Nested_1c11_scalling_instanceServiceTemplate.yaml
           count: 2
@@ -1145,11 +1181,11 @@ topology_template:
             - abstract_1c2_catalog_instance_1
             - 1c2_catalog_instance_instance_name
         port_1b_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         vm_image_name:
           get_input: pd_image_name
         compute_b_single_2b_scheduler_hints:
@@ -1160,11 +1196,11 @@ topology_template:
           mac_count_required:
             is_required: false
         port_1b_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         compute_b_single_2b_name:
         - get_input:
           - b_single_2b_names
@@ -1208,14 +1244,10 @@ topology_template:
         - group: BE_Affinity_group
         - group: BE_Affinity_group
         port_1c1_t1_port_fixed_ips:
-        - - ip_address:
-              get_input:
-              - myIPs
-              - 1
-        - - ip_address:
-              get_input:
-              - myIPs
-              - 1
+        - ip_address:
+            get_input:
+            - myIPs
+            - 1
         compute_1c12_scalling_instance_name:
         - get_input:
           - 1c12_scalling_instance_names
@@ -1232,16 +1264,11 @@ topology_template:
         - RAW1
         - RAW1
         port_1c1_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: true
-            floating_ip_count_required:
-              is_required: false
-        - - ip_version: 4
-            ip_count_required:
-              is_required: true
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: true
+          floating_ip_count_required:
+            is_required: false
         vm_image_name:
           get_input: pd_image_name
         port_1c1_t1_port_name:
@@ -1252,7 +1279,6 @@ topology_template:
         - get_input: availabilityzone_name
         port_1c1_t1_port_network:
         - 1c1_scalling_instance_network
-        - 1c1_scalling_instance_network
         service_template_filter:
           substitute_service_template: Nested_1c12_scalling_instanceServiceTemplate.yaml
           count: 2
@@ -1404,11 +1430,11 @@ topology_template:
         compute_a_single_2a_user_data_format:
         - RAW
         port_1a_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         compute_a_single_2a_scheduler_hints:
         - group: BE_Affinity_group
         compute_a_single_2a_availability_zone:
@@ -1511,11 +1537,11 @@ topology_template:
         vm_flavor_name:
           get_input: pd_flavor_name
         port_1b_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         vm_image_name:
           get_input: pd_image_name
         compute_b_single_1b_user_data_format:
@@ -1528,16 +1554,17 @@ topology_template:
         compute_b_single_1b_scheduler_hints:
         - group: BE_Affinity_group
         port_1b_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         port_1b_t1_port_value_specs:
         - get_attribute:
           - abstract_a_single_1a
           - a_single_1a_1a_t1_port_tenant_id
-        port_1b_t1_port_network_role_tag: oam
+        port_1b_t1_port_network_role_tag:
+        - oam
         port_1b_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -1754,11 +1781,11 @@ topology_template:
         vm_flavor_name:
           get_input: pd_flavor_name
         port_1b_t1_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         vm_image_name:
           get_input: pd_image_name
         compute_b_single_1b_user_data_format:
@@ -1771,11 +1798,11 @@ topology_template:
         compute_b_single_1b_scheduler_hints:
         - group: BE_Affinity_group
         port_1b_t2_port_ip_requirements:
-        - - ip_version: 4
-            ip_count_required:
-              is_required: false
-            floating_ip_count_required:
-              is_required: false
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         compute_b_single_1b_metadata:
         - connectivityTo4PNested_2:
             get_attribute:
@@ -1993,4 +2020,4 @@ topology_template:
         name: def
         affinity: host
       targets:
-      - BE_Affinity_group
+      - BE_Affinity_group
\ No newline at end of file