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 | 14 +++++++++++++- .../out/Nested_pd_server_1bServiceTemplate.yaml | 12 ++++++++++-- .../out/Nested_ps_server_1bServiceTemplate.yaml | 12 ++++++++++-- .../out/nested_pattern5ServiceTemplate.yaml | 2 ++ .../out/nested_pattern5_levelTwoServiceTemplate.yaml | 3 +++ 5 files changed, 38 insertions(+), 5 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml index 4b63486703..8d11461838 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -1267,6 +1267,12 @@ node_types: status: SUPPORTED entry_schema: type: string + subinterface_nested_vlan_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float index_value: type: integer description: Index value of this substitution service template runtime instance @@ -2569,6 +2575,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + subinterface_nested_vlan_service_template_filter_count: + type: list + required: true + status: SUPPORTED + entry_schema: + type: float port_ps_server_1b_port_network_role_tag: type: string required: true @@ -3090,4 +3102,4 @@ node_types: type: tosca.capabilities.Node occurrences: - 1 - - UNBOUNDED + - UNBOUNDED \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml index 9bea96b063..057aac895e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_pd_server_1bServiceTemplate.yaml @@ -16,6 +16,11 @@ topology_template: required: true entry_schema: type: string + subinterface_nested_vlan_service_template_filter_count: + type: list + required: true + entry_schema: + type: float index_value: type: integer description: Index value of this substitution service template runtime instance @@ -94,8 +99,11 @@ topology_template: - substitutable properties: service_template_filter: + count: + get_input: + - subinterface_nested_vlan_service_template_filter_count + - index_value substitute_service_template: nested_vlanServiceTemplate.yaml - count: 9 mandatory: true parent_interface: get_input: @@ -350,4 +358,4 @@ topology_template: - dependency_template_Vlan_vmi_1 dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency + - dependency \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml index 5c43ad9f37..855e842bf5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/Nested_ps_server_1bServiceTemplate.yaml @@ -19,6 +19,11 @@ topology_template: port_ps_server_1b_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + subinterface_nested_vlan_service_template_filter_count: + type: list + required: true + entry_schema: + type: float port_ps_server_1b_port_network_role_tag: type: string required: true @@ -109,8 +114,11 @@ topology_template: - substitutable properties: service_template_filter: + count: + get_input: + - subinterface_nested_vlan_service_template_filter_count + - index_value substitute_service_template: nested_vlanServiceTemplate.yaml - count: 9 mandatory: true parent_interface: get_input: @@ -350,4 +358,4 @@ topology_template: - link_template_Vlan_vmi_1 dependency_ps_server_1b: - ps_server_1b - - dependency + - dependency \ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml index 8ae882e8bf..9b9b379f8d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5ServiceTemplate.yaml @@ -93,6 +93,8 @@ topology_template: - get_input: - pd_server_1b_names - 0 + subinterface_nested_vlan_service_template_filter_count: + - 9 vm_flavor_name: get_input: pd_server_1b_flavor subinterface_nested_vlan_net1: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 91bd0bca8e..d02dbd04aa 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml @@ -85,6 +85,9 @@ topology_template: port_ps_server_1b_port_mac_requirements: mac_count_required: is_required: false + subinterface_nested_vlan_service_template_filter_count: + - 9 + - 9 port_ps_server_1b_port_fixed_ips: - - ip_address: get_input: -- cgit 1.2.3-korg