diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5')
12 files changed, 357 insertions, 152 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/baseScenario/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/baseScenario/out/nested_pattern5ServiceTemplate.yaml index f550cb2546..db8bd34347 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/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/baseScenario/out/nested_pattern5ServiceTemplate.yaml @@ -18,6 +18,9 @@ topology_template: immutable: false type: string description: UID of OAM network + Vlan_network_collection_function: + type: string + required: true ps_server_1b_ips: hidden: false immutable: false @@ -60,6 +63,9 @@ topology_template: hidden: false immutable: false type: string + Vlan_vfc_instance_group_function: + type: string + required: true packet_external_network_name: hidden: false immutable: false @@ -271,6 +277,17 @@ topology_template: - packet_internal_network - abstract_ps_server_1b - 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: @@ -736,4 +753,4 @@ topology_template: - link_pd_server_1b_pd_server_2b_port 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/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/out/nested_pattern5ServiceTemplate.yaml index 2a33ee306c..19e2b4e1e1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedDiffComputeScenario/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/complexVFCMultiLevelNestedDiffComputeScenario/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 @@ -168,6 +174,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: @@ -597,4 +614,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_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 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 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml index 6f4882f241..18e3aa6ca5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/out/MainServiceTemplate.yaml @@ -46,6 +46,12 @@ topology_template: source_type: HEAT param_name: pd_server_1b_ips type: string + Vlan_network_collection_function: + type: string + required: true + Vlan_vfc_instance_group_function: + type: string + required: true pd_server_1b_names: hidden: false immutable: false @@ -268,3 +274,14 @@ topology_template: - test_nested_level1 - packet_externalmain_network - abstract_pd_server_1b_1 + 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_1
\ 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/complexVFCMultiVFCInAllHeatScalingScenario/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/complexVFCMultiVFCInAllHeatScalingScenario/out/nested_pattern5ServiceTemplate.yaml index 2372290217..bedb402ef6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiVFCInAllHeatScalingScenario/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/complexVFCMultiVFCInAllHeatScalingScenario/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 @@ -61,6 +64,9 @@ topology_template: immutable: false type: string description: network name + Vlan_vfc_instance_group_function: + type: string + required: true availability_zone_0: label: availabilityzone name hidden: false @@ -261,6 +267,17 @@ topology_template: - packet_int_network - abstract_ps_server_1b - 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_ps_server_1b substitution_mappings: node_type: org.openecomp.resource.abstract.nodes.heat.nested_pattern5 capabilities: @@ -990,4 +1007,4 @@ topology_template: - dependency_pd_server_1b dependency_server_1b_pd_3: - abstract_pd_server_1b - - dependency_pd_server_1b + - dependency_pd_server_1b
\ 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/complexVFCScalingScenario/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/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml index d9c83039df..b80060507d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCScalingScenario/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/complexVFCScalingScenario/out/nested_pattern5ServiceTemplate.yaml @@ -18,6 +18,9 @@ topology_template: immutable: false type: string description: UID of OAM network + Vlan_network_collection_function: + type: string + required: true ps_server_1b_ips: hidden: false immutable: false @@ -60,6 +63,9 @@ topology_template: hidden: false immutable: false type: string + Vlan_vfc_instance_group_function: + type: string + required: true packet_external_network_name: hidden: false immutable: false @@ -195,6 +201,17 @@ topology_template: - packet_external_network - packet_internal_network - 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: @@ -588,4 +605,4 @@ topology_template: - dependency_pd_server_1b_pd_server_1b_port 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/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 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_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/complexVFCWithDiffSubInfConnectivityScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 8cf3f5d99b..46c1b013e2 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_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/complexVFCWithDiffSubInfConnectivityScenario/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 @@ -188,6 +194,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: @@ -579,4 +596,4 @@ topology_template: - dependency_ps_server_1b dependency_server_1b_ps_2: - abstract_ps_server_1b_1 - - dependency_ps_server_1b + - dependency_ps_server_1b
\ 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/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/out/nested_pattern5_levelTwoServiceTemplate.yaml index 290f8595ce..5d7b81aaa3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCWithDiffSubInfCountScenario/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/complexVFCWithDiffSubInfCountScenario/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: abstract_ps_server_1b_0: type: org.openecomp.resource.abstract.nodes.ps_server_1b @@ -196,6 +202,18 @@ 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_0 + - abstract_ps_server_1b_1 nested_pattern5_levelTwo_group: type: org.openecomp.groups.heat.HeatStack properties: @@ -599,4 +617,4 @@ topology_template: - dependency_ps_server_1b dependency_server_1b_ps_2: - abstract_ps_server_1b_1 - - dependency_ps_server_1b + - dependency_ps_server_1b
\ No newline at end of file |