diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute')
54 files changed, 1697 insertions, 564 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 462cd2559f..6f5c2c3bf3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -46,6 +46,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_12_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_12_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -135,6 +141,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_02_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_12_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -579,6 +591,12 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -611,6 +629,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -1441,4 +1465,4 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ 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/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml index 1fb93b4f2e..28e33ef53e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pcm_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -40,6 +45,11 @@ topology_template: port_pcm_port_0_subnetpoolid: type: string required: true + port_pcm_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -149,6 +159,12 @@ topology_template: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_1_subnetpoolid + related_networks: + get_input: port_pcm_port_1_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_port_1_ip_requirements security_groups: @@ -158,8 +174,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid mac_requirements: get_input: port_pcm_port_1_mac_requirements subinterface_indicator: false @@ -169,8 +183,6 @@ topology_template: get_input: port_pcm_port_1_vlan_requirements network_role_tag: get_input: port_pcm_port_1_network_role_tag - network: - get_input: oam_net_name order: get_input: port_pcm_port_1_order requirements: @@ -194,6 +206,12 @@ topology_template: pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_0_subnetpoolid + related_networks: + get_input: port_pcm_port_0_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_0_ip_requirements security_groups: @@ -203,8 +221,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid mac_requirements: get_input: port_pcm_port_0_mac_requirements subinterface_indicator: false @@ -214,8 +230,6 @@ topology_template: get_input: port_pcm_port_0_vlan_requirements network_role_tag: get_input: port_pcm_port_0_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_port_0_order requirements: @@ -453,4 +467,4 @@ topology_template: - dependency local_storage_server_pcm_1: - server_pcm_1 - - local_storage + - local_storage
\ 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/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml index 2055eaa7b0..6c048bbbbd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/diffNestedFilesWithSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml @@ -45,6 +45,11 @@ topology_template: port_pcm_port_02_network_role_tag: type: string required: true + port_pcm_port_12_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_12_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -137,6 +142,11 @@ topology_template: port_pcm_port_12_network_role_tag: type: string required: true + port_pcm_port_02_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_12_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -162,6 +172,12 @@ topology_template: pcm_port_12: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_12_subnetpoolid + related_networks: + get_input: port_pcm_port_12_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_port_12_ip_requirements security_groups: @@ -171,8 +187,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_12_subnetpoolid mac_requirements: get_input: port_pcm_port_12_mac_requirements subinterface_indicator: false @@ -182,8 +196,6 @@ topology_template: get_input: port_pcm_port_12_vlan_requirements network_role_tag: get_input: port_pcm_port_12_network_role_tag - network: - get_input: oam_net_name order: get_input: port_pcm_port_12_order requirements: @@ -194,6 +206,12 @@ topology_template: pcm_port_02: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_02_subnetpoolid + related_networks: + get_input: port_pcm_port_02_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_02_ip_requirements security_groups: @@ -203,8 +221,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_02_subnetpoolid mac_requirements: get_input: port_pcm_port_02_mac_requirements subinterface_indicator: false @@ -214,8 +230,6 @@ topology_template: get_input: port_pcm_port_02_vlan_requirements network_role_tag: get_input: port_pcm_port_02_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_port_02_order requirements: @@ -453,4 +467,4 @@ topology_template: - dependency link_pcm_port_02: - pcm_port_02 - - link + - link
\ 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/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml index 258642ea2d..9172dc400f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -24,6 +24,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cdi_ims_core_0_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -172,6 +178,12 @@ node_types: type: integer required: true status: SUPPORTED + port_cdi_internal_0_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cdi_ims_core_0_port_allowed_address_pairs: type: list required: true @@ -621,12 +633,6 @@ node_types: org.openecomp.resource.abstract.nodes.lbd: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: - port_lbd_internal_1_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_lbd_ims_core_1_port_allowed_address_pairs: type: list required: true @@ -639,12 +645,6 @@ node_types: status: SUPPORTED entry_schema: type: string - compute_lbd_config_drive: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_lbd_internal_1_port_name: type: list required: true @@ -657,22 +657,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_ims_core_1_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_1_port_vlan_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_lbd_dpdk_1_port_subnetpoolid: type: string required: true @@ -703,22 +687,6 @@ node_types: type: integer required: true status: SUPPORTED - port_lbd_internal_1_port_ip_requirements: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_internal_1_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_lbd_ims_core_1_port_subnetpoolid: - type: string - required: true - status: SUPPORTED vm_image_name: type: string required: true @@ -751,6 +719,98 @@ node_types: type: string required: true status: SUPPORTED + port_lbd_ims_core_1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + compute_lbd_scheduler_hints: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_lbd_dpdk_1_port_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_lbd_ims_core_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_lbd_internal_1_port_network: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_lbd_internal_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + compute_lbd_name: + type: list + required: true + status: SUPPORTED + entry_schema: + type: string + port_lbd_ims_core_1_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_lbd_internal_1_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_lbd_config_drive: + type: list + required: true + status: SUPPORTED + entry_schema: + type: boolean + port_lbd_ims_core_1_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_ims_core_1_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + status: SUPPORTED + port_lbd_internal_1_port_ip_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_1_port_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json + port_lbd_ims_core_1_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + port_lbd_internal_1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_lbd_internal_1_port_subnetpoolid: type: string required: true @@ -791,18 +851,6 @@ node_types: type: string required: true status: SUPPORTED - compute_lbd_scheduler_hints: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_lbd_dpdk_1_port_name: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_lbd_dpdk_1_port_security_groups: type: list required: true @@ -815,16 +863,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_ims_core_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - status: SUPPORTED - port_lbd_internal_1_port_network: - type: list - required: true - status: SUPPORTED - entry_schema: - type: string port_lbd_internal_1_port_network_role: type: string required: true @@ -841,26 +879,18 @@ node_types: status: SUPPORTED entry_schema: type: json - port_lbd_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true - status: SUPPORTED port_lbd_dpdk_1_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_lbd_name: + port_lbd_dpdk_1_port_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_ims_core_1_port_network_role_tag: - type: string - required: true - status: SUPPORTED + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_lbd_dpdk_1_port_network_role: type: string required: true @@ -1382,6 +1412,12 @@ node_types: type: string required: true status: SUPPORTED + port_oam_internal_1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_oam_internal_1_port_security_groups: type: list required: true @@ -1444,6 +1480,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam_oam_1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_oam_internal_1_port_vlan_requirements: type: list required: true @@ -1995,6 +2037,12 @@ node_types: type: string required: true status: SUPPORTED + port_oam_oam_2_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_oam_oam_2_port_security_groups: type: list required: true @@ -2139,6 +2187,12 @@ node_types: type: integer required: true status: SUPPORTED + port_oam_internal_2_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_oam_scheduler_hints: type: list required: true @@ -2641,6 +2695,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_tdcore_dpdk_0_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_tdcore_internal_0_port_0_vlan_requirements: type: list required: true @@ -2708,6 +2768,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_tdcore_internal_0_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments tdcore_flavor_name: type: string description: flavor name @@ -3272,6 +3338,12 @@ node_types: type: string required: true status: SUPPORTED + port_cdi_internal_1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -3424,6 +3496,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cdi_ims_core_1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_cdi_metadata: type: list required: true @@ -3881,18 +3959,6 @@ node_types: status: SUPPORTED entry_schema: type: string - compute_lbd_config_drive: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean - port_lbd_dpdk_0_port_fixed_ips: - type: list - required: true - status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_lbd_internal_0_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -3905,22 +3971,16 @@ node_types: type: string required: true status: SUPPORTED - port_lbd_internal_0_port_security_groups: + port_lbd_dpdk_0_port_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: json + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true status: SUPPORTED - port_lbd_dpdk_0_port_security_groups: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json compute_lbd_availability_zone: type: list required: true @@ -3937,184 +3997,220 @@ node_types: type: string required: true status: SUPPORTED - port_lbd_dpdk_0_port_vlan_requirements: + vm_image_name: + type: string + required: true + status: SUPPORTED + port_lbd_dpdk_0_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - vm_image_name: - type: string + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_ims_core_0_port_order: + type: integer required: true status: SUPPORTED - port_lbd_dpdk_0_port_name: + port_lbd_ims_core_0_port_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_internal_0_port_subnetpoolid: - type: string + port_lbd_ims_core_0_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_lbd_dpdk_0_port_ip_requirements: + port_lbd_ims_core_0_port_allowed_address_pairs: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_0_port_order: - type: integer + type: org.openecomp.datatypes.heat.network.AddressPair + port_lbd_internal_0_port_name: + type: list required: true status: SUPPORTED - port_lbd_ims_core_0_port_network_role: + entry_schema: + type: string + port_lbd_ims_core_0_port_network_role_tag: type: string required: true status: SUPPORTED - port_lbd_ims_core_0_port_network: + port_lbd_ims_core_0_port_related_networks: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_dpdk_0_port_network: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + compute_lbd_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_dpdk_0_port_network_role_tag: - type: string + type: json + port_lbd_internal_0_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_lbd_ims_core_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_lbd_dpdk_0_port_order: + type: integer required: true status: SUPPORTED - port_lbd_ims_core_0_port_allowed_address_pairs: + port_lbd_ims_core_0_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_internal_0_port_name: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_0_port_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_internal_0_port_order: - type: integer + port_lbd_dpdk_0_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_lbd_dpdk_0_port_network_role: - type: string + compute_lbd_name: + type: list required: true status: SUPPORTED - port_lbd_ims_core_0_port_vlan_requirements: + entry_schema: + type: string + port_lbd_ims_core_0_port_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_ims_core_0_port_subnetpoolid: - type: string + type: json + port_lbd_ims_core_0_port_name: + type: list required: true status: SUPPORTED - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - status: SUPPORTED - constraints: - - greater_or_equal: 0 - port_lbd_ims_core_0_port_network_role_tag: - type: string + entry_schema: + type: string + port_lbd_internal_0_port_vlan_requirements: + type: list required: true status: SUPPORTED - compute_lbd_scheduler_hints: + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_lbd_config_drive: type: list required: true status: SUPPORTED entry_schema: - type: json - port_lbd_internal_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: boolean + port_lbd_internal_0_port_related_networks: + type: list required: true status: SUPPORTED - port_lbd_ims_core_0_port_fixed_ips: + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_dpdk_0_port_fixed_ips: type: list required: true status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_dpdk_0_port_order: - type: integer - required: true - status: SUPPORTED - port_lbd_ims_core_0_port_ip_requirements: + port_lbd_internal_0_port_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming + type: json + port_lbd_dpdk_0_port_security_groups: + type: list required: true status: SUPPORTED - port_lbd_internal_0_port_fixed_ips: + entry_schema: + type: json + port_lbd_dpdk_0_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_internal_0_port_network: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_0_port_name: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_dpdk_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_lbd_internal_0_port_subnetpoolid: + type: string required: true status: SUPPORTED - compute_lbd_metadata: + port_lbd_ims_core_0_port_network_role: + type: string + required: true + status: SUPPORTED + port_lbd_dpdk_0_port_network: type: list required: true status: SUPPORTED entry_schema: - type: json - compute_lbd_name: + type: string + port_lbd_dpdk_0_port_network_role_tag: + type: string + required: true + status: SUPPORTED + port_lbd_internal_0_port_order: + type: integer + required: true + status: SUPPORTED + port_lbd_dpdk_0_port_network_role: + type: string + required: true + status: SUPPORTED + port_lbd_ims_core_0_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_internal_0_port_ip_requirements: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_ims_core_0_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + status: SUPPORTED + constraints: + - greater_or_equal: 0 + port_lbd_ims_core_0_port_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_0_port_security_groups: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_ims_core_0_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + status: SUPPORTED + port_lbd_internal_0_port_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: json - port_lbd_ims_core_0_port_name: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + compute_lbd_metadata: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_internal_0_port_vlan_requirements: + type: json + port_lbd_internal_0_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements + type: org.openecomp.datatypes.network.IpRequirements requirements: - dependency_lbd_lbd_ims_core_0_port: capability: tosca.capabilities.Node @@ -4668,6 +4764,12 @@ node_types: type: string required: true status: SUPPORTED + port_cif_oam_1_port_3_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true @@ -4734,6 +4836,12 @@ node_types: type: string required: true status: SUPPORTED + port_cif_ims_core_1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_ims_li_1_port_allowed_address_pairs: type: list required: true @@ -4780,6 +4888,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_cif_internal_1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_oam_1_port_1_fixed_ips: type: list required: true @@ -4942,6 +5056,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cif_oam_1_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_ims_core_1_port_subnetpoolid: type: string required: true @@ -4982,6 +5102,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cif_ims_li_1_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_ims_li_1_port_network_role_tag: type: string required: true @@ -5769,6 +5895,12 @@ node_types: description: Unique ID for this VF instance required: true status: SUPPORTED + port_cscf_internal_0_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments availability_zone_0: type: string description: Availability zone name for CSCF instances. @@ -6265,6 +6397,12 @@ node_types: type: integer required: true status: SUPPORTED + port_oam_internal_0_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true @@ -6323,6 +6461,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_oam_oam_0_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_oam_user_data_format: type: list required: true @@ -6864,6 +7008,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_tdcore_dpdk_0_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_tdcore_internal_0_port_0_vlan_requirements: type: list required: true @@ -6931,6 +7081,12 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED + port_tdcore_internal_0_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments tdcore_flavor_name: type: string description: flavor name @@ -7491,6 +7647,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_internal_0_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_ims_li_0_port_network_role: type: string required: true @@ -7523,6 +7685,12 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED + port_cif_oam_0_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_oam_0_port_3_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -7543,6 +7711,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cif_ims_core_0_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_oam_0_port_1_vlan_requirements: type: list required: true @@ -7635,6 +7809,12 @@ node_types: status: SUPPORTED entry_schema: type: json + port_cif_oam_0_port_3_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_oam_0_port_1_subnetpoolid: type: string required: true @@ -7765,6 +7945,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_cif_ims_li_0_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_internal_0_port_security_groups: type: list required: true @@ -8605,6 +8791,12 @@ node_types: description: Unique ID for this VF instance required: true status: SUPPORTED + port_cscf_internal_0_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments availability_zone_0: type: string description: Availability zone name for CSCF instances. @@ -9035,4 +9227,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ 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/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml index 1f76f3e59b..992afcd3c6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/MainServiceTemplate.yaml @@ -2488,8 +2488,6 @@ topology_template: get_input: lbd_ims_core_v6_vip_0 compute_lbd_user_data_format: - RAW - compute_lbd_config_drive: - - true port_lbd_internal_1_port_name: - str_replace: template: $PREFIX$DELeth0 @@ -2503,15 +2501,6 @@ topology_template: - ip_address: 128.0.0.0/1 - ip_address: ::/1 - ip_address: 8000::/1 - port_lbd_ims_core_1_port_ip_requirements: - - ip_version: 6 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_lbd_dpdk_1_port_mac_requirements: - mac_count_required: - is_required: false vm_flavor_name: get_input: lbd_flavor_name port_lbd_ims_core_1_port_mac_requirements: @@ -2519,14 +2508,6 @@ topology_template: is_required: false compute_lbd_availability_zone: - get_input: availability_zone_1 - port_lbd_internal_1_port_ip_requirements: - - ip_version: 4 - ip_count_required: - is_required: true - floating_ip_count_required: - is_required: false - port_lbd_internal_1_port_security_groups: - - - cscf_RSG vm_image_name: get_input: lbd_image_name port_lbd_dpdk_1_port_network: @@ -2539,16 +2520,6 @@ topology_template: get_input: lbd_name_1 $DEL: get_input: vcscf_name_delimeter - port_lbd_ims_core_1_port_security_groups: - - - cscf_RSG - port_lbd_ims_core_1_port_fixed_ips: - - ip_address: - get_input: lbd_ims_core_v6_ip_1 - port_lbd_internal_1_port_fixed_ips: - - ip_address: - get_input: lbd_internal_ip_1 - port_lbd_ims_core_1_port_network: - - get_input: ims_core_net_id compute_lbd_scheduler_hints: - group: lbd_server_group_group port_lbd_dpdk_1_port_name: @@ -2559,13 +2530,48 @@ topology_template: get_input: lbd_name_1 $DEL: get_input: vcscf_name_delimeter + port_lbd_internal_1_port_network: + - cscf_internal_network_0 + port_lbd_internal_1_port_mac_requirements: + mac_count_required: + is_required: false + compute_lbd_name: + - get_input: lbd_name_1 + port_lbd_ims_core_1_port_network_role_tag: ims_core + compute_lbd_config_drive: + - true + port_lbd_ims_core_1_port_ip_requirements: + - ip_version: 6 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_lbd_dpdk_1_port_mac_requirements: + mac_count_required: + is_required: false + port_lbd_internal_1_port_ip_requirements: + - ip_version: 4 + ip_count_required: + is_required: true + floating_ip_count_required: + is_required: false + port_lbd_internal_1_port_security_groups: + - - cscf_RSG + port_lbd_ims_core_1_port_security_groups: + - - cscf_RSG + port_lbd_ims_core_1_port_fixed_ips: + - ip_address: + get_input: lbd_ims_core_v6_ip_1 + port_lbd_internal_1_port_fixed_ips: + - ip_address: + get_input: lbd_internal_ip_1 + port_lbd_ims_core_1_port_network: + - get_input: ims_core_net_id port_lbd_dpdk_1_port_security_groups: - - cscf_RSG port_lbd_dpdk_1_port_fixed_ips: - ip_address: get_input: lbd_internal_dpdk_ip_1 - port_lbd_internal_1_port_network: - - cscf_internal_network_0 port_lbd_dpdk_1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -2582,12 +2588,6 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_lbd_internal_1_port_mac_requirements: - mac_count_required: - is_required: false - compute_lbd_name: - - get_input: lbd_name_1 - port_lbd_ims_core_1_port_network_role_tag: ims_core service_template_filter: substitute_service_template: Nested_lbdServiceTemplate.yaml count: 1 @@ -3276,17 +3276,8 @@ topology_template: properties: compute_lbd_user_data_format: - RAW - compute_lbd_config_drive: - - true - port_lbd_dpdk_0_port_fixed_ips: - - ip_address: - get_input: lbd_internal_dpdk_ip_0 - port_lbd_internal_0_port_security_groups: - - - cscf_RSG vm_flavor_name: get_input: lbd_flavor_name - port_lbd_dpdk_0_port_security_groups: - - - cscf_RSG compute_lbd_availability_zone: - get_input: availability_zone_0 port_lbd_dpdk_0_port_allowed_address_pairs: @@ -3296,14 +3287,6 @@ topology_template: - ip_address: 8000::/1 vm_image_name: get_input: lbd_image_name - port_lbd_dpdk_0_port_name: - - str_replace: - template: $PREFIX$DELeth1 - params: - $PREFIX: - get_input: lbd_name_0 - $DEL: - get_input: vcscf_name_delimeter port_lbd_dpdk_0_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -3312,8 +3295,6 @@ topology_template: is_required: false port_lbd_ims_core_0_port_network: - get_input: ims_core_net_id - port_lbd_dpdk_0_port_network: - - cscf_internal_dpdk_network_0 port_lbd_ims_core_0_port_mac_requirements: mac_count_required: is_required: false @@ -3334,23 +3315,54 @@ topology_template: port_lbd_internal_0_port_mac_requirements: mac_count_required: is_required: false - port_lbd_ims_core_0_port_fixed_ips: - - ip_address: - get_input: lbd_ims_core_v6_ip_0 port_lbd_ims_core_0_port_ip_requirements: - ip_version: 6 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_lbd_internal_0_port_fixed_ips: - - ip_address: - get_input: lbd_internal_ip_0 port_lbd_internal_0_port_network: - cscf_internal_network_0 port_lbd_dpdk_0_port_mac_requirements: mac_count_required: is_required: false + compute_lbd_name: + - get_input: lbd_name_0 + port_lbd_ims_core_0_port_security_groups: + - - cscf_RSG + port_lbd_ims_core_0_port_name: + - str_replace: + template: $PREFIX$DELeth2 + params: + $PREFIX: + get_input: lbd_name_0 + $DEL: + get_input: vcscf_name_delimeter + compute_lbd_config_drive: + - true + port_lbd_dpdk_0_port_fixed_ips: + - ip_address: + get_input: lbd_internal_dpdk_ip_0 + port_lbd_internal_0_port_security_groups: + - - cscf_RSG + port_lbd_dpdk_0_port_security_groups: + - - cscf_RSG + port_lbd_dpdk_0_port_name: + - str_replace: + template: $PREFIX$DELeth1 + params: + $PREFIX: + get_input: lbd_name_0 + $DEL: + get_input: vcscf_name_delimeter + port_lbd_dpdk_0_port_network: + - cscf_internal_dpdk_network_0 + port_lbd_ims_core_0_port_fixed_ips: + - ip_address: + get_input: lbd_ims_core_v6_ip_0 + port_lbd_internal_0_port_fixed_ips: + - ip_address: + get_input: lbd_internal_ip_0 compute_lbd_metadata: - vf_module_id: get_input: vf_module_id @@ -3361,24 +3373,12 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - compute_lbd_name: - - get_input: lbd_name_0 port_lbd_internal_0_port_ip_requirements: - ip_version: 4 ip_count_required: is_required: true floating_ip_count_required: is_required: false - port_lbd_ims_core_0_port_security_groups: - - - cscf_RSG - port_lbd_ims_core_0_port_name: - - str_replace: - template: $PREFIX$DELeth2 - params: - $PREFIX: - get_input: lbd_name_0 - $DEL: - get_input: vcscf_name_delimeter service_template_filter: substitute_service_template: Nested_lbd_1ServiceTemplate.yaml count: 1 diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml index 37354cf0a8..e41c99a6c8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdiServiceTemplate.yaml @@ -24,6 +24,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cdi_ims_core_0_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -144,6 +149,11 @@ topology_template: port_cdi_internal_0_port_order: type: integer required: true + port_cdi_internal_0_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cdi_ims_core_0_port_allowed_address_pairs: type: list required: true @@ -179,6 +189,8 @@ topology_template: vlan_requirements: get_input: port_cdi_ims_core_0_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cdi_ims_core_0_port_related_networks ip_requirements: get_input: port_cdi_ims_core_0_port_ip_requirements network_role_tag: @@ -253,6 +265,8 @@ topology_template: vlan_requirements: get_input: port_cdi_internal_0_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cdi_internal_0_port_related_networks ip_requirements: get_input: port_cdi_internal_0_port_ip_requirements network_role_tag: @@ -494,4 +508,4 @@ topology_template: - dependency dependency_cdi_cdi_internal_0_port: - cdi_cdi_internal_0_port - - 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/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml index 1e5366896c..d6d9cfe8dd 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cdi_1ServiceTemplate.yaml @@ -22,6 +22,11 @@ topology_template: port_cdi_internal_1_port_network_role_tag: type: string required: true + port_cdi_internal_1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true @@ -146,6 +151,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cdi_ims_core_1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_cdi_metadata: type: list required: true @@ -179,6 +189,8 @@ topology_template: vlan_requirements: get_input: port_cdi_internal_1_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cdi_internal_1_port_related_networks ip_requirements: get_input: port_cdi_internal_1_port_ip_requirements network_role_tag: @@ -253,6 +265,8 @@ topology_template: vlan_requirements: get_input: port_cdi_ims_core_1_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cdi_ims_core_1_port_related_networks ip_requirements: get_input: port_cdi_ims_core_1_port_ip_requirements network_role_tag: @@ -494,4 +508,4 @@ topology_template: - dependency dependency_cdi: - cdi - - 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/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml index 4f95a1d7c5..56fd1defd7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cifServiceTemplate.yaml @@ -31,6 +31,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_cif_internal_0_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_ims_li_0_port_network_role: type: string required: true @@ -56,6 +61,11 @@ topology_template: port_cif_oam_0_port_1_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_cif_oam_0_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_oam_0_port_3_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -72,6 +82,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_cif_ims_core_0_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_oam_0_port_1_vlan_requirements: type: list required: true @@ -146,6 +161,11 @@ topology_template: required: true entry_schema: type: json + port_cif_oam_0_port_3_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_oam_0_port_1_subnetpoolid: type: string required: true @@ -250,6 +270,11 @@ topology_template: required: true entry_schema: type: string + port_cif_ims_li_0_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_internal_0_port_security_groups: type: list required: true @@ -369,6 +394,8 @@ topology_template: vlan_requirements: get_input: port_cif_internal_0_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cif_internal_0_port_related_networks ip_requirements: get_input: port_cif_internal_0_port_ip_requirements network_role_tag: @@ -412,6 +439,8 @@ topology_template: vlan_requirements: get_input: port_cif_ims_li_0_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cif_ims_li_0_port_related_networks ip_requirements: get_input: port_cif_ims_li_0_port_ip_requirements network_role_tag: @@ -455,6 +484,8 @@ topology_template: vlan_requirements: get_input: port_cif_ims_core_0_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cif_ims_core_0_port_related_networks ip_requirements: get_input: port_cif_ims_core_0_port_ip_requirements network_role_tag: @@ -498,6 +529,8 @@ topology_template: vlan_requirements: get_input: port_cif_oam_0_port_1_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cif_oam_0_port_1_related_networks ip_requirements: get_input: port_cif_oam_0_port_1_ip_requirements network_role_tag: @@ -541,6 +574,8 @@ topology_template: vlan_requirements: get_input: port_cif_oam_0_port_3_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cif_oam_0_port_3_related_networks ip_requirements: get_input: port_cif_oam_0_port_3_ip_requirements network_role_tag: @@ -908,4 +943,4 @@ topology_template: - link link_cif_cif_oam_0_port_3: - cif_cif_oam_0_port_3 - - link + - link
\ 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/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml index 0e02d6611d..ae63110bf0 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_cif_1ServiceTemplate.yaml @@ -43,6 +43,11 @@ topology_template: port_cif_oam_1_port_3_subnetpoolid: type: string required: true + port_cif_oam_1_port_3_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true @@ -96,6 +101,11 @@ topology_template: port_cif_ims_li_1_port_subnetpoolid: type: string required: true + port_cif_ims_core_1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_ims_li_1_port_allowed_address_pairs: type: list required: true @@ -133,6 +143,11 @@ topology_template: port_cif_internal_1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true + port_cif_internal_1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_oam_1_port_1_fixed_ips: type: list required: true @@ -264,6 +279,11 @@ topology_template: required: true entry_schema: type: string + port_cif_oam_1_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_ims_core_1_port_subnetpoolid: type: string required: true @@ -297,6 +317,11 @@ topology_template: required: true entry_schema: type: string + port_cif_ims_li_1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cif_ims_li_1_port_network_role_tag: type: string required: true @@ -369,6 +394,8 @@ topology_template: vlan_requirements: get_input: port_cif_ims_li_1_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cif_ims_li_1_port_related_networks ip_requirements: get_input: port_cif_ims_li_1_port_ip_requirements network_role_tag: @@ -412,6 +439,8 @@ topology_template: vlan_requirements: get_input: port_cif_internal_1_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cif_internal_1_port_related_networks ip_requirements: get_input: port_cif_internal_1_port_ip_requirements network_role_tag: @@ -455,6 +484,8 @@ topology_template: vlan_requirements: get_input: port_cif_oam_1_port_1_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cif_oam_1_port_1_related_networks ip_requirements: get_input: port_cif_oam_1_port_1_ip_requirements network_role_tag: @@ -498,6 +529,8 @@ topology_template: vlan_requirements: get_input: port_cif_ims_core_1_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cif_ims_core_1_port_related_networks ip_requirements: get_input: port_cif_ims_core_1_port_ip_requirements network_role_tag: @@ -541,6 +574,8 @@ topology_template: vlan_requirements: get_input: port_cif_oam_1_port_3_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cif_oam_1_port_3_related_networks ip_requirements: get_input: port_cif_oam_1_port_3_ip_requirements network_role_tag: @@ -908,4 +943,4 @@ topology_template: - link link_cif_cif_oam_1_port_3: - cif_cif_oam_1_port_3 - - link + - link
\ 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/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml index 40d031a7ef..4724e88180 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbdServiceTemplate.yaml @@ -11,11 +11,6 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: - port_lbd_internal_1_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements port_lbd_ims_core_1_port_allowed_address_pairs: type: list required: true @@ -26,11 +21,6 @@ topology_template: required: true entry_schema: type: string - compute_lbd_config_drive: - type: list - required: true - entry_schema: - type: boolean port_lbd_internal_1_port_name: type: list required: true @@ -41,19 +31,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_ims_core_1_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_1_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_lbd_dpdk_1_port_subnetpoolid: type: string required: true @@ -77,19 +54,6 @@ topology_template: port_lbd_internal_1_port_order: type: integer required: true - port_lbd_internal_1_port_ip_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_internal_1_port_security_groups: - type: list - required: true - entry_schema: - type: json - port_lbd_ims_core_1_port_subnetpoolid: - type: string - required: true vm_image_name: type: string required: true @@ -115,6 +79,81 @@ topology_template: port_lbd_ims_core_1_port_network_role: type: string required: true + port_lbd_ims_core_1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + compute_lbd_scheduler_hints: + type: list + required: true + entry_schema: + type: json + port_lbd_dpdk_1_port_name: + type: list + required: true + entry_schema: + type: string + port_lbd_ims_core_1_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_lbd_internal_1_port_network: + type: list + required: true + entry_schema: + type: string + port_lbd_internal_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + compute_lbd_name: + type: list + required: true + entry_schema: + type: string + port_lbd_ims_core_1_port_network_role_tag: + type: string + required: true + port_lbd_internal_1_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + compute_lbd_config_drive: + type: list + required: true + entry_schema: + type: boolean + port_lbd_ims_core_1_port_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_ims_core_1_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_1_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements + required: true + port_lbd_internal_1_port_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_1_port_security_groups: + type: list + required: true + entry_schema: + type: json + port_lbd_ims_core_1_port_subnetpoolid: + type: string + required: true + port_lbd_internal_1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_lbd_internal_1_port_subnetpoolid: type: string required: true @@ -148,16 +187,6 @@ topology_template: port_lbd_dpdk_1_port_network_role_tag: type: string required: true - compute_lbd_scheduler_hints: - type: list - required: true - entry_schema: - type: json - port_lbd_dpdk_1_port_name: - type: list - required: true - entry_schema: - type: string port_lbd_dpdk_1_port_security_groups: type: list required: true @@ -168,14 +197,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_lbd_ims_core_1_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_lbd_internal_1_port_network: - type: list - required: true - entry_schema: - type: string port_lbd_internal_1_port_network_role: type: string required: true @@ -189,22 +210,16 @@ topology_template: required: true entry_schema: type: json - port_lbd_internal_1_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements - required: true port_lbd_dpdk_1_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements - compute_lbd_name: + port_lbd_dpdk_1_port_related_networks: type: list required: true entry_schema: - type: string - port_lbd_ims_core_1_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_lbd_dpdk_1_port_network_role: type: string required: true @@ -227,6 +242,8 @@ topology_template: vlan_requirements: get_input: port_lbd_ims_core_1_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_lbd_ims_core_1_port_related_networks ip_requirements: get_input: port_lbd_ims_core_1_port_ip_requirements network_role_tag: @@ -270,6 +287,8 @@ topology_template: vlan_requirements: get_input: port_lbd_dpdk_1_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_lbd_dpdk_1_port_related_networks ip_requirements: get_input: port_lbd_dpdk_1_port_ip_requirements network_role_tag: @@ -311,6 +330,8 @@ topology_template: vlan_requirements: get_input: port_lbd_internal_1_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_lbd_internal_1_port_related_networks ip_requirements: get_input: port_lbd_internal_1_port_ip_requirements network_role_tag: @@ -625,4 +646,4 @@ topology_template: - link dependency_lbd_lbd_dpdk_1_port: - lbd_lbd_dpdk_1_port - - 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/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml index 6cf9d097ad..52f88a0642 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_lbd_1ServiceTemplate.yaml @@ -19,16 +19,6 @@ topology_template: required: true entry_schema: type: string - compute_lbd_config_drive: - type: list - required: true - entry_schema: - type: boolean - port_lbd_dpdk_0_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_lbd_internal_0_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -38,19 +28,14 @@ topology_template: port_lbd_internal_0_port_network_role: type: string required: true - port_lbd_internal_0_port_security_groups: + port_lbd_dpdk_0_port_related_networks: type: list required: true entry_schema: - type: json + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_flavor_name: type: string required: true - port_lbd_dpdk_0_port_security_groups: - type: list - required: true - entry_schema: - type: json compute_lbd_availability_zone: type: list required: true @@ -64,22 +49,9 @@ topology_template: port_lbd_dpdk_0_port_subnetpoolid: type: string required: true - port_lbd_dpdk_0_port_vlan_requirements: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true - port_lbd_dpdk_0_port_name: - type: list - required: true - entry_schema: - type: string - port_lbd_internal_0_port_subnetpoolid: - type: string - required: true port_lbd_dpdk_0_port_ip_requirements: type: list required: true @@ -88,22 +60,11 @@ topology_template: port_lbd_ims_core_0_port_order: type: integer required: true - port_lbd_ims_core_0_port_network_role: - type: string - required: true port_lbd_ims_core_0_port_network: type: list required: true entry_schema: type: string - port_lbd_dpdk_0_port_network: - type: list - required: true - entry_schema: - type: string - port_lbd_dpdk_0_port_network_role_tag: - type: string - required: true port_lbd_ims_core_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -117,30 +78,14 @@ topology_template: required: true entry_schema: type: string - port_lbd_internal_0_port_order: - type: integer - required: true - port_lbd_dpdk_0_port_network_role: + port_lbd_ims_core_0_port_network_role_tag: type: string required: true - port_lbd_ims_core_0_port_vlan_requirements: + port_lbd_ims_core_0_port_related_networks: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_ims_core_0_port_subnetpoolid: - type: string - required: true - index_value: - type: integer - description: Index value of this substitution service template runtime instance - required: false - default: 0 - constraints: - - greater_or_equal: 0 - port_lbd_ims_core_0_port_network_role_tag: - type: string - required: true + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_lbd_scheduler_hints: type: list required: true @@ -149,11 +94,6 @@ topology_template: port_lbd_internal_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_lbd_ims_core_0_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_lbd_dpdk_0_port_order: type: integer required: true @@ -162,14 +102,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_0_port_exCP_naming: - type: org.openecomp.datatypes.Naming - required: true - port_lbd_internal_0_port_fixed_ips: - type: list - required: true - entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_lbd_internal_0_port_network: type: list required: true @@ -178,36 +110,119 @@ topology_template: port_lbd_dpdk_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - compute_lbd_metadata: + compute_lbd_name: + type: list + required: true + entry_schema: + type: string + port_lbd_ims_core_0_port_security_groups: type: list required: true entry_schema: type: json - compute_lbd_name: + port_lbd_ims_core_0_port_name: type: list required: true entry_schema: type: string - port_lbd_internal_0_port_ip_requirements: + port_lbd_internal_0_port_vlan_requirements: type: list required: true entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_0_port_security_groups: + type: org.openecomp.datatypes.network.VlanRequirements + compute_lbd_config_drive: + type: list + required: true + entry_schema: + type: boolean + port_lbd_internal_0_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments + port_lbd_dpdk_0_port_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_internal_0_port_security_groups: type: list required: true entry_schema: type: json - port_lbd_ims_core_0_port_name: + port_lbd_dpdk_0_port_security_groups: + type: list + required: true + entry_schema: + type: json + port_lbd_dpdk_0_port_vlan_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_dpdk_0_port_name: type: list required: true entry_schema: type: string - port_lbd_internal_0_port_vlan_requirements: + port_lbd_internal_0_port_subnetpoolid: + type: string + required: true + port_lbd_ims_core_0_port_network_role: + type: string + required: true + port_lbd_dpdk_0_port_network: + type: list + required: true + entry_schema: + type: string + port_lbd_dpdk_0_port_network_role_tag: + type: string + required: true + port_lbd_internal_0_port_order: + type: integer + required: true + port_lbd_dpdk_0_port_network_role: + type: string + required: true + port_lbd_ims_core_0_port_vlan_requirements: type: list required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_ims_core_0_port_subnetpoolid: + type: string + required: true + index_value: + type: integer + description: Index value of this substitution service template runtime instance + required: false + default: 0 + constraints: + - greater_or_equal: 0 + port_lbd_ims_core_0_port_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_ims_core_0_port_exCP_naming: + type: org.openecomp.datatypes.Naming + required: true + port_lbd_internal_0_port_fixed_ips: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + compute_lbd_metadata: + type: list + required: true + entry_schema: + type: json + port_lbd_internal_0_port_ip_requirements: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements node_templates: lbd_lbd_ims_core_0_port: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port @@ -227,6 +242,8 @@ topology_template: vlan_requirements: get_input: port_lbd_ims_core_0_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_lbd_ims_core_0_port_related_networks ip_requirements: get_input: port_lbd_ims_core_0_port_ip_requirements network_role_tag: @@ -270,6 +287,8 @@ topology_template: vlan_requirements: get_input: port_lbd_dpdk_0_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_lbd_dpdk_0_port_related_networks ip_requirements: get_input: port_lbd_dpdk_0_port_ip_requirements network_role_tag: @@ -311,6 +330,8 @@ topology_template: vlan_requirements: get_input: port_lbd_internal_0_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_lbd_internal_0_port_related_networks ip_requirements: get_input: port_lbd_internal_0_port_ip_requirements network_role_tag: @@ -625,4 +646,4 @@ topology_template: - link link_lbd_lbd_internal_0_port: - lbd_lbd_internal_0_port - - link + - link
\ 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/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml index 342b6795fc..ea3d737e38 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oamServiceTemplate.yaml @@ -51,6 +51,11 @@ topology_template: port_oam_oam_0_port_order: type: integer required: true + port_oam_internal_0_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vm_image_name: type: string required: true @@ -98,6 +103,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_oam_oam_0_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_oam_user_data_format: type: list required: true @@ -179,6 +189,8 @@ topology_template: vlan_requirements: get_input: port_oam_oam_0_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_oam_oam_0_port_related_networks ip_requirements: get_input: port_oam_oam_0_port_ip_requirements network_role_tag: @@ -222,6 +234,8 @@ topology_template: vlan_requirements: get_input: port_oam_internal_0_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_oam_internal_0_port_related_networks ip_requirements: get_input: port_oam_internal_0_port_ip_requirements network_role_tag: @@ -494,4 +508,4 @@ topology_template: - dependency link_oam_oam_internal_0_port: - oam_oam_internal_0_port - - link + - link
\ 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/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml index 1c727e5b8f..ab1896910c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_1ServiceTemplate.yaml @@ -14,6 +14,11 @@ topology_template: port_oam_internal_1_port_network_role_tag: type: string required: true + port_oam_internal_1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_oam_internal_1_port_security_groups: type: list required: true @@ -64,6 +69,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_oam_oam_1_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_oam_internal_1_port_vlan_requirements: type: list required: true @@ -179,6 +189,8 @@ topology_template: vlan_requirements: get_input: port_oam_internal_1_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_oam_internal_1_port_related_networks ip_requirements: get_input: port_oam_internal_1_port_ip_requirements network_role_tag: @@ -222,6 +234,8 @@ topology_template: vlan_requirements: get_input: port_oam_oam_1_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_oam_oam_1_port_related_networks ip_requirements: get_input: port_oam_oam_1_port_ip_requirements network_role_tag: @@ -494,4 +508,4 @@ topology_template: - dependency dependency_oam_oam_oam_1_port: - oam_oam_oam_1_port - - 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/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml index 6d835ea8fb..d099f16268 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/Nested_oam_2ServiceTemplate.yaml @@ -14,6 +14,11 @@ topology_template: port_oam_oam_2_port_network_role_tag: type: string required: true + port_oam_oam_2_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_oam_oam_2_port_security_groups: type: list required: true @@ -130,6 +135,11 @@ topology_template: port_oam_oam_2_port_order: type: integer required: true + port_oam_internal_2_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments compute_oam_scheduler_hints: type: list required: true @@ -179,6 +189,8 @@ topology_template: vlan_requirements: get_input: port_oam_internal_2_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_oam_internal_2_port_related_networks ip_requirements: get_input: port_oam_internal_2_port_ip_requirements network_role_tag: @@ -222,6 +234,8 @@ topology_template: vlan_requirements: get_input: port_oam_oam_2_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_oam_oam_2_port_related_networks ip_requirements: get_input: port_oam_oam_2_port_ip_requirements network_role_tag: @@ -494,4 +508,4 @@ topology_template: - dependency dependency_oam: - oam - - 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/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml index 73d44bd634..84325428a4 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_cscfServiceTemplate.yaml @@ -86,6 +86,11 @@ topology_template: immutable: false type: string description: Unique ID for this VF instance + port_cscf_internal_0_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments availability_zone_0: hidden: false immutable: false @@ -213,6 +218,8 @@ topology_template: properties: subnetpoolid: get_input: port_cscf_internal_0_port_0_subnetpoolid + related_networks: + get_input: port_cscf_internal_0_port_0_related_networks network: get_input: internal_net_id ip_requirements: @@ -439,4 +446,4 @@ topology_template: - link local_storage_cscf_server_0: - cscf_server_0 - - local_storage + - local_storage
\ 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/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml index e13629478c..54bb2f500c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs/out/nested_tdcoreServiceTemplate.yaml @@ -46,6 +46,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_tdcore_dpdk_0_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_tdcore_internal_0_port_0_vlan_requirements: type: list required: true @@ -106,6 +111,11 @@ topology_template: port_tdcore_dpdk_0_port_1_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true + port_tdcore_internal_0_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments tdcore_flavor_name: hidden: false immutable: false @@ -226,6 +236,8 @@ topology_template: properties: subnetpoolid: get_input: port_tdcore_internal_0_port_0_subnetpoolid + related_networks: + get_input: port_tdcore_internal_0_port_0_related_networks network: get_input: internal_net_id ip_requirements: @@ -275,6 +287,8 @@ topology_template: - ip_address: 128.0.0.0/1 - ip_address: ::/1 - ip_address: 8000::/1 + related_networks: + get_input: port_tdcore_dpdk_0_port_1_related_networks network: get_input: internal_dpdk_net_id ip_requirements: @@ -568,4 +582,4 @@ topology_template: - dependency local_storage_tdcore_server_0: - tdcore_server_0 - - local_storage + - local_storage
\ 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/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 120e1d76aa..cd1f543c80 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -75,6 +75,12 @@ node_types: type: string required: true status: SUPPORTED + port_vson_server_oam_net_port_10_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vson_dc_unit: type: string description: Name of the vSON Data Center. @@ -613,6 +619,12 @@ node_types: Swift account auth token. Example: 041a5187bb4641f9b89583e2539776b0 required: true status: SUPPORTED + port_vson_server_oam_net_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments default_gateway_v6: type: string description: Default IPv6 gateway. @@ -1078,6 +1090,12 @@ node_types: description: Unique name for this VF module instance. required: true status: SUPPORTED + port_vson_server_oam_net_port_00_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments dns_servers: type: list description: List of DNS servers. @@ -1590,6 +1608,12 @@ node_types: description: Unique name for this VF module instance. required: true status: SUPPORTED + port_vson_server_oam_net_port_00_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments dns_servers: type: list description: List of DNS servers. @@ -2122,6 +2146,12 @@ node_types: type: string required: true status: SUPPORTED + port_vson_server_oam_net_port_10_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vson_dc_unit: type: string description: Name of the vSON Data Center. @@ -2591,6 +2621,12 @@ node_types: description: Unique name for this VF module instance. required: true status: SUPPORTED + port_vson_server_oam_net_port_00_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments dns_servers: type: list description: List of DNS servers. @@ -3097,6 +3133,12 @@ node_types: description: Unique name for this VF module instance. required: true status: SUPPORTED + port_vson_server_oam_net_port_00_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments dns_servers: type: list description: List of DNS servers. @@ -3603,6 +3645,12 @@ node_types: description: Unique name for this VF module instance. required: true status: SUPPORTED + port_vson_server_oam_net_port_00_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments dns_servers: type: list description: List of DNS servers. @@ -4227,6 +4275,12 @@ node_types: type: integer required: true status: SUPPORTED + port_vson_server_oam_net_port_20_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vson_vm_names: type: list description: A list of unique names to be issued to the vSON Cluster leaders. @@ -4733,6 +4787,12 @@ node_types: type: integer required: true status: SUPPORTED + port_vson_server_oam_net_port_20_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vson_vm_names: type: list description: A list of unique names to be issued to the vSON Cluster leaders. @@ -5150,6 +5210,12 @@ node_types: type: string required: true status: SUPPORTED + port_vson_server_oam_net_port_10_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vson_dc_unit: type: string description: Name of the vSON Data Center. @@ -5575,4 +5641,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ 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/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml index 8e29ff83a5..01a0937f32 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_serverServiceTemplate.yaml @@ -183,6 +183,11 @@ topology_template: port_vson_server_oam_net_port_20_order: type: integer required: true + port_vson_server_oam_net_port_20_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vson_vm_names: label: vSON Cluster leader names hidden: false @@ -228,6 +233,8 @@ topology_template: properties: subnetpoolid: get_input: port_vson_server_oam_net_port_20_subnetpoolid + related_networks: + get_input: port_vson_server_oam_net_port_20_related_networks network: get_input: oam_net_id ip_requirements: @@ -453,4 +460,4 @@ topology_template: - dependency dependency_vson_server_1: - vson_server_1 - - 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/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml index 2814364cfb..f6cc40a6a5 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_from_volServiceTemplate.yaml @@ -85,6 +85,11 @@ topology_template: port_vson_server_oam_net_port_10_subnetpoolid: type: string required: true + port_vson_server_oam_net_port_10_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments vson_dc_unit: label: vSON Data Center name hidden: false @@ -215,6 +220,8 @@ topology_template: properties: subnetpoolid: get_input: port_vson_server_oam_net_port_10_subnetpoolid + related_networks: + get_input: port_vson_server_oam_net_port_10_related_networks network: get_input: oam_net_id ip_requirements: @@ -440,4 +447,4 @@ topology_template: - link dependency_vson_server_3: - vson_server_3 - - 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/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml index 0ab6d2e292..3f157c5d26 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_volServiceTemplate.yaml @@ -55,6 +55,11 @@ topology_template: immutable: false type: string description: Unique name for this VF module instance. + port_vson_server_oam_net_port_00_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments dns_servers: label: DNS servers hidden: false @@ -230,6 +235,8 @@ topology_template: properties: subnetpoolid: get_input: port_vson_server_oam_net_port_00_subnetpoolid + related_networks: + get_input: port_vson_server_oam_net_port_00_related_networks network: get_input: oam_net_id ip_requirements: @@ -455,4 +462,4 @@ topology_template: - link dependency_vson_server_2: - vson_server_2 - - 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/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml index 4f102dd2d7..9c41db4fe6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/multipleReferencesToSameNestedFilesWithSameComputeType/out/nested_vson_server_with_vol_dual_ip_stackServiceTemplate.yaml @@ -127,6 +127,11 @@ topology_template: type: string description: | Swift account auth token. Example: 041a5187bb4641f9b89583e2539776b0 + port_vson_server_oam_net_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments default_gateway_v6: label: Default IPv6 gateway hidden: false @@ -250,6 +255,8 @@ topology_template: properties: subnetpoolid: get_input: port_vson_server_oam_net_port_0_subnetpoolid + related_networks: + get_input: port_vson_server_oam_net_port_0_related_networks network: get_input: oam_net_id ip_requirements: @@ -479,4 +486,4 @@ topology_template: - dependency local_storage_vson_server: - vson_server - - local_storage + - local_storage
\ 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/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml index 94ebe4da6c..26cf3450b7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -311,6 +311,12 @@ node_types: type: integer required: true status: SUPPORTED + port_cmaui_port_7_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cmaui_port_7_network_role_tag: type: string required: true @@ -405,6 +411,12 @@ node_types: type: string required: true status: SUPPORTED + port_cmaui_port_8_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments requirements: - dependency_cmaui_port_7: capability: tosca.capabilities.Node @@ -834,6 +846,12 @@ node_types: org.openecomp.resource.abstract.nodes.cmaui: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_cmaui_port_6_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cmaui_port_6_fixed_ips: type: list required: true @@ -876,6 +894,12 @@ node_types: type: string required: true status: SUPPORTED + port_cmaui_port_5_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cmaui_port_6_network: type: list required: true @@ -1507,6 +1531,12 @@ node_types: status: SUPPORTED constraints: - greater_or_equal: 0 + port_cmaui_port_3_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cmaui_port_3_ip_requirements: type: list required: true @@ -1555,6 +1585,12 @@ node_types: status: SUPPORTED entry_schema: type: json + port_cmaui_port_4_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cmaui_port_4_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -3784,6 +3820,12 @@ node_types: type: string required: true status: SUPPORTED + port_cmaui_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cmaui_port_1_security_groups: type: list required: true @@ -3828,6 +3870,12 @@ node_types: type: string required: true status: SUPPORTED + port_cmaui_port_2_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cmaui_port_2_network_role_tag: type: string required: true @@ -6608,4 +6656,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ 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/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml index 8f42b61c6a..0f5f943868 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmauiServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_cmaui_port_6_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cmaui_port_6_fixed_ips: type: list required: true @@ -44,6 +49,11 @@ topology_template: vm_image_name: type: string required: true + port_cmaui_port_5_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cmaui_port_6_network: type: list required: true @@ -151,6 +161,8 @@ topology_template: vlan_requirements: get_input: port_cmaui_port_5_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cmaui_port_5_related_networks ip_requirements: get_input: port_cmaui_port_5_ip_requirements network_role_tag: @@ -192,6 +204,8 @@ topology_template: vlan_requirements: get_input: port_cmaui_port_6_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cmaui_port_6_related_networks ip_requirements: get_input: port_cmaui_port_6_ip_requirements network_role_tag: @@ -444,4 +458,4 @@ topology_template: - dependency local_storage_cmaui: - cmaui - - local_storage + - local_storage
\ 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/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml index 3407e72dc8..a3290f43f6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_1ServiceTemplate.yaml @@ -88,6 +88,11 @@ topology_template: default: 0 constraints: - greater_or_equal: 0 + port_cmaui_port_3_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cmaui_port_3_ip_requirements: type: list required: true @@ -127,6 +132,11 @@ topology_template: required: true entry_schema: type: json + port_cmaui_port_4_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cmaui_port_4_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -151,6 +161,8 @@ topology_template: vlan_requirements: get_input: port_cmaui_port_4_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cmaui_port_4_related_networks ip_requirements: get_input: port_cmaui_port_4_ip_requirements network_role_tag: @@ -192,6 +204,8 @@ topology_template: vlan_requirements: get_input: port_cmaui_port_3_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cmaui_port_3_related_networks ip_requirements: get_input: port_cmaui_port_3_ip_requirements network_role_tag: @@ -444,4 +458,4 @@ topology_template: - dependency local_storage_cmaui: - cmaui - - local_storage + - local_storage
\ 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/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml index 08dd30adc1..63942e2108 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/Nested_cmaui_2ServiceTemplate.yaml @@ -20,6 +20,11 @@ topology_template: port_cmaui_port_1_subnetpoolid: type: string required: true + port_cmaui_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cmaui_port_1_security_groups: type: list required: true @@ -55,6 +60,11 @@ topology_template: vm_image_name: type: string required: true + port_cmaui_port_2_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cmaui_port_2_network_role_tag: type: string required: true @@ -151,6 +161,8 @@ topology_template: vlan_requirements: get_input: port_cmaui_port_1_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cmaui_port_1_related_networks ip_requirements: get_input: port_cmaui_port_1_ip_requirements network_role_tag: @@ -192,6 +204,8 @@ topology_template: vlan_requirements: get_input: port_cmaui_port_2_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_cmaui_port_2_related_networks ip_requirements: get_input: port_cmaui_port_2_ip_requirements network_role_tag: @@ -444,4 +458,4 @@ topology_template: - local_storage dependency_cmaui_cmaui_port_1: - cmaui_cmaui_port_1 - - 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/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml index 17205b3a8e..c819704a70 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedMultiLevels/out/nested4ServiceTemplate.yaml @@ -33,6 +33,11 @@ topology_template: port_cmaui_port_8_order: type: integer required: true + port_cmaui_port_7_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_cmaui_port_7_network_role_tag: type: string required: true @@ -114,12 +119,19 @@ topology_template: port_cmaui_port_8_subnetpoolid: type: string required: true + port_cmaui_port_8_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments node_templates: cmaui_port_7: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: subnetpoolid: get_input: port_cmaui_port_7_subnetpoolid + related_networks: + get_input: port_cmaui_port_7_related_networks network: get_input: net replacement_policy: AUTO @@ -168,6 +180,8 @@ topology_template: properties: subnetpoolid: get_input: port_cmaui_port_8_subnetpoolid + related_networks: + get_input: port_cmaui_port_8_related_networks network: get_input: net replacement_policy: AUTO @@ -425,4 +439,4 @@ topology_template: - dependency local_storage_server_cmaui_4: - server_cmaui_4 - - local_storage + - local_storage
\ 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/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 5872b05b1d..adbfc2a693 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -26,6 +26,12 @@ node_types: type: string required: true status: SUPPORTED + port_oam_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_oam_port_1_network_role_tag: type: string required: true @@ -150,6 +156,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_oam_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments shared_security_group_id1: type: string description: UID of OAM network @@ -589,6 +601,12 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -631,6 +649,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -1188,6 +1212,12 @@ node_types: type: string required: true status: SUPPORTED + port_oam_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_oam_port_1_network_role_tag: type: string required: true @@ -1312,6 +1342,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_oam_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments shared_security_group_id1: type: string description: UID of OAM network @@ -1751,6 +1787,12 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -1793,6 +1835,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -2629,4 +2677,4 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ 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/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml index 794802978f..eb4cfb9b59 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-oam_v0.1ServiceTemplate.yaml @@ -28,6 +28,11 @@ topology_template: port_oam_port_0_network_role: type: string required: true + port_oam_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_oam_port_1_network_role_tag: type: string required: true @@ -150,6 +155,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements + port_oam_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments shared_security_group_id1: hidden: false immutable: false @@ -159,6 +169,12 @@ topology_template: oam_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_oam_port_0_subnetpoolid + related_networks: + get_input: port_oam_port_0_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_oam_port_0_ip_requirements security_groups: @@ -168,8 +184,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_oam_port_0_subnetpoolid mac_requirements: get_input: port_oam_port_0_mac_requirements subinterface_indicator: false @@ -179,8 +193,6 @@ topology_template: get_input: port_oam_port_0_vlan_requirements network_role_tag: get_input: port_oam_port_0_network_role_tag - network: - get_input: cps_net_name order: get_input: port_oam_port_0_order requirements: @@ -203,6 +215,12 @@ topology_template: oam_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_oam_port_1_subnetpoolid + related_networks: + get_input: port_oam_port_1_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_oam_port_1_ip_requirements security_groups: @@ -213,8 +231,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_oam_port_1_subnetpoolid mac_requirements: get_input: port_oam_port_1_mac_requirements subinterface_indicator: false @@ -224,8 +240,6 @@ topology_template: get_input: port_oam_port_1_vlan_requirements network_role_tag: get_input: port_oam_port_1_network_role_tag - network: - get_input: oam_net_name order: get_input: port_oam_port_1_order requirements: @@ -463,4 +477,4 @@ topology_template: - link dependency_server_oam: - server_oam - - 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/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml index 205114d690..6107509758 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesConnectedIn/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pcm_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -50,6 +55,11 @@ topology_template: port_pcm_port_0_subnetpoolid: type: string required: true + port_pcm_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -159,6 +169,12 @@ topology_template: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_1_subnetpoolid + related_networks: + get_input: port_pcm_port_1_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_port_1_ip_requirements security_groups: @@ -168,8 +184,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid mac_requirements: get_input: port_pcm_port_1_mac_requirements subinterface_indicator: false @@ -179,8 +193,6 @@ topology_template: get_input: port_pcm_port_1_vlan_requirements network_role_tag: get_input: port_pcm_port_1_network_role_tag - network: - get_input: oam_net_name order: get_input: port_pcm_port_1_order requirements: @@ -204,6 +216,12 @@ topology_template: pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_0_subnetpoolid + related_networks: + get_input: port_pcm_port_0_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_0_ip_requirements security_groups: @@ -214,8 +232,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid mac_requirements: get_input: port_pcm_port_0_mac_requirements subinterface_indicator: false @@ -225,8 +241,6 @@ topology_template: get_input: port_pcm_port_0_vlan_requirements network_role_tag: get_input: port_pcm_port_0_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_port_0_order requirements: @@ -464,4 +478,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - 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/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index bb77b07fc2..8cf38b50e7 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -45,6 +51,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -655,6 +667,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_00_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_00_ip_requirements: type: list required: true @@ -671,6 +689,12 @@ node_types: description: flavor name of PCRF CM instance required: true status: SUPPORTED + port_pcm_port_01_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments security_group_name: type: string description: the name of security group @@ -1165,6 +1189,12 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -1202,6 +1232,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -2052,4 +2088,4 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ 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/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml index 9affd9d74a..a25142fc9a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml @@ -69,6 +69,11 @@ topology_template: port_pcm_port_00_network_role: type: string required: true + port_pcm_port_00_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_00_ip_requirements: type: list required: true @@ -86,6 +91,11 @@ topology_template: immutable: false type: string description: flavor name of PCRF CM instance + port_pcm_port_01_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments security_group_name: label: security group name hidden: false @@ -161,6 +171,12 @@ topology_template: pcm_port_00: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_00_subnetpoolid + related_networks: + get_input: port_pcm_port_00_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_00_ip_requirements security_groups: @@ -170,8 +186,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_00_subnetpoolid mac_requirements: get_input: port_pcm_port_00_mac_requirements subinterface_indicator: false @@ -181,8 +195,6 @@ topology_template: get_input: port_pcm_port_00_vlan_requirements network_role_tag: get_input: port_pcm_port_00_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_port_00_order requirements: @@ -193,6 +205,12 @@ topology_template: pcm_port_01: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_01_subnetpoolid + related_networks: + get_input: port_pcm_port_01_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_port_01_ip_requirements security_groups: @@ -202,8 +220,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_01_subnetpoolid mac_requirements: get_input: port_pcm_port_01_mac_requirements subinterface_indicator: false @@ -213,8 +229,6 @@ topology_template: get_input: port_pcm_port_01_vlan_requirements network_role_tag: get_input: port_pcm_port_01_network_role_tag - network: - get_input: oam_net_name order: get_input: port_pcm_port_01_order requirements: @@ -452,4 +466,4 @@ topology_template: - link dependency_server_oam: - server_oam - - 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/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml index d716bdc7a4..70beb64e3e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedNodesGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pcm_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -46,6 +51,11 @@ topology_template: port_pcm_port_0_subnetpoolid: type: string required: true + port_pcm_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -167,6 +177,12 @@ topology_template: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_1_subnetpoolid + related_networks: + get_input: port_pcm_port_1_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_port_1_ip_requirements security_groups: @@ -176,8 +192,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid mac_requirements: get_input: port_pcm_port_1_mac_requirements subinterface_indicator: false @@ -187,8 +201,6 @@ topology_template: get_input: port_pcm_port_1_vlan_requirements network_role_tag: get_input: port_pcm_port_1_network_role_tag - network: - get_input: oam_net_name order: get_input: port_pcm_port_1_order requirements: @@ -212,6 +224,12 @@ topology_template: pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_0_subnetpoolid + related_networks: + get_input: port_pcm_port_0_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_0_ip_requirements security_groups: @@ -221,8 +239,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid mac_requirements: get_input: port_pcm_port_0_mac_requirements subinterface_indicator: false @@ -232,8 +248,6 @@ topology_template: get_input: port_pcm_port_0_vlan_requirements network_role_tag: get_input: port_pcm_port_0_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_port_0_order requirements: @@ -471,4 +485,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - 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/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7b832db48c..27cd819fcc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -45,6 +51,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -650,6 +662,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_00_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_00_ip_requirements: type: list required: true @@ -666,6 +684,12 @@ node_types: description: flavor name of PCRF CM instance required: true status: SUPPORTED + port_pcm_port_01_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments security_group_name: type: string description: the name of security group @@ -1160,6 +1184,12 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -1197,6 +1227,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -2030,4 +2066,4 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ 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/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml index 9affd9d74a..a25142fc9a 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-oam_v0.1ServiceTemplate.yaml @@ -69,6 +69,11 @@ topology_template: port_pcm_port_00_network_role: type: string required: true + port_pcm_port_00_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_00_ip_requirements: type: list required: true @@ -86,6 +91,11 @@ topology_template: immutable: false type: string description: flavor name of PCRF CM instance + port_pcm_port_01_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments security_group_name: label: security group name hidden: false @@ -161,6 +171,12 @@ topology_template: pcm_port_00: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_00_subnetpoolid + related_networks: + get_input: port_pcm_port_00_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_00_ip_requirements security_groups: @@ -170,8 +186,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_00_subnetpoolid mac_requirements: get_input: port_pcm_port_00_mac_requirements subinterface_indicator: false @@ -181,8 +195,6 @@ topology_template: get_input: port_pcm_port_00_vlan_requirements network_role_tag: get_input: port_pcm_port_00_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_port_00_order requirements: @@ -193,6 +205,12 @@ topology_template: pcm_port_01: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_01_subnetpoolid + related_networks: + get_input: port_pcm_port_01_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_port_01_ip_requirements security_groups: @@ -202,8 +220,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_01_subnetpoolid mac_requirements: get_input: port_pcm_port_01_mac_requirements subinterface_indicator: false @@ -213,8 +229,6 @@ topology_template: get_input: port_pcm_port_01_vlan_requirements network_role_tag: get_input: port_pcm_port_01_network_role_tag - network: - get_input: oam_net_name order: get_input: port_pcm_port_01_order requirements: @@ -452,4 +466,4 @@ topology_template: - link dependency_server_oam: - server_oam - - 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/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml index 8272ab5967..b762c58e45 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedOutputParamGetAttrIn/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pcm_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -46,6 +51,11 @@ topology_template: port_pcm_port_0_subnetpoolid: type: string required: true + port_pcm_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -161,6 +171,12 @@ topology_template: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_1_subnetpoolid + related_networks: + get_input: port_pcm_port_1_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_port_1_ip_requirements security_groups: @@ -170,8 +186,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid mac_requirements: get_input: port_pcm_port_1_mac_requirements subinterface_indicator: false @@ -181,8 +195,6 @@ topology_template: get_input: port_pcm_port_1_vlan_requirements network_role_tag: get_input: port_pcm_port_1_network_role_tag - network: - get_input: oam_net_name order: get_input: port_pcm_port_1_order requirements: @@ -206,6 +218,12 @@ topology_template: pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_0_subnetpoolid + related_networks: + get_input: port_pcm_port_0_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_0_ip_requirements security_groups: @@ -215,8 +233,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid mac_requirements: get_input: port_pcm_port_0_mac_requirements subinterface_indicator: false @@ -226,8 +242,6 @@ topology_template: get_input: port_pcm_port_0_vlan_requirements network_role_tag: get_input: port_pcm_port_0_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_port_0_order requirements: @@ -465,4 +479,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - 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/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml index b583725281..933ff40acc 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -40,6 +46,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -627,6 +639,12 @@ node_types: status: SUPPORTED entry_schema: type: string + port_compute_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_compute_port_network_role_tag: type: string required: true @@ -996,4 +1014,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ 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/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml index 0f397b9fe7..82f94141bf 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/Nested_computeServiceTemplate.yaml @@ -50,6 +50,11 @@ topology_template: required: true entry_schema: type: string + port_compute_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_compute_port_network_role_tag: type: string required: true @@ -118,6 +123,8 @@ topology_template: vlan_requirements: get_input: port_compute_port_vlan_requirements subinterface_indicator: false + related_networks: + get_input: port_compute_port_related_networks ip_requirements: get_input: port_compute_port_ip_requirements network_role_tag: @@ -313,4 +320,4 @@ topology_template: - link dependency_compute: - compute - - 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/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml index 1e7caa5fd8..1c527e6c36 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneCompute/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pcm_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -40,6 +45,11 @@ topology_template: port_pcm_port_0_subnetpoolid: type: string required: true + port_pcm_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -149,6 +159,12 @@ topology_template: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_1_subnetpoolid + related_networks: + get_input: port_pcm_port_1_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_port_1_ip_requirements security_groups: @@ -158,8 +174,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid mac_requirements: get_input: port_pcm_port_1_mac_requirements subinterface_indicator: false @@ -169,8 +183,6 @@ topology_template: get_input: port_pcm_port_1_vlan_requirements network_role_tag: get_input: port_pcm_port_1_network_role_tag - network: - get_input: oam_net_name order: get_input: port_pcm_port_1_order requirements: @@ -194,6 +206,12 @@ topology_template: pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_0_subnetpoolid + related_networks: + get_input: port_pcm_port_0_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_0_ip_requirements security_groups: @@ -203,8 +221,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid mac_requirements: get_input: port_pcm_port_0_mac_requirements subinterface_indicator: false @@ -214,8 +230,6 @@ topology_template: get_input: port_pcm_port_0_vlan_requirements network_role_tag: get_input: port_pcm_port_0_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_port_0_order requirements: @@ -453,4 +467,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - 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/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 76ab120c93..b8e0c1ed42 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -23,6 +23,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_1port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments pcm_image_name: type: string description: PCRF CM image name @@ -82,6 +88,12 @@ node_types: description: CPS network gateway required: true status: SUPPORTED + port_pcm_2port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_1port_0_network_role: type: string required: true @@ -876,4 +888,4 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ 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/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml index 6e4407c1de..f31ab49523 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithOneComputeDiffPortType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -25,6 +25,11 @@ topology_template: port_pcm_1port_0_network_role_tag: type: string required: true + port_pcm_1port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments pcm_image_name: label: image name hidden: false @@ -81,6 +86,11 @@ topology_template: immutable: false type: string description: CPS network gateway + port_pcm_2port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_1port_0_network_role: type: string required: true @@ -162,6 +172,12 @@ topology_template: pcm_1port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_1port_0_subnetpoolid + related_networks: + get_input: port_pcm_1port_0_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_1port_0_ip_requirements security_groups: @@ -171,8 +187,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_1port_0_subnetpoolid mac_requirements: get_input: port_pcm_1port_0_mac_requirements subinterface_indicator: false @@ -182,8 +196,6 @@ topology_template: get_input: port_pcm_1port_0_vlan_requirements network_role_tag: get_input: port_pcm_1port_0_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_1port_0_order requirements: @@ -194,6 +206,12 @@ topology_template: pcm_2port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_2port_1_subnetpoolid + related_networks: + get_input: port_pcm_2port_1_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_2port_1_ip_requirements security_groups: @@ -203,8 +221,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_2port_1_subnetpoolid mac_requirements: get_input: port_pcm_2port_1_mac_requirements subinterface_indicator: false @@ -214,8 +230,6 @@ topology_template: get_input: port_pcm_2port_1_vlan_requirements network_role_tag: get_input: port_pcm_2port_1_network_role_tag - network: - get_input: oam_net_name order: get_input: port_pcm_2port_1_order requirements: @@ -453,4 +467,4 @@ topology_template: - dependency link_pcm_2port_1: - pcm_2port_1 - - link + - link
\ 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/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml index d9bdb0048d..6676af82c3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1497,4 +1503,4 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ 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/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml index 692fdc2d96..0e7c780c5d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoComputesOfSameType/out/Nested_pcm_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pcm_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -129,6 +134,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_pcm_port_ip_requirements + related_networks: + get_input: port_pcm_port_related_networks network_role_tag: get_input: port_pcm_port_network_role_tag network_role: @@ -322,4 +329,4 @@ topology_template: - local_storage dependency_pcm_server: - pcm_server - - 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/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml index 30b8f79f0c..438512f5e8 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.pd_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -447,6 +453,12 @@ node_types: org.openecomp.resource.abstract.nodes.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_port_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -1656,4 +1668,4 @@ node_types: type: tosca.capabilities.OperatingSystem occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ 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/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml index 692fdc2d96..0e7c780c5d 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pcm_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pcm_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -129,6 +134,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_pcm_port_ip_requirements + related_networks: + get_input: port_pcm_port_related_networks network_role_tag: get_input: port_pcm_port_network_role_tag network_role: @@ -322,4 +329,4 @@ topology_template: - local_storage dependency_pcm_server: - pcm_server - - 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/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml index 6b122e7e5e..33fc4138da 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/nestedWithTwoDiffComputeTypes/out/Nested_pd_serverServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pcm_port_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments index_value: type: integer description: Index value of this substitution service template runtime instance @@ -129,6 +134,8 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_pcm_port_ip_requirements + related_networks: + get_input: port_pcm_port_related_networks network_role_tag: get_input: port_pcm_port_network_role_tag network_role: @@ -322,4 +329,4 @@ topology_template: - link dependency_pd_server_pcm_port: - pd_server_pcm_port - - 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/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index bc682ab7b5..3ad4ddf56f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -12,6 +12,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_11_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments availabilityzone_name: type: string description: availabilityzone name @@ -80,6 +86,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_01_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments security_group_name: type: string description: the name of security group @@ -617,6 +629,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_12_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_12_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -706,6 +724,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_02_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_12_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -1150,6 +1174,12 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -1182,6 +1212,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -1717,4 +1753,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ 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/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml index 0a53c42257..007653707e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pcm_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -40,6 +45,11 @@ topology_template: port_pcm_port_0_subnetpoolid: type: string required: true + port_pcm_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -149,6 +159,12 @@ topology_template: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_1_subnetpoolid + related_networks: + get_input: port_pcm_port_1_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_port_1_ip_requirements security_groups: @@ -158,8 +174,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid mac_requirements: get_input: port_pcm_port_1_mac_requirements subinterface_indicator: false @@ -169,8 +183,6 @@ topology_template: get_input: port_pcm_port_1_vlan_requirements network_role_tag: get_input: port_pcm_port_1_network_role_tag - network: - get_input: oam_net_name order: get_input: port_pcm_port_1_order requirements: @@ -194,6 +206,12 @@ topology_template: pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_0_subnetpoolid + related_networks: + get_input: port_pcm_port_0_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_0_ip_requirements security_groups: @@ -203,8 +221,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid mac_requirements: get_input: port_pcm_port_0_mac_requirements subinterface_indicator: false @@ -214,8 +230,6 @@ topology_template: get_input: port_pcm_port_0_vlan_requirements network_role_tag: get_input: port_pcm_port_0_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_port_0_order requirements: @@ -453,4 +467,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - 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/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml index c76abdd78d..3e8eddce92 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.2ServiceTemplate.yaml @@ -14,6 +14,11 @@ topology_template: port_pcm_port_11_network_role_tag: type: string required: true + port_pcm_port_11_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments availabilityzone_name: label: availabilityzone name hidden: false @@ -80,6 +85,11 @@ topology_template: port_pcm_port_11_network_role: type: string required: true + port_pcm_port_01_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments security_group_name: label: security group name hidden: false @@ -149,6 +159,12 @@ topology_template: pcm_port_11: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_11_subnetpoolid + related_networks: + get_input: port_pcm_port_11_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_port_11_ip_requirements security_groups: @@ -158,8 +174,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_11_subnetpoolid mac_requirements: get_input: port_pcm_port_11_mac_requirements subinterface_indicator: false @@ -169,8 +183,6 @@ topology_template: get_input: port_pcm_port_11_vlan_requirements network_role_tag: get_input: port_pcm_port_11_network_role_tag - network: - get_input: oam_net_name order: get_input: port_pcm_port_11_order requirements: @@ -181,6 +193,12 @@ topology_template: pcm_port_01: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_01_subnetpoolid + related_networks: + get_input: port_pcm_port_01_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_01_ip_requirements security_groups: @@ -190,8 +208,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_01_subnetpoolid mac_requirements: get_input: port_pcm_port_01_mac_requirements subinterface_indicator: false @@ -201,8 +217,6 @@ topology_template: get_input: port_pcm_port_01_vlan_requirements network_role_tag: get_input: port_pcm_port_01_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_port_01_order requirements: @@ -453,4 +467,4 @@ topology_template: - link local_storage_server_pcm_1: - server_pcm_1 - - local_storage + - local_storage
\ 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/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml index 1026374596..856c876f3f 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedPointingToThreeDiffNestedFilesSameComputeType/out/nested-pcm_v0.3ServiceTemplate.yaml @@ -45,6 +45,11 @@ topology_template: port_pcm_port_02_network_role_tag: type: string required: true + port_pcm_port_12_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_12_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true @@ -137,6 +142,11 @@ topology_template: port_pcm_port_12_network_role_tag: type: string required: true + port_pcm_port_02_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_12_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -149,6 +159,12 @@ topology_template: pcm_port_12: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_12_subnetpoolid + related_networks: + get_input: port_pcm_port_12_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_port_12_ip_requirements security_groups: @@ -158,8 +174,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_12_subnetpoolid mac_requirements: get_input: port_pcm_port_12_mac_requirements subinterface_indicator: false @@ -169,8 +183,6 @@ topology_template: get_input: port_pcm_port_12_vlan_requirements network_role_tag: get_input: port_pcm_port_12_network_role_tag - network: - get_input: oam_net_name order: get_input: port_pcm_port_12_order requirements: @@ -181,6 +193,12 @@ topology_template: pcm_port_02: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_02_subnetpoolid + related_networks: + get_input: port_pcm_port_02_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_02_ip_requirements security_groups: @@ -190,8 +208,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_02_subnetpoolid mac_requirements: get_input: port_pcm_port_02_mac_requirements subinterface_indicator: false @@ -201,8 +217,6 @@ topology_template: get_input: port_pcm_port_02_vlan_requirements network_role_tag: get_input: port_pcm_port_02_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_port_02_order requirements: @@ -453,4 +467,4 @@ topology_template: - link local_storage_server_pcm_2: - server_pcm_2 - - local_storage + - local_storage
\ 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/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml index 7268317fcc..a3e7eb439c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -12,6 +12,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_11_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments availabilityzone_name: type: string description: availabilityzone name @@ -80,6 +86,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_01_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments security_group_name: type: string description: the name of security group @@ -579,6 +591,12 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server_2: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -611,6 +629,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -1154,6 +1178,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_11_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments availabilityzone_name: type: string description: availabilityzone name @@ -1222,6 +1252,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_01_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments security_group_name: type: string description: the name of security group @@ -1717,4 +1753,4 @@ node_types: description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer. occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ 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/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml index bdeda3459d..de90d92355 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -14,6 +14,11 @@ topology_template: port_pcm_port_11_network_role_tag: type: string required: true + port_pcm_port_11_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments availabilityzone_name: label: availabilityzone name hidden: false @@ -80,6 +85,11 @@ topology_template: port_pcm_port_11_network_role: type: string required: true + port_pcm_port_01_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments security_group_name: label: security group name hidden: false @@ -149,6 +159,12 @@ topology_template: pcm_port_11: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_11_subnetpoolid + related_networks: + get_input: port_pcm_port_11_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_port_11_ip_requirements security_groups: @@ -158,8 +174,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_11_subnetpoolid mac_requirements: get_input: port_pcm_port_11_mac_requirements subinterface_indicator: false @@ -169,8 +183,6 @@ topology_template: get_input: port_pcm_port_11_vlan_requirements network_role_tag: get_input: port_pcm_port_11_network_role_tag - network: - get_input: oam_net_name order: get_input: port_pcm_port_11_order requirements: @@ -181,6 +193,12 @@ topology_template: pcm_port_01: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_01_subnetpoolid + related_networks: + get_input: port_pcm_port_01_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_01_ip_requirements security_groups: @@ -190,8 +208,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_01_subnetpoolid mac_requirements: get_input: port_pcm_port_01_mac_requirements subinterface_indicator: false @@ -201,8 +217,6 @@ topology_template: get_input: port_pcm_port_01_vlan_requirements network_role_tag: get_input: port_pcm_port_01_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_port_01_order requirements: @@ -453,4 +467,4 @@ topology_template: - link local_storage_server_pcm_1: - server_pcm_1 - - local_storage + - local_storage
\ 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/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml index efe9830fe7..f70040d72c 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/threeNestedSameTypeTwoPointingOnSameNestedFile/out/nested-pcm_v0.2ServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pcm_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -40,6 +45,11 @@ topology_template: port_pcm_port_0_subnetpoolid: type: string required: true + port_pcm_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -149,6 +159,12 @@ topology_template: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_1_subnetpoolid + related_networks: + get_input: port_pcm_port_1_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_port_1_ip_requirements security_groups: @@ -158,8 +174,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid mac_requirements: get_input: port_pcm_port_1_mac_requirements subinterface_indicator: false @@ -169,8 +183,6 @@ topology_template: get_input: port_pcm_port_1_vlan_requirements network_role_tag: get_input: port_pcm_port_1_network_role_tag - network: - get_input: oam_net_name order: get_input: port_pcm_port_1_order requirements: @@ -194,6 +206,12 @@ topology_template: pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_0_subnetpoolid + related_networks: + get_input: port_pcm_port_0_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_0_ip_requirements security_groups: @@ -203,8 +221,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid mac_requirements: get_input: port_pcm_port_0_mac_requirements subinterface_indicator: false @@ -214,8 +230,6 @@ topology_template: get_input: port_pcm_port_0_vlan_requirements network_role_tag: get_input: port_pcm_port_0_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_port_0_order requirements: @@ -453,4 +467,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - 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/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml index 3a0a107c2b..81a73531c1 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/GlobalSubstitutionTypesServiceTemplate.yaml @@ -8,6 +8,12 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -40,6 +46,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -579,6 +591,12 @@ node_types: org.openecomp.resource.abstract.nodes.heat.pcm_server_1: derived_from: org.openecomp.resource.abstract.nodes.VFC properties: + port_pcm_port_1_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -611,6 +629,12 @@ node_types: type: string required: true status: SUPPORTED + port_pcm_port_0_related_networks: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -1441,4 +1465,4 @@ node_types: type: tosca.capabilities.network.Bindable occurrences: - 1 - - UNBOUNDED + - UNBOUNDED
\ 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/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml index 1e7caa5fd8..1c527e6c36 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/twoNestedNodeTemplatesWithSameComputeType/out/nested-pcm_v0.1ServiceTemplate.yaml @@ -11,6 +11,11 @@ node_types: derived_from: org.openecomp.resource.vfc.nodes.heat.nova.Server topology_template: inputs: + port_pcm_port_1_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_0_network_role: type: string required: true @@ -40,6 +45,11 @@ topology_template: port_pcm_port_0_subnetpoolid: type: string required: true + port_pcm_port_0_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_pcm_port_1_subnetpoolid: type: string required: true @@ -149,6 +159,12 @@ topology_template: pcm_port_1: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_1_subnetpoolid + related_networks: + get_input: port_pcm_port_1_related_networks + network: + get_input: oam_net_name ip_requirements: get_input: port_pcm_port_1_ip_requirements security_groups: @@ -158,8 +174,6 @@ topology_template: fixed_ips: - ip_address: get_input: oam_net_ip - subnetpoolid: - get_input: port_pcm_port_1_subnetpoolid mac_requirements: get_input: port_pcm_port_1_mac_requirements subinterface_indicator: false @@ -169,8 +183,6 @@ topology_template: get_input: port_pcm_port_1_vlan_requirements network_role_tag: get_input: port_pcm_port_1_network_role_tag - network: - get_input: oam_net_name order: get_input: port_pcm_port_1_order requirements: @@ -194,6 +206,12 @@ topology_template: pcm_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_pcm_port_0_subnetpoolid + related_networks: + get_input: port_pcm_port_0_related_networks + network: + get_input: cps_net_name ip_requirements: get_input: port_pcm_port_0_ip_requirements security_groups: @@ -203,8 +221,6 @@ topology_template: fixed_ips: - ip_address: get_input: cps_net_ip - subnetpoolid: - get_input: port_pcm_port_0_subnetpoolid mac_requirements: get_input: port_pcm_port_0_mac_requirements subinterface_indicator: false @@ -214,8 +230,6 @@ topology_template: get_input: port_pcm_port_0_vlan_requirements network_role_tag: get_input: port_pcm_port_0_network_role_tag - network: - get_input: cps_net_name order: get_input: port_pcm_port_0_order requirements: @@ -453,4 +467,4 @@ topology_template: - dependency dependency_pcm_port_1: - pcm_port_1 - - dependency + - dependency
\ No newline at end of file |