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>

4 files changed, 66 insertions, 136 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index c88962628d..3e8b719e50 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -38,48 +38,6 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      vm_flavor_name:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB2_Internal_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_network_role_tag:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_vlan_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_FSB2_Internal_subnetpoolid:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_network_role:
-        type: string
-        required: true
-        status: SUPPORTED
-      port_FSB1_Internal_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       compute_FSB1_availability_zone:
         type: list
         required: true
@@ -98,30 +56,52 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
+      port_FSB2_Internal_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      vm_flavor_name:
+        type: string
+        required: true
+        status: SUPPORTED
       port_FSB2_Internal_mac_address:
         type: string
         required: true
         status: SUPPORTED
+      port_FSB2_Internal_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
       port_FSB2_Internal_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
+      port_FSB1_Internal_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
       port_FSB1_Internal_order:
         type: integer
         required: true
         status: SUPPORTED
-      port_FSB2_Internal_network:
+      port_FSB1_Internal_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: string
-      port_FSB2_Internal_subinterface_indicator:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_FSB2_Internal_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: boolean
+          type: string
+      port_FSB2_Internal_subnetpoolid:
+        type: string
+        required: true
+        status: SUPPORTED
       port_FSB1_Internal_mac_requirements:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
@@ -132,6 +112,14 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
+      port_FSB1_Internal_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
+      port_FSB1_Internal_network_role:
+        type: string
+        required: true
+        status: SUPPORTED
       port_FSB2_Internal_network_role_tag:
         type: string
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
index b1ba634c79..9e616c9ba0 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/consolidation/out/SubstitutionServiceTemplate.yaml
@@ -35,39 +35,6 @@ topology_template:
     port_FSB2_Internal_order:
       type: integer
       required: true
-    port_FSB2_Internal_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    vm_flavor_name:
-      type: string
-      required: true
-    port_FSB2_Internal_network_role:
-      type: string
-      required: true
-    port_FSB1_Internal_network_role_tag:
-      type: string
-      required: true
-    port_FSB1_Internal_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_FSB2_Internal_subnetpoolid:
-      type: string
-      required: true
-    port_FSB1_Internal_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_FSB1_Internal_network_role:
-      type: string
-      required: true
-    port_FSB1_Internal_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     compute_FSB1_availability_zone:
       type: list
       required: true
@@ -83,25 +50,42 @@ topology_template:
     port_FSB2_Internal_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
+    port_FSB2_Internal_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    vm_flavor_name:
+      type: string
+      required: true
     port_FSB2_Internal_mac_address:
       type: string
       required: true
+    port_FSB2_Internal_network_role:
+      type: string
+      required: true
     port_FSB2_Internal_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
+    port_FSB1_Internal_network_role_tag:
+      type: string
+      required: true
     port_FSB1_Internal_order:
       type: integer
       required: true
-    port_FSB2_Internal_network:
+    port_FSB1_Internal_vlan_requirements:
       type: list
       required: true
       entry_schema:
-        type: string
-    port_FSB2_Internal_subinterface_indicator:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_FSB2_Internal_network:
       type: list
       required: true
       entry_schema:
-        type: boolean
+        type: string
+    port_FSB2_Internal_subnetpoolid:
+      type: string
+      required: true
     port_FSB1_Internal_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
@@ -110,6 +94,12 @@ topology_template:
       required: true
       entry_schema:
         type: string
+    port_FSB1_Internal_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
+    port_FSB1_Internal_network_role:
+      type: string
+      required: true
     port_FSB2_Internal_network_role_tag:
       type: string
       required: true
@@ -121,10 +111,7 @@ topology_template:
           get_input: port_FSB1_Internal_exCP_naming
         vlan_requirements:
           get_input: port_FSB1_Internal_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_FSB1_Internal_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB1_Internal_ip_requirements
         network_role_tag:
@@ -161,10 +148,7 @@ topology_template:
           get_input: port_FSB2_Internal_exCP_naming
         vlan_requirements:
           get_input: port_FSB2_Internal_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_FSB2_Internal_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB2_Internal_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/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
index 7fd691c1d9..397a1a0541 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -36,12 +36,6 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
-      port_FSB1_OAM_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_FSB1_OAM_exCP_naming:
         type: org.openecomp.datatypes.Naming
         required: true
@@ -98,12 +92,6 @@ node_types:
         type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_FSB1_Internal_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_FSB1_Internal_network:
         type: list
         required: true
@@ -154,12 +142,6 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_FSB2_Internal_subinterface_indicator:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: boolean
       port_FSB1_OAM_network_role_tag:
         type: string
         required: true
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
index f0a87d321a..bb7bb359c1 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/updNodesGetAttrInFromInnerNodes/noConsolidation/out/SubstitutionServiceTemplate.yaml
@@ -33,11 +33,6 @@ topology_template:
     port_FSB2_Internal_order:
       type: integer
       required: true
-    port_FSB1_OAM_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_FSB1_OAM_exCP_naming:
       type: org.openecomp.datatypes.Naming
       required: true
@@ -82,11 +77,6 @@ topology_template:
     port_FSB1_OAM_mac_requirements:
       type: org.openecomp.datatypes.network.MacRequirements
       required: true
-    port_FSB1_Internal_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_FSB1_Internal_network:
       type: list
       required: true
@@ -127,11 +117,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_FSB2_Internal_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
     port_FSB1_OAM_network_role_tag:
       type: string
       required: true
@@ -154,10 +139,7 @@ topology_template:
           get_input: port_FSB1_Internal_exCP_naming
         vlan_requirements:
           get_input: port_FSB1_Internal_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_FSB1_Internal_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB1_Internal_ip_requirements
         network_role_tag:
@@ -188,10 +170,7 @@ topology_template:
           get_input: port_FSB2_Internal_exCP_naming
         vlan_requirements:
           get_input: port_FSB2_Internal_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_FSB2_Internal_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB2_Internal_ip_requirements
         network_role_tag:
@@ -222,10 +201,7 @@ topology_template:
           get_input: port_FSB1_OAM_exCP_naming
         vlan_requirements:
           get_input: port_FSB1_OAM_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_FSB1_OAM_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_FSB1_OAM_ip_requirements
         network_role_tag: