From 56e56b8860cf6e7ad70dc65134e8fd87eaf01123 Mon Sep 17 00:00:00 2001 From: ojasdubey Date: Tue, 6 Mar 2018 12:01:54 +0530 Subject: VLAN tagging - VFC Instance Group 1. Create VFC instance group per sub-interface network role 2. Refactored PortTemplateConsolidationData and its references based on review comments 3. Updated test data after rebase 4. Updated to flatMap based on review comments Change-Id: I423593c5156ecae5eff3a4f2ce8591c85db727cc Issue-ID: SDC-1073 Signed-off-by: ojasdubey --- .../out/nested_pattern5ServiceTemplate.yaml | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/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/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml index 6b4786665d..45e7ec8f77 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedScenario/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/complexVFCMultiLevelNestedScenario/out/nested_pattern5ServiceTemplate.yaml @@ -8,6 +8,9 @@ imports: file: GlobalSubstitutionTypesServiceTemplate.yaml topology_template: inputs: + Vlan_network_collection_function: + type: string + required: true ps_server_1b_ips: hidden: false immutable: false @@ -51,6 +54,9 @@ topology_template: hidden: false immutable: false type: string + Vlan_vfc_instance_group_function: + type: string + required: true availability_zone_0: label: availabilityzone name hidden: false @@ -166,6 +172,17 @@ topology_template: members: - test_nested_level2 - abstract_pd_server_1b + Vlan_group: + type: org.openecomp.groups.VfcInstanceGroup + properties: + vfc_parent_port_role: 1b + network_collection_function: + get_input: Vlan_network_collection_function + vfc_instance_group_function: + get_input: Vlan_vfc_instance_group_function + subinterface_role: Vlan + members: + - abstract_pd_server_1b substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested_pattern5 capabilities: @@ -547,4 +564,4 @@ topology_template: - dependency local_storage_server_1b_pd_1_test_nested_level2: - test_nested_level2 - - local_storage_server_1b_pd_1 + - local_storage_server_1b_pd_1 \ No newline at end of file -- cgit 1.2.3-korg