Support Dual stuck - for difference version (2)

E2E Defect 430981 - ip_requirments for multiple ports with difference version wasn't supported

Change-Id: If3e93f099900bc078de6da9092b9d1460609e232
Issue-ID: SDC-1096
Signed-off-by: eleonorali <eleonoral@amdocs.com>

1 files changed, 156 insertions, 1 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 ffd36f1f25..f27ed2c5fb 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
@@ -272,6 +272,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          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:

@@ -289,6 +294,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          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

@@ -335,6 +345,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         vm_image_name:

           get_input: pd_image_name

         port_1c201_port_network_role_tag: oam

@@ -357,6 +372,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         port_1c201_port_mac_requirements:

           mac_count_required:

             is_required: false

@@ -390,6 +410,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         vm_image_name:

           get_input: pd_image_name

         port_1c201_port_network_role_tag: oam

@@ -412,6 +437,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         port_1c201_port_mac_requirements:

           mac_count_required:

             is_required: false

@@ -447,6 +477,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         vm_image_name:

           get_input: pd_image_name

         port_1c201_port_network_role_tag: oam

@@ -465,6 +500,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         port_1c201_port_mac_requirements:

           mac_count_required:

             is_required: false

@@ -502,6 +542,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         vm_image_name:

           get_input: pd_image_name

         port_1c201_port_network_role_tag: oam

@@ -520,6 +565,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         port_1c201_port_mac_requirements:

           mac_count_required:

             is_required: false

@@ -682,6 +732,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          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

@@ -700,6 +755,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          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:

@@ -956,11 +1016,21 @@ topology_template:
               is_required: true

             floating_ip_count_required:

               is_required: false

+          - ip_version: 6

+            ip_count_required:

+              is_required: false

+            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: 6

+            ip_count_required:

+              is_required: false

+            floating_ip_count_required:

+              is_required: false

         vm_image_name:

           get_input: pd_image_name

         port_1c1_t1_port_name:

@@ -1063,6 +1133,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          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:

@@ -1078,6 +1153,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         compute_b_single_2b_name:

         - get_input:

           - b_single_2b_names

@@ -1150,11 +1230,21 @@ topology_template:
               is_required: true

             floating_ip_count_required:

               is_required: false

+          - ip_version: 6

+            ip_count_required:

+              is_required: false

+            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: 6

+            ip_count_required:

+              is_required: false

+            floating_ip_count_required:

+              is_required: false

         vm_image_name:

           get_input: pd_image_name

         port_1c1_t1_port_name:

@@ -1322,6 +1412,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          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:

@@ -1425,6 +1520,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         fixed_ips:

         - ip_address:

             get_input:

@@ -1446,6 +1546,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         fixed_ips:

         - ip_address:

             get_input:

@@ -1476,6 +1581,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          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:

@@ -1491,6 +1601,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         compute_b_single_2b_name:

         - get_input:

           - b_single_2b_names

@@ -1623,6 +1738,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         server_group: BE_Affinity_group

         connectivityChk:

           connectivityTo1C1_T1_02:

@@ -1705,6 +1825,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         port_pcm_port_00_network_role_tag: cps

         pcm_flavor_name:

           get_input: pcm_flavor_name

@@ -1733,6 +1858,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         fixed_ips:

         - ip_address:

             get_input:

@@ -1756,6 +1886,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         server_group: BE_Affinity_group

         connectivityChk:

           connectivityTo4PNested_2:

@@ -1838,6 +1973,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         port_pcm_port_00_network_role_tag: cps

         pcm_flavor_name:

           get_input: pcm_flavor_name

@@ -1866,6 +2006,11 @@ topology_template:
             is_required: true

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         fixed_ips:

         - ip_address:

             get_input:

@@ -1896,6 +2041,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          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:

@@ -1913,6 +2063,11 @@ topology_template:
             is_required: false

           floating_ip_count_required:

             is_required: false

+        - ip_version: 6

+          ip_count_required:

+            is_required: false

+          floating_ip_count_required:

+            is_required: false

         compute_b_single_1b_metadata:

         - connectivityTo4PNested_2:

             get_attribute:

@@ -2130,4 +2285,4 @@ topology_template:
         name: def

         affinity: host

       targets:

-      - BE_Affinity_group
\ No newline at end of file
+      - BE_Affinity_group