Subinterface_indicator property issue

It should only be present under port implementation

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

5 files changed, 10 insertions, 178 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
index bf2b9ada70..1a003c8e28 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -54,12 +54,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-      port_plt_oam_0_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       vm_image_name:
         type: string
         required: true
@@ -102,12 +96,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.heat.network.AddressPair
-      port_plt_internal_0_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_plt_internal_0_port_subnetpoolid:
         type: string
         required: true
@@ -254,12 +242,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_plt_data_0_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_plt_oam_0_port_replacement_policy:
         type: list
         required: true
@@ -805,12 +787,6 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_app_internal_0_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       compute_app_scheduler_hints:
         type: list
         required: true
@@ -827,12 +803,6 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_app_data_0_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_app_oam_0_port_replacement_policy:
         type: list
         required: true
@@ -881,12 +851,6 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_app_oam_0_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_app_data_0_port_network:
         type: list
         required: true
@@ -1588,12 +1552,6 @@ node_types:
   org.openecomp.resource.abstract.nodes.iox:
     derived_from: org.openecomp.resource.abstract.nodes.VFC
     properties:
-      port_iox_oam_0_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_iox_data_0_port_ip_requirements:
         type: list
         required: true
@@ -1616,12 +1574,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_iox_internal_0_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       vm_flavor_name:
         type: string
         required: true
@@ -1630,12 +1582,6 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_iox_data_0_port_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_iox_data_0_port_allowed_address_pairs:
         type: list
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml
index 795db3308a..1d355386cf 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml
@@ -903,8 +903,6 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_iox_oam_0_port_subinterface_indicator:
-        - false
         port_iox_data_0_port_ip_requirements:
         - ip_version: 6
           ip_count_required:
@@ -919,12 +917,8 @@ topology_template:
             params:
               $vnf_name:
                 get_input: vnf_name
-        port_iox_internal_0_port_subinterface_indicator:
-        - false
         vm_flavor_name:
           get_input: iox_flavor_name
-        port_iox_data_0_port_subinterface_indicator:
-        - false
         port_iox_data_0_port_allowed_address_pairs:
         - ip_address:
             get_attribute:
@@ -1048,8 +1042,6 @@ topology_template:
         port_app_data_0_port_mac_requirements:
           mac_count_required:
             is_required: false
-        port_app_internal_0_port_subinterface_indicator:
-        - false
         compute_app_scheduler_hints:
         - group: app_server_group_group
         port_app_internal_0_port_ip_requirements:
@@ -1058,8 +1050,6 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_app_data_0_port_subinterface_indicator:
-        - false
         port_app_oam_0_port_replacement_policy:
         - AUTO
         port_app_oam_0_port_network:
@@ -1081,8 +1071,6 @@ topology_template:
         port_app_oam_0_port_mac_requirements:
           mac_count_required:
             is_required: false
-        port_app_oam_0_port_subinterface_indicator:
-        - false
         port_app_data_0_port_network:
         - get_input: data_net_id
         port_app_data_0_port_network_role_tag: data
@@ -1200,8 +1188,6 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_iox_oam_0_port_subinterface_indicator:
-        - false
         port_iox_data_0_port_ip_requirements:
         - ip_version: 6
           ip_count_required:
@@ -1216,12 +1202,8 @@ topology_template:
             params:
               $vnf_name:
                 get_input: vnf_name
-        port_iox_internal_0_port_subinterface_indicator:
-        - false
         vm_flavor_name:
           get_input: iox_flavor_name
-        port_iox_data_0_port_subinterface_indicator:
-        - false
         port_iox_data_0_port_allowed_address_pairs:
         - ip_address:
             get_attribute:
@@ -1340,8 +1322,6 @@ topology_template:
         port_app_data_0_port_mac_requirements:
           mac_count_required:
             is_required: false
-        port_app_internal_0_port_subinterface_indicator:
-        - false
         compute_app_scheduler_hints:
         - group: app_server_group_group
         port_app_internal_0_port_ip_requirements:
@@ -1350,8 +1330,6 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_app_data_0_port_subinterface_indicator:
-        - false
         port_app_oam_0_port_replacement_policy:
         - AUTO
         port_app_oam_0_port_network:
@@ -1378,8 +1356,6 @@ topology_template:
         port_app_oam_0_port_mac_requirements:
           mac_count_required:
             is_required: false
-        port_app_oam_0_port_subinterface_indicator:
-        - false
         port_app_data_0_port_network:
         - get_input: data_net_id
         port_app_data_0_port_network_role_tag: data
@@ -1470,8 +1446,6 @@ topology_template:
         port_app_data_0_port_mac_requirements:
           mac_count_required:
             is_required: false
-        port_app_internal_0_port_subinterface_indicator:
-        - false
         compute_app_scheduler_hints:
         - group: app_server_group_group
         port_app_internal_0_port_ip_requirements:
@@ -1480,8 +1454,6 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
-        port_app_data_0_port_subinterface_indicator:
-        - false
         port_app_oam_0_port_replacement_policy:
         - AUTO
         port_app_oam_0_port_network:
@@ -1508,8 +1480,6 @@ topology_template:
         port_app_oam_0_port_mac_requirements:
           mac_count_required:
             is_required: false
-        port_app_oam_0_port_subinterface_indicator:
-        - false
         port_app_data_0_port_network:
         - get_input: data_net_id
         port_app_data_0_port_network_role_tag: data
@@ -1628,8 +1598,6 @@ topology_template:
             get_input:
             - plt_data_v6_ips
             - 1
-        port_plt_oam_0_port_subinterface_indicator:
-        - false
         vm_image_name:
           get_input: plt_image_name
         compute_plt_availability_zone:
@@ -1658,8 +1626,6 @@ topology_template:
             - fixed_ips
             - 0
             - ip_address
-        port_plt_internal_0_port_subinterface_indicator:
-        - false
         port_plt_data_0_port_ip_requirements:
         - ip_version: 6
           ip_count_required:
@@ -1720,8 +1686,6 @@ topology_template:
         - get_input: data_net_id
         port_plt_oam_0_port_network:
         - get_input: oam_net_id
-        port_plt_data_0_port_subinterface_indicator:
-        - false
         port_plt_oam_0_port_replacement_policy:
         - AUTO
         port_plt_data_0_port_replacement_policy:
@@ -1765,8 +1729,6 @@ topology_template:
             get_input:
             - plt_data_v6_ips
             - 0
-        port_plt_oam_0_port_subinterface_indicator:
-        - false
         vm_image_name:
           get_input: plt_image_name
         compute_plt_availability_zone:
@@ -1795,8 +1757,6 @@ topology_template:
             - fixed_ips
             - 0
             - ip_address
-        port_plt_internal_0_port_subinterface_indicator:
-        - false
         port_plt_data_0_port_ip_requirements:
         - ip_version: 6
           ip_count_required:
@@ -1862,8 +1822,6 @@ topology_template:
         - get_input: data_net_id
         port_plt_oam_0_port_network:
         - get_input: oam_net_id
-        port_plt_data_0_port_subinterface_indicator:
-        - false
         port_plt_oam_0_port_replacement_policy:
         - AUTO
         port_plt_data_0_port_replacement_policy:
@@ -1986,4 +1944,4 @@ topology_template:
                 get_input: vnf_name
         container_type: host
       targets:
-      - app_server_group_group
\ No newline at end of file
+      - app_server_group_group
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml
index 3723fc133f..9f19dcc0ac 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml
@@ -14,11 +14,6 @@ topology_template:
     port_app_data_0_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_app_internal_0_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     compute_app_scheduler_hints:
       type: list
       required: true
@@ -32,11 +27,6 @@ topology_template:
     port_app_data_0_port_network_role:
       type: string
       required: true
-    port_app_data_0_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_app_oam_0_port_replacement_policy:
       type: list
       required: true
@@ -76,11 +66,6 @@ topology_template:
     port_app_oam_0_port_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_app_oam_0_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_app_data_0_port_network:
       type: list
       required: true
@@ -290,10 +275,7 @@ topology_template:
           get_input: port_app_internal_0_port_exCP_naming
         vlan_requirements:
           get_input: port_app_internal_0_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_app_internal_0_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_app_internal_0_port_ip_requirements
         network_role_tag:
@@ -334,10 +316,7 @@ topology_template:
           get_input: port_app_oam_0_port_exCP_naming
         vlan_requirements:
           get_input: port_app_oam_0_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_app_oam_0_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_app_oam_0_port_ip_requirements
         network_role_tag:
@@ -382,10 +361,7 @@ topology_template:
           get_input: port_app_data_0_port_exCP_naming
         vlan_requirements:
           get_input: port_app_data_0_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_app_data_0_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_app_data_0_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml
index bdd2d98bfc..5776405b4f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml
@@ -11,11 +11,6 @@ node_types:
     derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server
 topology_template:
   inputs:
-    port_iox_oam_0_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_iox_data_0_port_ip_requirements:
       type: list
       required: true
@@ -34,22 +29,12 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_iox_internal_0_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     vm_flavor_name:
       type: string
       required: true
     port_iox_data_0_port_subnetpoolid:
       type: string
       required: true
-    port_iox_data_0_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_iox_data_0_port_allowed_address_pairs:
       type: list
       required: true
@@ -260,10 +245,7 @@ topology_template:
           get_input: port_iox_data_0_port_exCP_naming
         vlan_requirements:
           get_input: port_iox_data_0_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_iox_data_0_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_iox_data_0_port_ip_requirements
         network_role_tag:
@@ -341,10 +323,7 @@ topology_template:
           get_input: port_iox_oam_0_port_exCP_naming
         vlan_requirements:
           get_input: port_iox_oam_0_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_iox_oam_0_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_iox_oam_0_port_ip_requirements
         network_role_tag:
@@ -391,10 +370,7 @@ topology_template:
           get_input: port_iox_internal_0_port_exCP_naming
         vlan_requirements:
           get_input: port_iox_internal_0_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_iox_internal_0_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_iox_internal_0_port_ip_requirements
         network_role_tag:
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml
index bb4b53504b..43be472875 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml
@@ -48,11 +48,6 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.neutron.port.FixedIps
-    port_plt_oam_0_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     vm_image_name:
       type: string
       required: true
@@ -87,11 +82,6 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.heat.network.AddressPair
-    port_plt_internal_0_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_plt_internal_0_port_subnetpoolid:
       type: string
       required: true
@@ -210,11 +200,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_plt_data_0_port_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_plt_oam_0_port_replacement_policy:
       type: list
       required: true
@@ -260,10 +245,7 @@ topology_template:
           get_input: port_plt_internal_0_port_exCP_naming
         vlan_requirements:
           get_input: port_plt_internal_0_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_plt_internal_0_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_plt_internal_0_port_ip_requirements
         network_role_tag:
@@ -306,10 +288,7 @@ topology_template:
           get_input: port_plt_data_0_port_exCP_naming
         vlan_requirements:
           get_input: port_plt_data_0_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_plt_data_0_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_plt_data_0_port_ip_requirements
         network_role_tag:
@@ -387,10 +366,7 @@ topology_template:
           get_input: port_plt_oam_0_port_exCP_naming
         vlan_requirements:
           get_input: port_plt_oam_0_port_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_plt_oam_0_port_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_plt_oam_0_port_ip_requirements
         network_role_tag: