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>

8 files changed, 30 insertions, 124 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ac8621e29b..94ebe4da6c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -866,12 +866,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_cmaui_port_5_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       compute_cmaui_availability_zone:
         type: list
         required: true
@@ -960,12 +954,6 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_cmaui_port_6_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_cmaui_port_5_vlan_requirements:
         type: list
         required: true
@@ -1445,12 +1433,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_cmaui_port_4_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_cmaui_port_4_fixed_ips:
         type: list
         required: true
@@ -1531,12 +1513,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
-      port_cmaui_port_3_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_cmaui_port_4_network_role_tag:
         type: string
         required: true
@@ -3808,12 +3784,6 @@ node_types:
         type: string
         required: true
         status: SUPPORTED
-      port_cmaui_port_2_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_cmaui_port_1_security_groups:
         type: list
         required: true
@@ -3902,12 +3872,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.VlanRequirements
-      port_cmaui_port_1_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_cmaui_port_1_replacement_policy:
         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/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml
index 1fc1065837..8f42b61c6a 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml
@@ -36,11 +36,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_cmaui_port_5_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     compute_cmaui_availability_zone:
       type: list
       required: true
@@ -113,11 +108,6 @@ topology_template:
     port_cmaui_port_5_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_cmaui_port_6_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_cmaui_port_5_vlan_requirements:
       type: list
       required: true
@@ -160,22 +150,19 @@ topology_template:
           get_input: port_cmaui_port_5_exCP_naming
         vlan_requirements:
           get_input: port_cmaui_port_5_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_cmaui_port_5_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_cmaui_port_5_ip_requirements
         network_role_tag:
           get_input: port_cmaui_port_5_network_role_tag
         network_role:
           get_input: port_cmaui_port_5_network_role
-        subnetpoolid:
-          get_input: port_cmaui_port_5_subnetpoolid
         fixed_ips:
           get_input:
           - port_cmaui_port_5_fixed_ips
           - index_value
+        subnetpoolid:
+          get_input: port_cmaui_port_5_subnetpoolid
         network:
           get_input:
           - port_cmaui_port_5_network
@@ -204,22 +191,19 @@ topology_template:
           get_input: port_cmaui_port_6_exCP_naming
         vlan_requirements:
           get_input: port_cmaui_port_6_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_cmaui_port_6_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_cmaui_port_6_ip_requirements
         network_role_tag:
           get_input: port_cmaui_port_6_network_role_tag
         network_role:
           get_input: port_cmaui_port_6_network_role
-        subnetpoolid:
-          get_input: port_cmaui_port_6_subnetpoolid
         fixed_ips:
           get_input:
           - port_cmaui_port_6_fixed_ips
           - index_value
+        subnetpoolid:
+          get_input: port_cmaui_port_6_subnetpoolid
         network:
           get_input:
           - port_cmaui_port_6_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml
index 178821d0f9..3407e72dc8 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml
@@ -28,11 +28,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_cmaui_port_4_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_cmaui_port_4_fixed_ips:
       type: list
       required: true
@@ -98,11 +93,6 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
-    port_cmaui_port_3_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_cmaui_port_4_network_role_tag:
       type: string
       required: true
@@ -160,22 +150,19 @@ topology_template:
           get_input: port_cmaui_port_4_exCP_naming
         vlan_requirements:
           get_input: port_cmaui_port_4_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_cmaui_port_4_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_cmaui_port_4_ip_requirements
         network_role_tag:
           get_input: port_cmaui_port_4_network_role_tag
         network_role:
           get_input: port_cmaui_port_4_network_role
-        subnetpoolid:
-          get_input: port_cmaui_port_4_subnetpoolid
         fixed_ips:
           get_input:
           - port_cmaui_port_4_fixed_ips
           - index_value
+        subnetpoolid:
+          get_input: port_cmaui_port_4_subnetpoolid
         network:
           get_input:
           - port_cmaui_port_4_network
@@ -204,22 +191,19 @@ topology_template:
           get_input: port_cmaui_port_3_exCP_naming
         vlan_requirements:
           get_input: port_cmaui_port_3_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_cmaui_port_3_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_cmaui_port_3_ip_requirements
         network_role_tag:
           get_input: port_cmaui_port_3_network_role_tag
         network_role:
           get_input: port_cmaui_port_3_network_role
-        subnetpoolid:
-          get_input: port_cmaui_port_3_subnetpoolid
         fixed_ips:
           get_input:
           - port_cmaui_port_3_fixed_ips
           - index_value
+        subnetpoolid:
+          get_input: port_cmaui_port_3_subnetpoolid
         network:
           get_input:
           - port_cmaui_port_3_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml
index 934995a586..08dd30adc1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml
@@ -20,11 +20,6 @@ topology_template:
     port_cmaui_port_1_subnetpoolid:
       type: string
       required: true
-    port_cmaui_port_2_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_cmaui_port_1_security_groups:
       type: list
       required: true
@@ -96,11 +91,6 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.VlanRequirements
-    port_cmaui_port_1_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_cmaui_port_1_replacement_policy:
       type: list
       required: true
@@ -160,22 +150,19 @@ topology_template:
           get_input: port_cmaui_port_1_exCP_naming
         vlan_requirements:
           get_input: port_cmaui_port_1_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_cmaui_port_1_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_cmaui_port_1_ip_requirements
         network_role_tag:
           get_input: port_cmaui_port_1_network_role_tag
         network_role:
           get_input: port_cmaui_port_1_network_role
-        subnetpoolid:
-          get_input: port_cmaui_port_1_subnetpoolid
         fixed_ips:
           get_input:
           - port_cmaui_port_1_fixed_ips
           - index_value
+        subnetpoolid:
+          get_input: port_cmaui_port_1_subnetpoolid
         network:
           get_input:
           - port_cmaui_port_1_network
@@ -204,22 +191,19 @@ topology_template:
           get_input: port_cmaui_port_2_exCP_naming
         vlan_requirements:
           get_input: port_cmaui_port_2_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_cmaui_port_2_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_cmaui_port_2_ip_requirements
         network_role_tag:
           get_input: port_cmaui_port_2_network_role_tag
         network_role:
           get_input: port_cmaui_port_2_network_role
-        subnetpoolid:
-          get_input: port_cmaui_port_2_subnetpoolid
         fixed_ips:
           get_input:
           - port_cmaui_port_2_fixed_ips
           - index_value
+        subnetpoolid:
+          get_input: port_cmaui_port_2_subnetpoolid
         network:
           get_input:
           - port_cmaui_port_2_network
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml
index 9c4ebd296a..e543c21f8e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested1ServiceTemplate.yaml
@@ -62,8 +62,6 @@ topology_template:
       directives:
       - substitutable
       properties:
-        port_cmaui_port_2_subinterface_indicator:
-        - false
         port_cmaui_port_1_security_groups:
         - - get_input: p1
           - get_input: p2
@@ -96,8 +94,6 @@ topology_template:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_cmaui_port_1_subinterface_indicator:
-        - false
         port_cmaui_port_1_replacement_policy:
         - AUTO
         port_cmaui_port_2_replacement_policy:
@@ -1018,4 +1014,4 @@ topology_template:
       - dependency_cmaui
       dependency_cmaui_port_4_test_nested2Level:
       - test_nested2Level
-      - dependency_cmaui_port_4
\ No newline at end of file
+      - dependency_cmaui_port_4
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml
index d607379ed9..67af3b2fa7 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested2ServiceTemplate.yaml
@@ -89,8 +89,6 @@ topology_template:
         - get_input:
           - cmaui_names
           - 0
-        port_cmaui_port_4_subinterface_indicator:
-        - false
         port_cmaui_port_4_fixed_ips:
         - ip_address:
             get_input:
@@ -118,8 +116,6 @@ topology_template:
             is_required: true
           floating_ip_count_required:
             is_required: false
-        port_cmaui_port_3_subinterface_indicator:
-        - false
         port_cmaui_port_4_replacement_policy:
         - AUTO
         port_cmaui_port_3_replacement_policy:
@@ -806,4 +802,4 @@ topology_template:
       - dependency_cmaui_cmaui_port_3
       dependency_cmaui_port_5_test_nested3Level:
       - test_nested3Level
-      - dependency_cmaui_port_5
\ No newline at end of file
+      - dependency_cmaui_port_5
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml
index 8d6cae825d..a68045fcea 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested3ServiceTemplate.yaml
@@ -105,8 +105,6 @@ topology_template:
         - get_input:
           - cmaui_names
           - 0
-        port_cmaui_port_5_subinterface_indicator:
-        - false
         compute_cmaui_availability_zone:
         - get_input: availability_zone_0
         vm_image_name:
@@ -141,8 +139,6 @@ topology_template:
         port_cmaui_port_5_mac_requirements:
           mac_count_required:
             is_required: false
-        port_cmaui_port_6_subinterface_indicator:
-        - false
         port_cmaui_port_6_mac_requirements:
           mac_count_required:
             is_required: false
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml
index 257d8c7722..17205b3a8e 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml
@@ -118,6 +118,10 @@ topology_template:
     cmaui_port_7:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_cmaui_port_7_subnetpoolid
+        network:
+          get_input: net
         replacement_policy: AUTO
         ip_requirements:
           get_input: port_cmaui_port_7_ip_requirements
@@ -130,18 +134,15 @@ topology_template:
             get_input:
             - cmaui_oam_ips
             - 0
-        subnetpoolid:
-          get_input: port_cmaui_port_7_subnetpoolid
         mac_requirements:
           get_input: port_cmaui_port_7_mac_requirements
+        subinterface_indicator: false
         exCP_naming:
           get_input: port_cmaui_port_7_exCP_naming
         vlan_requirements:
           get_input: port_cmaui_port_7_vlan_requirements
         network_role_tag:
           get_input: port_cmaui_port_7_network_role_tag
-        network:
-          get_input: net
         order:
           get_input: port_cmaui_port_7_order
       requirements:
@@ -165,6 +166,10 @@ topology_template:
     cmaui_port_8:
       type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port
       properties:
+        subnetpoolid:
+          get_input: port_cmaui_port_8_subnetpoolid
+        network:
+          get_input: net
         replacement_policy: AUTO
         ip_requirements:
           get_input: port_cmaui_port_8_ip_requirements
@@ -178,18 +183,15 @@ topology_template:
             get_input:
             - cmaui_oam_ips
             - 0
-        subnetpoolid:
-          get_input: port_cmaui_port_8_subnetpoolid
         mac_requirements:
           get_input: port_cmaui_port_8_mac_requirements
+        subinterface_indicator: false
         exCP_naming:
           get_input: port_cmaui_port_8_exCP_naming
         vlan_requirements:
           get_input: port_cmaui_port_8_vlan_requirements
         network_role_tag:
           get_input: port_cmaui_port_8_network_role_tag
-        network:
-          get_input: net
         order:
           get_input: port_cmaui_port_8_order
       requirements: