From d60b2a40c15c5952f8a31e2d2aa4be2cf4837fc8 Mon Sep 17 00:00:00 2001 From: siddharth0905 Date: Thu, 12 Apr 2018 19:29:57 +0530 Subject: Subinterface_indicator property issue It should only be present under port implementation Change-Id: I8b52905c5e5c888cf384bebf1d23168c7906b004 Issue-ID: SDC-1183 Signed-off-by: siddharth0905 --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 12 --------- .../out/SubstitutionServiceTemplate.yaml | 20 ++------------- .../GlobalSubstitutionTypesServiceTemplate.yaml | 18 ------------- .../out/SubstitutionServiceTemplate.yaml | 30 +++------------------- 4 files changed, 5 insertions(+), 75 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 8113a8048f..b0861eae74 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -74,12 +74,6 @@ node_types: 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 @@ -122,12 +116,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_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml index 72d2ee6f1f..2978332fac 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/consolidation/out/SubstitutionServiceTemplate.yaml @@ -63,11 +63,6 @@ topology_template: 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 @@ -102,11 +97,6 @@ topology_template: required: true entry_schema: type: string - port_FSB2_Internal_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_FSB1_Internal_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -126,10 +116,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: @@ -160,10 +147,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/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml index 52effbbc3a..7aadbaf386 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -42,12 +42,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 @@ -104,12 +98,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 compute_FSB1_availability_zone: type: list required: true @@ -166,12 +154,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/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml index 0fb34fd252..b3663c8ac4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/unifiedComposition/creSubstitutionServiceTemplate/WithOutputParameters/noConsolidation/out/SubstitutionServiceTemplate.yaml @@ -38,11 +38,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 @@ -87,11 +82,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 compute_FSB1_availability_zone: type: list required: true @@ -137,11 +127,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 @@ -169,10 +154,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: @@ -203,10 +185,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: @@ -237,10 +216,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: -- cgit 1.2.3-korg