From 707adfa57f63b49519badddbf72e411485269c37 Mon Sep 17 00:00:00 2001 From: ojasdubey Date: Tue, 27 Mar 2018 17:03:51 +0530 Subject: VLAN tagging - Support Pattern 1C2 1. Pattern 1C2 vlan tagging code 2. Count property handling 3. Added tests and updated existing test data Change-Id: Idef33b142d415e1c0a9663497eed621f35c2393b Issue-ID: SDC-1174 Signed-off-by: ojasdubey --- .../out/GlobalSubstitutionTypesServiceTemplate.yaml | 15 ++++++--------- .../out/MainServiceTemplate.yaml | 21 +++++++++++++++++++++ .../out/Nested_vdbeServiceTemplate.yaml | 19 +++++++++---------- 3 files changed, 36 insertions(+), 19 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml index f61a83ec87..8088898fbb 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -40,6 +40,12 @@ node_types: status: SUPPORTED entry_schema: type: string + subinterface_nested_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float subinterface_nested_aap_untrusted_v6_ip_prefix_len: type: list required: true @@ -50,15 +56,6 @@ node_types: type: string required: true status: SUPPORTED - untrusted_num_vn: - type: float - description: Number of vDBE subinterface virtual Networks - required: true - status: SUPPORTED - constraints: - - in_range: - - 1 - - 77 port_vdbe_untr_port_order: type: integer required: true diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml index 56f3113e61..69c79c3e42 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/MainServiceTemplate.yaml @@ -86,6 +86,23 @@ topology_template: param_name: vdbe_aap_untrusted_ip_prefix_len type: string description: ip prefix length for the primary vDBE VM on the VAN untrusted network + untrusted_num_vn: + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - main + source_type: HEAT + param_name: untrusted_num_vn + type: float + description: Number of vDBE subinterface virtual Networks + constraints: + - in_range: + - 1 + - 77 aap_address_mode: hidden: false immutable: false @@ -396,6 +413,8 @@ topology_template: - get_input: untrusted_vlan_tags compute_vdbe_availability_zone: - get_input: availability_zone_1 + subinterface_nested_service_template_filter_count: + - get_input: untrusted_num_vn subinterface_nested_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len vm_flavor_name: @@ -496,6 +515,8 @@ topology_template: - get_input: untrusted_vlan_tags compute_vdbe_availability_zone: - get_input: availability_zone_1 + subinterface_nested_service_template_filter_count: + - 5 subinterface_nested_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len vm_flavor_name: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml index 7b4ca1b63d..16381420bd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/vfcInstanceGroup/oneSubInterfaceNetworkRoleAndTwoAbstractNodes/out/Nested_vdbeServiceTemplate.yaml @@ -37,6 +37,11 @@ topology_template: required: true entry_schema: type: string + subinterface_nested_service_template_filter_count: + type: list + required: true + entry_schema: + type: float subinterface_nested_aap_untrusted_v6_ip_prefix_len: type: list required: true @@ -45,15 +50,6 @@ topology_template: vm_flavor_name: type: string required: true - untrusted_num_vn: - hidden: false - immutable: false - type: float - description: Number of vDBE subinterface virtual Networks - constraints: - - in_range: - - 1 - - 77 port_vdbe_untr_port_order: type: integer required: true @@ -243,8 +239,11 @@ topology_template: - subinterface_nested_aap_address_mode - index_value service_template_filter: + count: + get_input: + - subinterface_nested_service_template_filter_count + - index_value substitute_service_template: nestedServiceTemplate.yaml - count: 5 mandatory: true aap_untrusted_v6_ip_prefix: get_input: -- cgit 1.2.3-korg