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 --- .../GlobalSubstitutionTypesServiceTemplate.yaml | 21 ++++++++------- .../out/MainServiceTemplate.yaml | 23 +++++++++++++++++ .../out/Nested_vdbeServiceTemplate.yaml | 30 +++++++++++++--------- 3 files changed, 53 insertions(+), 21 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml index fed76bd17c..5f32192a6f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -50,15 +50,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 subinterface_vlan1_counter: type: list required: true @@ -285,6 +276,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + subinterface_vlan1_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float subinterface_vlan2_counter: type: list required: true @@ -337,6 +334,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + subinterface_vlan2_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list 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/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml index cc23ab471f..c973648470 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/out/MainServiceTemplate.yaml @@ -99,6 +99,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 @@ -600,6 +617,9 @@ topology_template: subinterface_vlan2_aap_sec_untrusted_ip_prefix_len: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - get_input: vdbe_aap_sec_untrusted_ip_prefix_len + subinterface_vlan1_service_template_filter_count: + - get_input: untrusted_num_vn + - get_input: untrusted_num_vn subinterface_vlan2_counter: - get_input: counter - get_input: counter @@ -630,6 +650,9 @@ topology_template: subinterface_vlan2_aap_untrusted_v6_ip_prefix_len: - get_input: vdbe_aap_untrusted_v6_ip_prefix_len - get_input: vdbe_aap_untrusted_v6_ip_prefix_len + subinterface_vlan2_service_template_filter_count: + - 5 + - 5 subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: - get_input: vdbe_aap_sec_untrusted_ip_prefix_len - get_input: vdbe_aap_sec_untrusted_ip_prefix_len diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/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/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml index 69a8eea321..e256c4fd7c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern1c1/multiplePortsMultipleVlans/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/pattern1c1/multiplePortsMultipleVlans/out/Nested_vdbeServiceTemplate.yaml @@ -45,15 +45,6 @@ topology_template: port_vdbe_oam_vmi_subnetpoolid: 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 subinterface_vlan1_counter: type: list required: true @@ -239,6 +230,11 @@ topology_template: port_vdbe_oam_vmi_exCP_naming: type: org.openecomp.datatypes.Naming required: true + subinterface_vlan1_service_template_filter_count: + type: list + required: true + entry_schema: + type: float subinterface_vlan2_counter: type: list required: true @@ -282,6 +278,11 @@ topology_template: port_vdbe_untr_vmi_exCP_naming: type: org.openecomp.datatypes.Naming required: true + subinterface_vlan2_service_template_filter_count: + type: list + required: true + entry_schema: + type: float subinterface_vlan1_aap_sec_untrusted_ip_prefix_len: type: list required: true @@ -354,9 +355,11 @@ topology_template: - subinterface_vlan1_aap_address_mode - index_value service_template_filter: - substitute_service_template: vlan1ServiceTemplate.yaml count: - get_input: untrusted_num_vn + get_input: + - subinterface_vlan1_service_template_filter_count + - index_value + substitute_service_template: vlan1ServiceTemplate.yaml mandatory: false aap_untrusted_v6_ip_prefix: get_input: @@ -513,8 +516,11 @@ topology_template: - subinterface_vlan2_aap_address_mode - index_value service_template_filter: + count: + get_input: + - subinterface_vlan2_service_template_filter_count + - index_value substitute_service_template: vlan2ServiceTemplate.yaml - count: 5 mandatory: true aap_untrusted_v6_ip_prefix: get_input: -- cgit 1.2.3-korg