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, 81 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/connectivityBetweenPatterns/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
index ed685d7194..7bd4091fee 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/connectivityBetweenPatterns/out/MainServiceTemplate.yaml
@@ -224,6 +224,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:

@@ -241,6 +246,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:

             get_attribute:

@@ -305,11 +315,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

         compute_1c1_scalling_instance_name:

@@ -352,11 +372,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

         port_1c1_t1_port_mac_requirements:

           mac_count_required:

             is_required: false

@@ -431,6 +461,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:

           connectivityTo1C2_1:

@@ -476,6 +511,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

@@ -512,6 +552,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_1c2_t1_port_mac_requirements:

           mac_count_required:

             is_required: false

@@ -564,6 +609,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_1c2_catalog_instance_scheduler_hints:

         - group: BE_Affinity_group

         service_template_filter:

@@ -596,6 +646,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_1c2_t1_port_mac_requirements:

           mac_count_required:

             is_required: false

@@ -621,6 +676,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_1c2_catalog_instance_scheduler_hints:

         - group: BE_Affinity_group

         service_template_filter:

@@ -807,6 +867,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

@@ -825,6 +890,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:

@@ -1024,6 +1094,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:

@@ -1041,6 +1116,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

@@ -1180,4 +1260,4 @@ topology_template:
         name: def

         affinity: host

       targets:

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