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 | 55 ++++++++++++++-------- 1 file 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/pattern5/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml') diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/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/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml index 9e29f61b8e..a85192e7db 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfConnectivityScenario/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/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5ServiceTemplate.yaml @@ -8,25 +8,9 @@ imports: file: GlobalSubstitutionTypesServiceTemplate.yaml topology_template: inputs: - port_net: - hidden: false - immutable: false + Vlan_network_collection_function: type: string - description: port network - pd_server_1b_flavor: - hidden: false - immutable: false - type: string - description: Flavor for PD server - pd_server_1b_ips: - hidden: false - immutable: false - type: string - packet_external_network_name: - hidden: false - immutable: false - type: string - description: network name + required: true packet_internal_network_name: hidden: false immutable: false @@ -46,6 +30,28 @@ topology_template: description: CMAUI1, CMAUI2 server names entry_schema: type: string + port_net: + hidden: false + immutable: false + type: string + description: port network + pd_server_1b_flavor: + hidden: false + immutable: false + type: string + description: Flavor for PD server + pd_server_1b_ips: + hidden: false + immutable: false + type: string + Vlan_vfc_instance_group_function: + type: string + required: true + packet_external_network_name: + hidden: false + immutable: false + type: string + description: network name availability_zone_0: label: availabilityzone name hidden: false @@ -154,6 +160,17 @@ topology_template: - packet_internal_network - 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: @@ -751,4 +768,4 @@ topology_template: - dependency dependency_packet_external_network: - packet_external_network - - dependency + - dependency \ No newline at end of file -- cgit 1.2.3-korg