diff options
author | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-03 20:24:59 +0530 |
---|---|---|
committer | siddharth0905 <siddharth.singh4@amdocs.com> | 2018-04-04 13:54:59 +0530 |
commit | d6982006c27288936d8b0d9eee18068854036f45 (patch) | |
tree | 7b71be074b5303d442971d0bd59b2accd7940604 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances | |
parent | 4b6709601c47050c853e6eaa5525259f066d5277 (diff) |
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 <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/catalogInstances')
17 files changed, 275 insertions, 3 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index cc66cebec3..bf2b9ada70 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -54,6 +54,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_plt_oam_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -96,6 +102,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair + port_plt_internal_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_plt_internal_0_port_subnetpoolid: type: string required: true @@ -242,6 +254,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_plt_data_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_plt_oam_0_port_replacement_policy: type: list required: true @@ -528,6 +546,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -570,6 +589,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -605,6 +625,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -784,6 +805,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_app_internal_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean compute_app_scheduler_hints: type: list required: true @@ -800,6 +827,12 @@ node_types: type: string required: true status: SUPPORTED + port_app_data_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_app_oam_0_port_replacement_policy: type: list required: true @@ -848,6 +881,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_app_oam_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_app_data_0_port_network: type: list required: true @@ -1208,6 +1247,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1469,6 +1509,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1511,6 +1552,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -1546,6 +1588,12 @@ node_types: org.openecomp.resource.abstract.nodes.iox: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_iox_oam_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_iox_data_0_port_ip_requirements: type: list required: true @@ -1568,6 +1616,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_iox_internal_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean vm_flavor_name: type: string required: true @@ -1576,6 +1630,12 @@ node_types: type: string required: true status: SUPPORTED + port_iox_data_0_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_iox_data_0_port_allowed_address_pairs: type: list required: true @@ -2038,6 +2098,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2074,6 +2135,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED @@ -2149,6 +2211,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml index 3557f27f17..83bc172858 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/MainServiceTemplate.yaml @@ -918,6 +918,8 @@ topology_template: directives: - substitutable properties: + port_iox_oam_0_port_subinterface_indicator: + - true port_iox_data_0_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -937,8 +939,12 @@ topology_template: params: $vnf_name: get_input: vnf_name + port_iox_internal_0_port_subinterface_indicator: + - true vm_flavor_name: get_input: iox_flavor_name + port_iox_data_0_port_subinterface_indicator: + - true port_iox_data_0_port_allowed_address_pairs: - ip_address: get_attribute: @@ -1072,6 +1078,8 @@ topology_template: port_app_data_0_port_mac_requirements: mac_count_required: is_required: false + port_app_internal_0_port_subinterface_indicator: + - true compute_app_scheduler_hints: - group: app_server_group_group port_app_internal_0_port_ip_requirements: @@ -1085,6 +1093,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_app_data_0_port_subinterface_indicator: + - true port_app_oam_0_port_replacement_policy: - AUTO port_app_oam_0_port_network: @@ -1106,6 +1116,8 @@ topology_template: port_app_oam_0_port_mac_requirements: mac_count_required: is_required: false + port_app_oam_0_port_subinterface_indicator: + - true port_app_data_0_port_network: - get_input: data_net_id port_app_data_0_port_network_role_tag: data @@ -1238,6 +1250,8 @@ topology_template: directives: - substitutable properties: + port_iox_oam_0_port_subinterface_indicator: + - true port_iox_data_0_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -1257,8 +1271,12 @@ topology_template: params: $vnf_name: get_input: vnf_name + port_iox_internal_0_port_subinterface_indicator: + - true vm_flavor_name: get_input: iox_flavor_name + port_iox_data_0_port_subinterface_indicator: + - true port_iox_data_0_port_allowed_address_pairs: - ip_address: get_attribute: @@ -1387,6 +1405,8 @@ topology_template: port_app_data_0_port_mac_requirements: mac_count_required: is_required: false + port_app_internal_0_port_subinterface_indicator: + - true compute_app_scheduler_hints: - group: app_server_group_group port_app_internal_0_port_ip_requirements: @@ -1400,6 +1420,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_app_data_0_port_subinterface_indicator: + - true port_app_oam_0_port_replacement_policy: - AUTO port_app_oam_0_port_network: @@ -1426,6 +1448,8 @@ topology_template: port_app_oam_0_port_mac_requirements: mac_count_required: is_required: false + port_app_oam_0_port_subinterface_indicator: + - true port_app_data_0_port_network: - get_input: data_net_id port_app_data_0_port_network_role_tag: data @@ -1526,6 +1550,8 @@ topology_template: port_app_data_0_port_mac_requirements: mac_count_required: is_required: false + port_app_internal_0_port_subinterface_indicator: + - true compute_app_scheduler_hints: - group: app_server_group_group port_app_internal_0_port_ip_requirements: @@ -1539,6 +1565,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_app_data_0_port_subinterface_indicator: + - true port_app_oam_0_port_replacement_policy: - AUTO port_app_oam_0_port_network: @@ -1565,6 +1593,8 @@ topology_template: port_app_oam_0_port_mac_requirements: mac_count_required: is_required: false + port_app_oam_0_port_subinterface_indicator: + - true port_app_data_0_port_network: - get_input: data_net_id port_app_data_0_port_network_role_tag: data @@ -1693,6 +1723,8 @@ topology_template: get_input: - plt_data_v6_ips - 1 + port_plt_oam_0_port_subinterface_indicator: + - true vm_image_name: get_input: plt_image_name compute_plt_availability_zone: @@ -1726,6 +1758,8 @@ topology_template: - fixed_ips - 0 - ip_address + port_plt_internal_0_port_subinterface_indicator: + - true port_plt_data_0_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -1796,6 +1830,8 @@ topology_template: - get_input: data_net_id port_plt_oam_0_port_network: - get_input: oam_net_id + port_plt_data_0_port_subinterface_indicator: + - true port_plt_oam_0_port_replacement_policy: - AUTO port_plt_data_0_port_replacement_policy: @@ -1839,6 +1875,8 @@ topology_template: get_input: - plt_data_v6_ips - 0 + port_plt_oam_0_port_subinterface_indicator: + - true vm_image_name: get_input: plt_image_name compute_plt_availability_zone: @@ -1872,6 +1910,8 @@ topology_template: - fixed_ips - 0 - ip_address + port_plt_internal_0_port_subinterface_indicator: + - true port_plt_data_0_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -1947,6 +1987,8 @@ topology_template: - get_input: data_net_id port_plt_oam_0_port_network: - get_input: oam_net_id + port_plt_data_0_port_subinterface_indicator: + - true port_plt_oam_0_port_replacement_policy: - AUTO port_plt_data_0_port_replacement_policy: @@ -2074,4 +2116,4 @@ topology_template: get_input: vnf_name container_type: host targets: - - app_server_group_group
\ No newline at end of file + - app_server_group_group diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml index 6b96a09918..3723fc133f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_appServiceTemplate.yaml @@ -14,6 +14,11 @@ topology_template: port_app_data_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_app_internal_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean compute_app_scheduler_hints: type: list required: true @@ -27,6 +32,11 @@ topology_template: port_app_data_0_port_network_role: type: string required: true + port_app_data_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_app_oam_0_port_replacement_policy: type: list required: true @@ -66,6 +76,11 @@ topology_template: port_app_oam_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_app_oam_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_app_data_0_port_network: type: list required: true @@ -275,6 +290,10 @@ topology_template: get_input: port_app_internal_0_port_exCP_naming vlan_requirements: get_input: port_app_internal_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_app_internal_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_app_internal_0_port_ip_requirements network_role_tag: @@ -315,6 +334,10 @@ topology_template: get_input: port_app_oam_0_port_exCP_naming vlan_requirements: get_input: port_app_oam_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_app_oam_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_app_oam_0_port_ip_requirements network_role_tag: @@ -359,6 +382,10 @@ topology_template: get_input: port_app_data_0_port_exCP_naming vlan_requirements: get_input: port_app_data_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_app_data_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_app_data_0_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml index 993bf81e24..bdd2d98bfc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_ioxServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_iox_oam_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_iox_data_0_port_ip_requirements: type: list required: true @@ -29,12 +34,22 @@ topology_template: required: true entry_schema: type: string + port_iox_internal_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean vm_flavor_name: type: string required: true port_iox_data_0_port_subnetpoolid: type: string required: true + port_iox_data_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_iox_data_0_port_allowed_address_pairs: type: list required: true @@ -245,6 +260,10 @@ topology_template: get_input: port_iox_data_0_port_exCP_naming vlan_requirements: get_input: port_iox_data_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_iox_data_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_iox_data_0_port_ip_requirements network_role_tag: @@ -322,6 +341,10 @@ topology_template: get_input: port_iox_oam_0_port_exCP_naming vlan_requirements: get_input: port_iox_oam_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_iox_oam_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_iox_oam_0_port_ip_requirements network_role_tag: @@ -368,6 +391,10 @@ topology_template: get_input: port_iox_internal_0_port_exCP_naming vlan_requirements: get_input: port_iox_internal_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_iox_internal_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_iox_internal_0_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml index 0b2fd5b0af..bb4b53504b 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/computewithtwosameporttypes/out/Nested_pltServiceTemplate.yaml @@ -48,6 +48,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_plt_oam_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean vm_image_name: type: string required: true @@ -82,6 +87,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair + port_plt_internal_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_plt_internal_0_port_subnetpoolid: type: string required: true @@ -200,6 +210,11 @@ topology_template: required: true entry_schema: type: string + port_plt_data_0_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_plt_oam_0_port_replacement_policy: type: list required: true @@ -245,6 +260,10 @@ topology_template: get_input: port_plt_internal_0_port_exCP_naming vlan_requirements: get_input: port_plt_internal_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_plt_internal_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_plt_internal_0_port_ip_requirements network_role_tag: @@ -287,6 +306,10 @@ topology_template: get_input: port_plt_data_0_port_exCP_naming vlan_requirements: get_input: port_plt_data_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_plt_data_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_plt_data_0_port_ip_requirements network_role_tag: @@ -364,6 +387,10 @@ topology_template: get_input: port_plt_oam_0_port_exCP_naming vlan_requirements: get_input: port_plt_oam_0_port_vlan_requirements + subinterface_indicator: + get_input: + - port_plt_oam_0_port_subinterface_indicator + - index_value ip_requirements: get_input: port_plt_oam_0_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml index 66a332c26b..906aa4cb1d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,6 +56,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -297,6 +303,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml index 4ac6d1cefc..0c180fdd82 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/MainServiceTemplate.yaml @@ -167,6 +167,8 @@ topology_template: is_required: false port_pd01_port_network: - packet_internal_network + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: @@ -213,6 +215,8 @@ topology_template: is_required: false port_pd01_port_network: - packet_internal_network + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: @@ -259,6 +263,8 @@ topology_template: is_required: false port_pd01_port_network: - packet_internal_network + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: @@ -284,4 +290,4 @@ topology_template: - packet_internal_network - abstract_pd_server_0 - abstract_pd_server_1 - - abstract_pd_server_2
\ No newline at end of file + - abstract_pd_server_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml index 3d9ebd74ae..54070a9852 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeDiffImageName/out/Nested_pd_serverServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml index 66a332c26b..906aa4cb1d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,6 +56,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -297,6 +303,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml index f4da23c7be..742b2b4f84 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/MainServiceTemplate.yaml @@ -353,6 +353,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -402,6 +404,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -446,6 +450,8 @@ topology_template: is_required: false port_pd01_port_network: - get_input: oam_net_name + port_pd01_port_subinterface_indicator: + - true port_pd01_port_network_role_tag: oam compute_pd_server_user_data_format: - RAW @@ -467,4 +473,4 @@ topology_template: - network_policy_server - abstract_pd_server_0 - abstract_pd_server_1 - - abstract_pd_server_2
\ No newline at end of file + - abstract_pd_server_2 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml index 3d9ebd74ae..54070a9852 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypeGetAttrBetweenThem/out/Nested_pd_serverServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml index 66a332c26b..906aa4cb1d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -56,6 +56,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -297,6 +303,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml index 163815ac07..7dc3464c69 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/MainServiceTemplate.yaml @@ -158,6 +158,8 @@ topology_template: is_required: false port_pd01_port_network: - packet_external_network + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: @@ -209,6 +211,8 @@ topology_template: is_required: false port_pd01_port_network: - packet_internal_network + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: @@ -255,6 +259,8 @@ topology_template: is_required: false port_pd01_port_network: - packet_internal_network + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml index 3d9ebd74ae..54070a9852 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/threeComputesSameTypePortsConnectedToDiffNetworks/out/Nested_pd_serverServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -99,6 +104,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml index aa0281b2f1..d3b8ed789c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -74,6 +74,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -315,6 +321,7 @@ node_types: type: tosca.capabilities.network.Bindable valid_source_types: - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface occurrences: - 0 - UNBOUNDED diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml index cbffa79eb2..4f7ddc84ed 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/MainServiceTemplate.yaml @@ -194,6 +194,8 @@ topology_template: is_required: false port_pd01_port_network: - packet_internal_network + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: @@ -244,6 +246,8 @@ topology_template: is_required: false port_pd01_port_network: - packet_internal_network + port_pd01_port_subinterface_indicator: + - true compute_pd_server_user_data_format: - RAW service_template_filter: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml index 67acf54036..3a4992f5c2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/catalogInstances/twoNovaWithDiffProperties/out/Nested_pd_serverServiceTemplate.yaml @@ -65,6 +65,11 @@ topology_template: required: true entry_schema: type: string + port_pd01_port_subinterface_indicator: + type: list + required: true + entry_schema: + type: boolean port_pd01_port_order: type: integer required: true @@ -126,6 +131,10 @@ topology_template: get_input: port_pd01_port_exCP_naming vlan_requirements: get_input: port_pd01_port_vlan_requirements + subinterface_indicator: + get_input: + - port_pd01_port_subinterface_indicator + - index_value ip_requirements: get_input: port_pd01_port_ip_requirements network_role_tag: |