Evaluate subinterface_indicator property

Corrected the condition to mark subinterface_indicator true/false

Change-Id: I3f21924defbc89a5fcd9a89ffc1ea0d28eec8c36
Issue-ID: SDC-1183
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>

2 files changed, 19 insertions, 19 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
index 2b81be456f..acfb399266 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/MainServiceTemplate.yaml
@@ -232,7 +232,7 @@ topology_template:
         vm_image_name:
           get_input: pd_image_name
         port_1b_t2_port_subinterface_indicator:
-        - true
+        - false
         compute_b_single_1b_user_data_format:
         - RAW
         port_1b_t2_port_mac_requirements:
@@ -254,7 +254,7 @@ topology_template:
           floating_ip_count_required:
             is_required: false
         port_1b_t1_port_subinterface_indicator:
-        - true
+        - false
         port_1b_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -286,8 +286,8 @@ topology_template:
         - RAW2
         - RAW1
         port_1c1_t2_port_subinterface_indicator:
-        - true
-        - true
+        - false
+        - false
         port_1c1_t2_port_network_role_tag: ppds
         vm_flavor_name:
           get_input: pd_flavor_name
@@ -385,8 +385,8 @@ topology_template:
         - group: BE_Affinity_group
         - group: BE_Affinity_group
         port_1c1_t1_port_subinterface_indicator:
-        - true
-        - true
+        - false
+        - false
         service_template_filter:
           substitute_service_template: Nested_1c1_scalling_instanceServiceTemplate.yaml
           count: 2
@@ -466,7 +466,7 @@ topology_template:
         compute_1c2_catalog_instance_availability_zone:
         - get_input: availabilityzone_name
         port_1c2_t1_port_subinterface_indicator:
-        - true
+        - false
         vm_flavor_name:
           get_input: pd_flavor_name
         vm_image_name:
@@ -483,7 +483,7 @@ topology_template:
           floating_ip_count_required:
             is_required: false
         port_1c2_t2_port_subinterface_indicator:
-        - true
+        - false
         port_1c2_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -535,7 +535,7 @@ topology_template:
         compute_1c2_catalog_instance_availability_zone:
         - get_input: availabilityzone_name
         port_1c2_t1_port_subinterface_indicator:
-        - true
+        - false
         vm_flavor_name:
           get_input: pd_flavor_name
         vm_image_name:
@@ -552,7 +552,7 @@ topology_template:
           floating_ip_count_required:
             is_required: false
         port_1c2_t2_port_subinterface_indicator:
-        - true
+        - false
         port_1c2_t1_port_mac_requirements:
           mac_count_required:
             is_required: false
@@ -766,9 +766,9 @@ topology_template:
         compute_a_single_1a_scheduler_hints:
         - group: BE_Affinity_group
         port_1a_t2_port_subinterface_indicator:
-        - true
+        - false
         port_1a_t1_port_subinterface_indicator:
-        - true
+        - false
         compute_a_single_1a_user_data_format:
         - RAW
         compute_a_single_1a_name:
@@ -940,7 +940,7 @@ topology_template:
         vm_image_name:
           get_input: pd_image_name
         port_1b_t2_port_subinterface_indicator:
-        - true
+        - false
         compute_b_single_1b_user_data_format:
         - RAW
         port_1b_t2_port_mac_requirements:
@@ -962,7 +962,7 @@ topology_template:
           floating_ip_count_required:
             is_required: false
         port_1b_t1_port_subinterface_indicator:
-        - true
+        - false
         port_1b_t1_port_network_role_tag: oam
         port_1b_t1_port_mac_requirements:
           mac_count_required:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml
index 422dcdb061..a07ae6d967 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/oneAppearancePerPattern/out/nested-no_vfc_v0.1ServiceTemplate.yaml
@@ -109,7 +109,7 @@ topology_template:
       - substitutable
       properties:
         port_pcm_port_0_subinterface_indicator:
-        - true
+        - false
         port_pcm_port_1_network_role_tag: oam
         port_pcm_port_0_fixed_ips:
         - ip_address:
@@ -124,7 +124,7 @@ topology_template:
           get_input: pcma_image_name
         port_pcm_port_0_network_role_tag: cps
         port_pcm_port_1_subinterface_indicator:
-        - true
+        - false
         port_pcm_port_1_network:
         - get_input: oam_net_name
         port_pcm_port_0_ip_requirements:
@@ -188,7 +188,7 @@ topology_template:
         - ip_address:
             get_input: cps_net_ip
         port_pcm_port_2_subinterface_indicator:
-        - true
+        - false
         vm_flavor_name:
           get_input: pcma_flavor_name
         port_pcm_port_3_security_groups:
@@ -222,7 +222,7 @@ topology_template:
         compute_pcma_server_user_data_format:
         - RAW
         port_pcm_port_3_subinterface_indicator:
-        - true
+        - false
         port_pcm_port_2_network:
         - get_input: cps_net_name
         port_pcm_port_2_ip_requirements:
@@ -693,4 +693,4 @@ topology_template:
       - dependency_pcma_server_pcm_port_1
       dependency_pcm_port_2:
       - abstract_pcma_server
-      - dependency_pcma_server_pcm_port_2
+      - dependency_pcma_server_pcm_port_2
\ No newline at end of file