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>

3 files changed, 91 insertions, 123 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
index ace7b0798e..3a97da1e81 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/GlobalSubstitutionTypesServiceTemplate.yaml
@@ -24,10 +24,28 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: org.openecomp.datatypes.network.IpRequirements
+      port_pd01_port_0_network_role_tag:
+        type: string
+        required: true
+        status: SUPPORTED
       port_pd01_port_0_network_role:
         type: string
         required: true
         status: SUPPORTED
+      port_pd01_port_1_ip_requirements:
+        type: list
+        required: true
+        status: SUPPORTED
+        entry_schema:
+          type: org.openecomp.datatypes.network.IpRequirements
+      index_value:
+        type: integer
+        description: Index value of this substitution service template runtime instance
+        required: false
+        default: 0
+        status: SUPPORTED
+        constraints:
+        - greater_or_equal: 0
       compute_pd_server_availability_zone:
         type: list
         required: true
@@ -40,16 +58,18 @@ node_types:
         status: SUPPORTED
         entry_schema:
           type: string
-      port_pd01_port_0_subinterface_indicator:
-        type: list
+      port_pd01_port_1_order:
+        type: integer
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: boolean
       vm_flavor_name:
         type: string
         required: true
         status: SUPPORTED
+      port_pd01_port_0_exCP_naming:
+        type: org.openecomp.datatypes.Naming
+        required: true
+        status: SUPPORTED
       port_pd01_port_1_network_role:
         type: string
         required: true
@@ -58,86 +78,54 @@ node_types:
         type: integer
         required: true
         status: SUPPORTED
-      port_pd01_port_1_subnetpoolid:
-        type: string
+      port_pd01_port_1_vlan_requirements:
+        type: list
         required: true
         status: SUPPORTED
-      vm_image_name:
-        type: string
+        entry_schema:
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd01_port_1_mac_requirements:
+        type: org.openecomp.datatypes.network.MacRequirements
         required: true
         status: SUPPORTED
-      port_pd01_port_1_network_role_tag:
+      port_pd01_port_1_subnetpoolid:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_0_subnetpoolid:
+      vm_image_name:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_network:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: string
-      compute_pd_server_user_data_format:
-        type: list
+      port_pd01_port_1_exCP_naming:
+        type: org.openecomp.datatypes.Naming
         required: true
         status: SUPPORTED
-        entry_schema:
-          type: string
-      port_pd01_port_0_network_role_tag:
+      port_pd01_port_1_network_role_tag:
         type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_ip_requirements:
-        type: list
-        required: true
-        status: SUPPORTED
-        entry_schema:
-          type: org.openecomp.datatypes.network.IpRequirements
-      index_value:
-        type: integer
-        description: Index value of this substitution service template runtime instance
-        required: false
-        default: 0
-        status: SUPPORTED
-        constraints:
-        - greater_or_equal: 0
-      port_pd01_port_1_subinterface_indicator:
+      port_pd01_port_0_vlan_requirements:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: boolean
-      port_pd01_port_1_order:
-        type: integer
-        required: true
-        status: SUPPORTED
-      port_pd01_port_0_exCP_naming:
-        type: org.openecomp.datatypes.Naming
+          type: org.openecomp.datatypes.network.VlanRequirements
+      port_pd01_port_0_subnetpoolid:
+        type: string
         required: true
         status: SUPPORTED
-      port_pd01_port_1_vlan_requirements:
+      port_pd01_port_1_network:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
-      port_pd01_port_1_mac_requirements:
-        type: org.openecomp.datatypes.network.MacRequirements
-        required: true
-        status: SUPPORTED
-      port_pd01_port_1_exCP_naming:
-        type: org.openecomp.datatypes.Naming
-        required: true
-        status: SUPPORTED
-      port_pd01_port_0_vlan_requirements:
+          type: string
+      compute_pd_server_user_data_format:
         type: list
         required: true
         status: SUPPORTED
         entry_schema:
-          type: org.openecomp.datatypes.network.VlanRequirements
+          type: string
     requirements:
     - dependency_pd_server:
         capability: tosca.capabilities.Node
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml
index 7239791942..dd26c73c26 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/MainServiceTemplate.yaml
@@ -106,18 +106,25 @@ topology_template:
             is_required: false
           floating_ip_count_required:
             is_required: false
+        port_pd01_port_1_ip_requirements:
+        - ip_version: 4
+          ip_count_required:
+            is_required: false
+          floating_ip_count_required:
+            is_required: false
         compute_pd_server_availability_zone:
         - get_input: availabilityzone_name
         compute_pd_server_name:
         - get_input:
           - pd_server_names
           - 0
-        port_pd01_port_0_subinterface_indicator:
-        - false
         vm_flavor_name:
           get_attribute:
           - network_policy_server
           - name
+        port_pd01_port_1_mac_requirements:
+          mac_count_required:
+            is_required: false
         vm_image_name:
           get_input: pd_image_name
         port_pd01_port_1_network_role_tag: oam
@@ -125,17 +132,6 @@ topology_template:
         - get_input: oam_net_name
         compute_pd_server_user_data_format:
         - RAW
-        port_pd01_port_1_ip_requirements:
-        - ip_version: 4
-          ip_count_required:
-            is_required: false
-          floating_ip_count_required:
-            is_required: false
-        port_pd01_port_1_subinterface_indicator:
-        - false
-        port_pd01_port_1_mac_requirements:
-          mac_count_required:
-            is_required: false
         service_template_filter:
           substitute_service_template: Nested_pd_serverServiceTemplate.yaml
           count: 1
@@ -157,4 +153,4 @@ topology_template:
         description: heat template that creates MOG stack
       members:
       - network_policy_server
-      - abstract_pd_server
\ No newline at end of file
+      - abstract_pd_server
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
index 818ba138cb..0dd90f3eea 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/singleSubstitution/oneComputeSamePortTypesAndGetAttOut/out/Nested_pd_serverServiceTemplate.yaml
@@ -24,9 +24,24 @@ topology_template:
       required: true
       entry_schema:
         type: org.openecomp.datatypes.network.IpRequirements
+    port_pd01_port_0_network_role_tag:
+      type: string
+      required: true
     port_pd01_port_0_network_role:
       type: string
       required: true
+    port_pd01_port_1_ip_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.IpRequirements
+    index_value:
+      type: integer
+      description: Index value of this substitution service template runtime instance
+      required: false
+      default: 0
+      constraints:
+      - greater_or_equal: 0
     compute_pd_server_availability_zone:
       type: list
       required: true
@@ -37,29 +52,46 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port_0_subinterface_indicator:
-      type: list
+    port_pd01_port_1_order:
+      type: integer
       required: true
-      entry_schema:
-        type: boolean
     vm_flavor_name:
       type: string
       required: true
+    port_pd01_port_0_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
     port_pd01_port_1_network_role:
       type: string
       required: true
     port_pd01_port_0_order:
       type: integer
       required: true
+    port_pd01_port_1_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
+    port_pd01_port_1_mac_requirements:
+      type: org.openecomp.datatypes.network.MacRequirements
+      required: true
     port_pd01_port_1_subnetpoolid:
       type: string
       required: true
     vm_image_name:
       type: string
       required: true
+    port_pd01_port_1_exCP_naming:
+      type: org.openecomp.datatypes.Naming
+      required: true
     port_pd01_port_1_network_role_tag:
       type: string
       required: true
+    port_pd01_port_0_vlan_requirements:
+      type: list
+      required: true
+      entry_schema:
+        type: org.openecomp.datatypes.network.VlanRequirements
     port_pd01_port_0_subnetpoolid:
       type: string
       required: true
@@ -73,48 +105,6 @@ topology_template:
       required: true
       entry_schema:
         type: string
-    port_pd01_port_0_network_role_tag:
-      type: string
-      required: true
-    port_pd01_port_1_ip_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.IpRequirements
-    index_value:
-      type: integer
-      description: Index value of this substitution service template runtime instance
-      required: false
-      default: 0
-      constraints:
-      - greater_or_equal: 0
-    port_pd01_port_1_subinterface_indicator:
-      type: list
-      required: true
-      entry_schema:
-        type: boolean
-    port_pd01_port_1_order:
-      type: integer
-      required: true
-    port_pd01_port_0_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pd01_port_1_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
-    port_pd01_port_1_mac_requirements:
-      type: org.openecomp.datatypes.network.MacRequirements
-      required: true
-    port_pd01_port_1_exCP_naming:
-      type: org.openecomp.datatypes.Naming
-      required: true
-    port_pd01_port_0_vlan_requirements:
-      type: list
-      required: true
-      entry_schema:
-        type: org.openecomp.datatypes.network.VlanRequirements
   node_templates:
     pd_server:
       type: org.openecomp.resource.vfc.compute.nodes.heat.pd_server
@@ -142,10 +132,7 @@ topology_template:
           get_input: port_pd01_port_1_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_1_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_pd01_port_1_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_1_ip_requirements
         network_role_tag:
@@ -174,10 +161,7 @@ topology_template:
           get_input: port_pd01_port_0_exCP_naming
         vlan_requirements:
           get_input: port_pd01_port_0_vlan_requirements
-        subinterface_indicator:
-          get_input:
-          - port_pd01_port_0_subinterface_indicator
-          - index_value
+        subinterface_indicator: false
         ip_requirements:
           get_input: port_pd01_port_0_ip_requirements
         network_role_tag: