diff options
author | 2018-03-06 12:01:54 +0530 | |
---|---|---|
committer | 2018-03-27 12:30:06 +0530 | |
commit | 56e56b8860cf6e7ad70dc65134e8fd87eaf01123 (patch) | |
tree | 5a45b1199db9a1ce840c2c454e470674daf4e63c /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario | |
parent | 6cc3acdc6d3140a8f702939568ab4c7cda06beaa (diff) |
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 <ojas.dubey@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario')
2 files changed, 77 insertions, 43 deletions
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..51fd65c2fb 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 @@ -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: @@ -763,4 +780,4 @@ topology_template: - dependency dependency_packet_external_network: - packet_external_network - - 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_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..8543cab7e5 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 @@ -8,31 +8,49 @@ imports: file: GlobalSubstitutionTypesServiceTemplate.yaml topology_template: inputs: - port_net: + Vlan_network_collection_function: + type: string + required: true + ps_server_1b_ips: hidden: false immutable: false type: string - description: port network - ps_server_2b_ips: + security_group_name: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string + ps_server_1b_names: + hidden: false + immutable: false + type: list + description: Ps server names + entry_schema: + type: string + packet_ext_network_name: hidden: false immutable: false type: string - ps_server_1b_ips: + description: network name + port_net: hidden: false immutable: false type: string - packet_int_network_name: + description: port network + ps_server_2b_ips: hidden: false immutable: false type: string - description: network name - security_group_name: + packet_int_network_name: hidden: false immutable: false - type: list - description: CMAUI1, CMAUI2 server names - entry_schema: - type: string + type: string + description: network name + Vlan_vfc_instance_group_function: + type: string + required: true availability_zone_0: label: availabilityzone name hidden: false @@ -54,18 +72,6 @@ topology_template: immutable: false type: string description: sub interface network - ps_server_1b_names: - hidden: false - immutable: false - type: list - description: Ps server names - entry_schema: - type: string - packet_ext_network_name: - hidden: false - immutable: false - type: string - description: network name node_templates: packet_ext_network: type: org.openecomp.resource.vl.nodes.heat.network.neutron.Net @@ -159,6 +165,17 @@ topology_template: node: packet_ext_network relationship: tosca.relationships.network.LinksTo groups: + 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_ps_server_1b nested_pattern5_levelTwo_group: type: org.openecomp.groups.heat.HeatStack properties: @@ -561,4 +578,4 @@ topology_template: - dependency_ps_server_1b dependency_server_1b_ps_2: - abstract_ps_server_1b - - dependency_ps_server_1b + - dependency_ps_server_1b
\ No newline at end of file |