diff options
author | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-03-27 19:56:54 +0530 |
---|---|---|
committer | Oren Kleks <orenkle@amdocs.com> | 2018-03-28 05:32:09 +0000 |
commit | adca5281550b50d93c7f4259c2f84e21d5681c07 (patch) | |
tree | bbef53ec13afefcb0aef882cdc2ab92447a58095 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/complexVFCMultiLevelNestedMultiComputeScenario | |
parent | 7363f3d875e08d5195cb5e8b7e4f9ac86ec99ef5 (diff) |
Code change to evaluate Network role
Code change to evaluate Network Role of Sub interface resource
Change-Id: I0e29c0a1512b76b6db569aaf534f5e59868ae715
Issue-ID: SDC-1072
Signed-off-by: siddharth0905 <siddharth.singh4@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, 43 insertions, 77 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 51fd65c2fb..8ae882e8bf 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,9 +8,25 @@ imports: file: GlobalSubstitutionTypesServiceTemplate.yaml topology_template: inputs: - Vlan_network_collection_function: + port_net: + hidden: false + immutable: false type: string - required: true + 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 packet_internal_network_name: hidden: false immutable: false @@ -30,28 +46,6 @@ 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 @@ -160,17 +154,6 @@ 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: @@ -780,4 +763,4 @@ topology_template: - dependency dependency_packet_external_network: - packet_external_network - - dependency
\ No newline at end of file + - dependency 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 8543cab7e5..91bd0bca8e 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,32 +8,6 @@ imports: file: GlobalSubstitutionTypesServiceTemplate.yaml topology_template: inputs: - Vlan_network_collection_function: - type: string - required: true - ps_server_1b_ips: - hidden: false - immutable: false - type: string - 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 - description: network name port_net: hidden: false immutable: false @@ -43,14 +17,22 @@ topology_template: hidden: false immutable: false type: string + ps_server_1b_ips: + hidden: false + immutable: false + type: string packet_int_network_name: hidden: false immutable: false type: string description: network name - Vlan_vfc_instance_group_function: - type: string - required: true + security_group_name: + hidden: false + immutable: false + type: list + description: CMAUI1, CMAUI2 server names + entry_schema: + type: string availability_zone_0: label: availabilityzone name hidden: false @@ -72,6 +54,18 @@ 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 @@ -165,17 +159,6 @@ 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: @@ -578,4 +561,4 @@ topology_template: - dependency_ps_server_1b dependency_server_1b_ps_2: - abstract_ps_server_1b - - dependency_ps_server_1b
\ No newline at end of file + - dependency_ps_server_1b |