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 | 182 ++++++--------------- 1 file changed, 49 insertions(+), 133 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml index 0708c661c5..20f2eca975 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/mixPatterns/dependencyConnectivity/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -960,12 +960,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_pcm_port_2_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_3_network_role: type: string required: true @@ -1064,12 +1058,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_pcm_port_3_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_2_order: type: integer required: true @@ -2130,12 +2118,6 @@ node_types: type: string required: true status: SUPPORTED - port_1c2_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c2_t2_port_network_role: type: string required: true @@ -2176,12 +2158,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1c2_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c2_t1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -2692,12 +2668,6 @@ node_types: type: string required: true status: SUPPORTED - port_pcm_port_0_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_1_network_role_tag: type: string required: true @@ -2762,12 +2732,6 @@ node_types: type: string required: true status: SUPPORTED - port_pcm_port_1_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_pcm_port_1_network: type: list required: true @@ -3277,64 +3241,6 @@ node_types: org.openecomp.resource.abstract.nodes.b_single_1b: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_1b_t1_port_order: - type: integer - required: true - status: SUPPORTED - port_1b_t1_port_network_role: - type: string - required: true - status: SUPPORTED - port_1b_t1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - vm_flavor_name: - type: string - required: true - status: SUPPORTED - port_1b_t1_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - vm_image_name: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_network_role: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_order: - type: integer - required: true - status: SUPPORTED - port_1b_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean - compute_b_single_1b_user_data_format: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string - port_1b_t2_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_1b_t2_port_network_role_tag: - type: string - required: true - status: SUPPORTED - port_1b_t2_port_subnetpoolid: - type: string - required: true - status: SUPPORTED port_1b_t2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -3359,6 +3265,10 @@ node_types: status: SUPPORTED entry_schema: type: json + port_1b_t1_port_order: + type: integer + required: true + status: SUPPORTED port_1b_t2_port_vlan_requirements: type: list required: true @@ -3371,13 +3281,29 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_subinterface_indicator: + port_1b_t1_port_network_role: + type: string + required: true + status: SUPPORTED + port_1b_t1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + vm_flavor_name: + type: string + required: true + status: SUPPORTED + port_1b_t1_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_1b_t1_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: boolean - port_1b_t1_port_network_role_tag: + type: org.openecomp.datatypes.network.IpRequirements + vm_image_name: type: string required: true status: SUPPORTED @@ -3395,18 +3321,44 @@ node_types: status: SUPPORTED entry_schema: type: string + port_1b_t2_port_network_role: + type: string + required: true + status: SUPPORTED + port_1b_t2_port_order: + type: integer + required: true + status: SUPPORTED port_1b_t1_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + compute_b_single_1b_user_data_format: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_1b_t2_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED compute_b_single_1b_name: type: list required: true status: SUPPORTED entry_schema: type: string + port_1b_t2_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_1b_t2_port_subnetpoolid: + type: string + required: true + status: SUPPORTED attributes: b_single_1b_instance_name: type: string @@ -3859,12 +3811,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_1c1_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c1_t2_port_network_role_tag: type: string required: true @@ -3993,12 +3939,6 @@ node_types: type: string required: true status: SUPPORTED - port_1c1_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1c1_t1_port_order: type: integer required: true @@ -4529,22 +4469,10 @@ node_types: type: integer required: true status: SUPPORTED - port_1a_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1a_t2_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_1a_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1a_t2_port_vlan_requirements: type: list required: true @@ -5045,12 +4973,6 @@ node_types: type: integer required: true status: SUPPORTED - port_1b_t2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean compute_b_single_1b_user_data_format: type: list required: true @@ -5105,12 +5027,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_1b_t1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_1b_t1_port_network_role_tag: type: string required: true -- cgit 1.2.3-korg