From d6982006c27288936d8b0d9eee18068854036f45 Mon Sep 17 00:00:00 2001 From: siddharth0905 Date: Tue, 3 Apr 2018 20:24:59 +0530 Subject: Added new nodes type Added new nodes type and new property in Port. All test data need to be updated, so file count is much more. Change-Id: Ic21befe8d7feee912fbed1d3eb676488db1fb68c Issue-ID: SDC-1183 Signed-off-by: siddharth0905 --- .../out/Nested_pd_server_1bServiceTemplate.yaml | 58 ++++++++++++++-------- 1 file changed, 38 insertions(+), 20 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/subinterface/vlantagging/pattern5/baseScenario/out/Nested_pd_server_1bServiceTemplate.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/baseScenario/out/Nested_pd_server_1bServiceTemplate.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_pd_server_1bServiceTemplate.yaml index c993f98370..21bc68dae8 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_pd_server_1bServiceTemplate.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_pd_server_1bServiceTemplate.yaml @@ -94,6 +94,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_pd_server_1b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_1b_port_vlan_requirements: type: list required: true @@ -110,6 +115,11 @@ topology_template: port_pd_server_1b_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_pd_server_2b_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd_server_2b_port_network_role: type: string required: true @@ -139,30 +149,34 @@ topology_template: pd_server_1b_pd_server_2b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_2b_port_exCP_naming replacement_policy: get_input: - port_pd_server_2b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_2b_port_mac_requirements + order: + get_input: port_pd_server_2b_port_order + exCP_naming: + get_input: port_pd_server_2b_port_exCP_naming vlan_requirements: get_input: port_pd_server_2b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_2b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_2b_port_ip_requirements network_role_tag: get_input: port_pd_server_2b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_2b_port_mac_requirements - order: - get_input: port_pd_server_2b_port_order network_role: get_input: port_pd_server_2b_port_network_role - subnetpoolid: - get_input: port_pd_server_2b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_2b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_2b_port_subnetpoolid network: get_input: - port_pd_server_2b_port_network @@ -215,30 +229,34 @@ topology_template: pd_server_1b_pd_server_1b_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: - exCP_naming: - get_input: port_pd_server_1b_port_exCP_naming replacement_policy: get_input: - port_pd_server_1b_port_replacement_policy - index_value + mac_requirements: + get_input: port_pd_server_1b_port_mac_requirements + order: + get_input: port_pd_server_1b_port_order + exCP_naming: + get_input: port_pd_server_1b_port_exCP_naming vlan_requirements: get_input: port_pd_server_1b_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd_server_1b_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd_server_1b_port_ip_requirements network_role_tag: get_input: port_pd_server_1b_port_network_role_tag - mac_requirements: - get_input: port_pd_server_1b_port_mac_requirements - order: - get_input: port_pd_server_1b_port_order network_role: get_input: port_pd_server_1b_port_network_role - subnetpoolid: - get_input: port_pd_server_1b_port_subnetpoolid fixed_ips: get_input: - port_pd_server_1b_port_fixed_ips - index_value + subnetpoolid: + get_input: port_pd_server_1b_port_subnetpoolid network: get_input: - port_pd_server_1b_port_network @@ -453,9 +471,6 @@ topology_template: - pd_server_1b - disk.write.requests.rate requirements: - link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: - - pd_server_1b_pd_server_1b_port_nested_vlan - - link_template_Vlan_vmi_1 dependency_pd_server_1b: - pd_server_1b - dependency @@ -474,9 +489,12 @@ topology_template: dependency_pd_server_1b_pd_server_2b_port: - pd_server_1b_pd_server_2b_port - dependency + subinterface_link_template_Vlan_vmi_1_pd_server_1b_pd_server_1b_port_nested_vlan: + - pd_server_1b_pd_server_1b_port_nested_vlan + - subinterface_link_template_Vlan_vmi_1 link_pd_server_1b_pd_server_2b_port: - pd_server_1b_pd_server_2b_port - link dependency_pd_server_1b_pd_server_1b_port: - pd_server_1b_pd_server_1b_port - - dependency \ No newline at end of file + - dependency -- cgit 1.2.3-korg