diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/nestedSingleCompute/duplicateReqs')
13 files changed, 425 insertions, 838 deletions
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 3735042d2d..258642ea2d 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 @@ -128,24 +128,12 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cdi_ims_core_0_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean compute_cdi_config_drive: type: list required: true status: SUPPORTED entry_schema: type: boolean - port_cdi_internal_0_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -633,6 +621,12 @@ 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 @@ -645,6 +639,12 @@ 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,6 +657,22 @@ 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 @@ -687,16 +703,26 @@ node_types: type: integer required: true status: SUPPORTED - vm_image_name: - type: string + port_lbd_internal_1_port_ip_requirements: + type: list required: true status: SUPPORTED - port_lbd_dpdk_1_port_subinterface_indicator: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_1_port_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: boolean + type: json + port_lbd_ims_core_1_port_subnetpoolid: + type: string + required: true + status: SUPPORTED + vm_image_name: + type: string + required: true + status: SUPPORTED port_lbd_dpdk_1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -725,92 +751,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_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_ims_core_1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean - 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_subnetpoolid: type: string required: true @@ -851,6 +791,18 @@ 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 @@ -863,6 +815,16 @@ 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 @@ -879,18 +841,26 @@ 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 - port_lbd_internal_1_port_subinterface_indicator: + compute_lbd_name: type: list required: true status: SUPPORTED entry_schema: - type: boolean + type: string + port_lbd_ims_core_1_port_network_role_tag: + type: string + required: true + status: SUPPORTED port_lbd_dpdk_1_port_network_role: type: string required: true @@ -1442,12 +1412,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam_oam_1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_oam_oam_1_port_network_role_tag: type: string required: true @@ -1568,12 +1532,6 @@ node_types: status: SUPPORTED entry_schema: type: json - port_oam_internal_1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean compute_oam_availability_zone: type: list required: true @@ -2037,12 +1995,6 @@ node_types: type: string required: true status: SUPPORTED - port_oam_oam_2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_oam_oam_2_port_security_groups: type: list required: true @@ -2141,12 +2093,6 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_oam_internal_2_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -3344,12 +3290,6 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cdi_ims_core_1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean vm_image_name: type: string required: true @@ -3484,12 +3424,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cdi_internal_1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean compute_cdi_metadata: type: list required: true @@ -3947,6 +3881,18 @@ 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 @@ -3959,10 +3905,22 @@ node_types: type: string required: true status: SUPPORTED + port_lbd_internal_0_port_security_groups: + type: list + required: true + status: SUPPORTED + entry_schema: + type: json 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 @@ -3979,226 +3937,184 @@ node_types: type: string required: true status: SUPPORTED + port_lbd_dpdk_0_port_vlan_requirements: + type: list + required: true + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.network.VlanRequirements vm_image_name: type: string required: true status: SUPPORTED - port_lbd_dpdk_0_port_ip_requirements: + port_lbd_dpdk_0_port_name: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_0_port_order: - type: integer + type: string + port_lbd_internal_0_port_subnetpoolid: + type: string required: true status: SUPPORTED - port_lbd_ims_core_0_port_network: + port_lbd_dpdk_0_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_ims_core_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_ims_core_0_port_order: + type: integer required: true status: SUPPORTED - port_lbd_ims_core_0_port_allowed_address_pairs: - type: list + port_lbd_ims_core_0_port_network_role: + type: string required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.heat.network.AddressPair - port_lbd_internal_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_subinterface_indicator: + port_lbd_dpdk_0_port_network: type: list required: true status: SUPPORTED entry_schema: - type: boolean - port_lbd_ims_core_0_port_network_role_tag: + type: string + port_lbd_dpdk_0_port_network_role_tag: type: string required: true status: SUPPORTED - compute_lbd_scheduler_hints: - type: list - required: true - status: SUPPORTED - entry_schema: - type: json - port_lbd_internal_0_port_mac_requirements: + port_lbd_ims_core_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_lbd_dpdk_0_port_order: - type: integer - required: true - status: SUPPORTED - port_lbd_ims_core_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_subinterface_indicator: + type: org.openecomp.datatypes.heat.network.AddressPair + port_lbd_internal_0_port_name: type: list required: true status: SUPPORTED entry_schema: - type: boolean - port_lbd_internal_0_port_network: - type: list + type: string + port_lbd_internal_0_port_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: string - port_lbd_dpdk_0_port_mac_requirements: - type: org.openecomp.datatypes.network.MacRequirements + port_lbd_dpdk_0_port_network_role: + type: string required: true status: SUPPORTED - compute_lbd_name: + port_lbd_ims_core_0_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_ims_core_0_port_security_groups: - type: list + type: org.openecomp.datatypes.network.VlanRequirements + port_lbd_ims_core_0_port_subnetpoolid: + type: string required: true status: SUPPORTED - entry_schema: - type: json - port_lbd_ims_core_0_port_name: - type: list + 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 required: true status: SUPPORTED - entry_schema: - type: string - port_lbd_internal_0_port_vlan_requirements: + compute_lbd_scheduler_hints: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - compute_lbd_config_drive: - type: list + type: json + port_lbd_internal_0_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - entry_schema: - type: boolean - port_lbd_dpdk_0_port_fixed_ips: + port_lbd_ims_core_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_security_groups: - type: list + port_lbd_dpdk_0_port_order: + type: integer required: true status: SUPPORTED - entry_schema: - type: json - port_lbd_dpdk_0_port_security_groups: + port_lbd_ims_core_0_port_ip_requirements: type: list required: true status: SUPPORTED entry_schema: - type: json - port_lbd_dpdk_0_port_vlan_requirements: - type: list + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_ims_core_0_port_exCP_naming: + type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - entry_schema: - type: org.openecomp.datatypes.network.VlanRequirements - port_lbd_dpdk_0_port_name: + port_lbd_internal_0_port_fixed_ips: type: list required: true status: SUPPORTED entry_schema: - type: string - port_lbd_internal_0_port_subnetpoolid: - type: string - required: true - status: SUPPORTED - port_lbd_ims_core_0_port_network_role: - type: string - required: true - status: SUPPORTED - port_lbd_dpdk_0_port_network: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + port_lbd_internal_0_port_network: type: list required: true status: SUPPORTED entry_schema: type: string - port_lbd_dpdk_0_port_network_role_tag: - type: string + port_lbd_dpdk_0_port_mac_requirements: + type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_lbd_dpdk_0_port_subinterface_indicator: + compute_lbd_metadata: type: list required: true status: SUPPORTED entry_schema: - type: boolean - 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: json + compute_lbd_name: type: list required: true status: SUPPORTED entry_schema: - 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: string + port_lbd_internal_0_port_ip_requirements: type: list required: true status: SUPPORTED 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 - status: SUPPORTED - port_lbd_internal_0_port_fixed_ips: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_ims_core_0_port_security_groups: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.heat.neutron.port.FixedIps - compute_lbd_metadata: + type: json + port_lbd_ims_core_0_port_name: type: list required: true status: SUPPORTED entry_schema: - type: json - port_lbd_internal_0_port_ip_requirements: + type: string + port_lbd_internal_0_port_vlan_requirements: type: list required: true status: SUPPORTED entry_schema: - type: org.openecomp.datatypes.network.IpRequirements + type: org.openecomp.datatypes.network.VlanRequirements requirements: - dependency_lbd_lbd_ims_core_0_port: capability: tosca.capabilities.Node @@ -4748,22 +4664,10 @@ node_types: type: string required: true status: SUPPORTED - port_cif_internal_1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_cif_oam_1_port_3_subnetpoolid: type: string required: true status: SUPPORTED - port_cif_ims_core_1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean vm_image_name: type: string required: true @@ -4774,12 +4678,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cif_ims_li_1_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_cif_oam_1_port_3_allowed_address_pairs: type: list required: true @@ -4864,12 +4762,6 @@ node_types: type: string required: true status: SUPPORTED - port_cif_oam_1_port_1_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_cif_ims_core_1_port_order: type: integer required: true @@ -5084,12 +4976,6 @@ node_types: type: org.openecomp.datatypes.Naming required: true status: SUPPORTED - port_cif_oam_1_port_3_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_cif_oam_1_port_3_name: type: list required: true @@ -6343,12 +6229,6 @@ node_types: type: string required: true status: SUPPORTED - port_oam_internal_0_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_oam_oam_0_port_fixed_ips: type: list required: true @@ -6427,12 +6307,6 @@ node_types: status: SUPPORTED entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_oam_0_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_oam_oam_0_port_network_role_tag: type: string required: true @@ -7631,12 +7505,6 @@ node_types: status: SUPPORTED entry_schema: type: string - port_cif_oam_0_port_3_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_cif_oam_0_port_1_order: type: integer required: true @@ -7791,18 +7659,6 @@ node_types: type: integer required: true status: SUPPORTED - port_cif_ims_core_0_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean - port_cif_ims_li_0_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_cif_oam_0_port_3_security_groups: type: list required: true @@ -7819,12 +7675,6 @@ node_types: type: org.openecomp.datatypes.network.MacRequirements required: true status: SUPPORTED - port_cif_oam_0_port_1_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_cif_oam_0_port_1_network: type: list required: true @@ -7901,12 +7751,6 @@ node_types: type: string required: true status: SUPPORTED - port_cif_internal_0_port_subinterface_indicator: - type: list - required: true - status: SUPPORTED - entry_schema: - type: boolean port_cif_internal_0_port_network_role_tag: type: string required: true 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 6c1b8e5c95..c3d07be8f3 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 @@ -2084,8 +2084,6 @@ topology_template: port_cdi_ims_core_1_port_mac_requirements: mac_count_required: is_required: false - port_cdi_ims_core_1_port_subinterface_indicator: - - false vm_image_name: get_input: cdi_image_name compute_cdi_scheduler_hints: @@ -2155,8 +2153,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - port_cdi_internal_1_port_subinterface_indicator: - - false compute_cdi_metadata: - vf_module_id: get_input: vf_module_id @@ -2508,6 +2504,8 @@ 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 @@ -2521,6 +2519,15 @@ 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: @@ -2528,10 +2535,16 @@ 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_subinterface_indicator: - - false port_lbd_dpdk_1_port_network: - cscf_internal_dpdk_network_0 port_lbd_ims_core_1_port_name: @@ -2542,45 +2555,6 @@ topology_template: get_input: lbd_name_1 $DEL: get_input: vcscf_name_delimeter - compute_lbd_scheduler_hints: - - group: lbd_server_group_group - port_lbd_dpdk_1_port_name: - - str_replace: - template: $PREFIX$DELeth1 - params: - $PREFIX: - 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_ims_core_1_port_subinterface_indicator: - - 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: @@ -2591,11 +2565,23 @@ topology_template: 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: + - str_replace: + template: $PREFIX$DELeth1 + params: + $PREFIX: + get_input: lbd_name_1 + $DEL: + get_input: vcscf_name_delimeter 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: @@ -2612,8 +2598,12 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_lbd_internal_1_port_subinterface_indicator: - - false + 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 @@ -2851,12 +2841,8 @@ topology_template: get_input: cdi_internal_ip_0 - ip_address: get_input: cdi_internal_v6_ip_0 - port_cdi_ims_core_0_port_subinterface_indicator: - - false compute_cdi_config_drive: - true - port_cdi_internal_0_port_subinterface_indicator: - - false port_cdi_internal_0_port_security_groups: - - cscf_RSG port_cdi_ims_core_0_port_security_groups: @@ -2946,8 +2932,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - port_oam_oam_1_port_subinterface_indicator: - - false port_oam_oam_1_port_network_role_tag: oam port_oam_oam_1_port_security_groups: - - cscf_RSG @@ -2996,8 +2980,6 @@ topology_template: get_input: vcscf_name_delimeter compute_oam_scheduler_hints: - group: oam_server_group_group - port_oam_internal_1_port_subinterface_indicator: - - false compute_oam_availability_zone: - get_input: availability_zone_1 compute_oam_metadata: @@ -3041,8 +3023,6 @@ topology_template: - substitutable properties: port_oam_oam_2_port_network_role_tag: oam - port_oam_oam_2_port_subinterface_indicator: - - false port_oam_oam_2_port_security_groups: - - cscf_RSG port_oam_oam_2_port_name: @@ -3086,8 +3066,6 @@ topology_template: port_oam_oam_2_port_mac_requirements: mac_count_required: is_required: false - port_oam_internal_2_port_subinterface_indicator: - - false port_oam_oam_2_port_network: - get_input: oam_net_id compute_oam_user_data_format: @@ -3225,8 +3203,6 @@ topology_template: get_input: oam_name_0 $DEL: get_input: vcscf_name_delimeter - port_oam_internal_0_port_subinterface_indicator: - - false port_oam_oam_0_port_fixed_ips: - ip_address: get_input: oam_oam_ip_0 @@ -3263,8 +3239,6 @@ topology_template: port_oam_internal_0_port_fixed_ips: - ip_address: get_input: oam_internal_ip_0 - port_oam_oam_0_port_subinterface_indicator: - - false port_oam_oam_0_port_network_role_tag: oam compute_oam_user_data_format: - RAW @@ -3326,8 +3300,17 @@ 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: @@ -3337,6 +3320,14 @@ 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: @@ -3345,6 +3336,8 @@ 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 @@ -3359,66 +3352,29 @@ topology_template: get_input: lbd_name_0 $DEL: get_input: vcscf_name_delimeter - port_lbd_internal_0_port_subinterface_indicator: - - false port_lbd_ims_core_0_port_network_role_tag: ims_core compute_lbd_scheduler_hints: - group: lbd_server_group_group 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_ims_core_0_port_subinterface_indicator: - - 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_dpdk_0_port_subinterface_indicator: - - false - 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 @@ -3429,12 +3385,24 @@ 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 @@ -3665,8 +3633,6 @@ topology_template: get_input: cif_name_0 $DEL: get_input: vcscf_name_delimeter - port_cif_oam_0_port_3_subinterface_indicator: - - false vm_image_name: get_input: cif_image_name compute_cif_user_data_format: @@ -3724,10 +3690,6 @@ topology_template: get_input: vcscf_name_delimeter port_cif_internal_0_port_network: - cscf_internal_network_0 - port_cif_ims_core_0_port_subinterface_indicator: - - false - port_cif_ims_li_0_port_subinterface_indicator: - - false port_cif_oam_0_port_3_security_groups: - - cscf_RSG port_cif_ims_core_0_port_ip_requirements: @@ -3739,8 +3701,6 @@ topology_template: port_cif_ims_li_0_port_mac_requirements: mac_count_required: is_required: false - port_cif_oam_0_port_1_subinterface_indicator: - - false port_cif_oam_0_port_1_network: - get_input: oam_net_id port_cif_ims_li_0_port_security_groups: @@ -3763,8 +3723,6 @@ topology_template: port_cif_ims_li_0_port_allowed_address_pairs: - ip_address: get_input: cif_ims_li_v6_vip_0 - port_cif_internal_0_port_subinterface_indicator: - - false port_cif_internal_0_port_mac_requirements: mac_count_required: is_required: false @@ -3858,16 +3816,10 @@ topology_template: - get_input: oam_net_id vm_flavor_name: get_input: cif_flavor_name - port_cif_internal_1_port_subinterface_indicator: - - false - port_cif_ims_core_1_port_subinterface_indicator: - - false vm_image_name: get_input: cif_image_name compute_cif_user_data_format: - RAW - port_cif_ims_li_1_port_subinterface_indicator: - - false port_cif_oam_1_port_3_allowed_address_pairs: - ip_address: get_input: cif_oam_vip_1 @@ -3904,8 +3856,6 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name - port_cif_oam_1_port_1_subinterface_indicator: - - false port_cif_oam_1_port_1_fixed_ips: - ip_address: get_input: cif_oam_ip_1 @@ -4004,8 +3954,6 @@ topology_template: get_input: vcscf_name_delimeter compute_cif_config_drive: - true - port_cif_oam_1_port_3_subinterface_indicator: - - false port_cif_oam_1_port_3_name: - str_replace: template: $PREFIX$DELeth3 @@ -4209,4 +4157,4 @@ topology_template: get_input: vnf_name container_type: host targets: - - tdcore_zone_1_server_group_group
\ No newline at end of file + - tdcore_zone_1_server_group_group 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 ab4499b8d9..37354cf0a8 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 @@ -108,21 +108,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_cdi_ims_core_0_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean compute_cdi_config_drive: type: list required: true entry_schema: type: boolean - port_cdi_internal_0_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -188,10 +178,7 @@ topology_template: get_input: port_cdi_ims_core_0_port_exCP_naming vlan_requirements: get_input: port_cdi_ims_core_0_port_vlan_requirements - subinterface_indicator: - get_input: - - port_cdi_ims_core_0_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_cdi_ims_core_0_port_ip_requirements network_role_tag: @@ -265,10 +252,7 @@ topology_template: get_input: port_cdi_internal_0_port_exCP_naming vlan_requirements: get_input: port_cdi_internal_0_port_vlan_requirements - subinterface_indicator: - get_input: - - port_cdi_internal_0_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_cdi_internal_0_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 462ce4b069..1e5366896c 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 @@ -36,11 +36,6 @@ topology_template: port_cdi_ims_core_1_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_cdi_ims_core_1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean vm_image_name: type: string required: true @@ -151,11 +146,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_cdi_internal_1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean compute_cdi_metadata: type: list required: true @@ -188,10 +178,7 @@ topology_template: get_input: port_cdi_internal_1_port_exCP_naming vlan_requirements: get_input: port_cdi_internal_1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_cdi_internal_1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_cdi_internal_1_port_ip_requirements network_role_tag: @@ -265,10 +252,7 @@ topology_template: get_input: port_cdi_ims_core_1_port_exCP_naming vlan_requirements: get_input: port_cdi_ims_core_1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_cdi_ims_core_1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_cdi_ims_core_1_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 275a1ecb4d..4f95a1d7c5 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 @@ -42,11 +42,6 @@ topology_template: required: true entry_schema: type: string - port_cif_oam_0_port_3_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_cif_oam_0_port_1_order: type: integer required: true @@ -170,16 +165,6 @@ topology_template: port_cif_ims_core_0_port_order: type: integer required: true - port_cif_ims_core_0_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean - port_cif_ims_li_0_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_cif_oam_0_port_3_security_groups: type: list required: true @@ -193,11 +178,6 @@ topology_template: port_cif_ims_li_0_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_cif_oam_0_port_1_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_cif_oam_0_port_1_network: type: list required: true @@ -259,11 +239,6 @@ topology_template: port_cif_ims_core_0_port_subnetpoolid: type: string required: true - port_cif_internal_0_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_cif_internal_0_port_network_role_tag: type: string required: true @@ -393,10 +368,7 @@ topology_template: get_input: port_cif_internal_0_port_exCP_naming vlan_requirements: get_input: port_cif_internal_0_port_vlan_requirements - subinterface_indicator: - get_input: - - port_cif_internal_0_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_cif_internal_0_port_ip_requirements network_role_tag: @@ -439,10 +411,7 @@ topology_template: get_input: port_cif_ims_li_0_port_exCP_naming vlan_requirements: get_input: port_cif_ims_li_0_port_vlan_requirements - subinterface_indicator: - get_input: - - port_cif_ims_li_0_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_cif_ims_li_0_port_ip_requirements network_role_tag: @@ -485,10 +454,7 @@ topology_template: get_input: port_cif_ims_core_0_port_exCP_naming vlan_requirements: get_input: port_cif_ims_core_0_port_vlan_requirements - subinterface_indicator: - get_input: - - port_cif_ims_core_0_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_cif_ims_core_0_port_ip_requirements network_role_tag: @@ -531,10 +497,7 @@ topology_template: get_input: port_cif_oam_0_port_1_exCP_naming vlan_requirements: get_input: port_cif_oam_0_port_1_vlan_requirements - subinterface_indicator: - get_input: - - port_cif_oam_0_port_1_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_cif_oam_0_port_1_ip_requirements network_role_tag: @@ -577,10 +540,7 @@ topology_template: get_input: port_cif_oam_0_port_3_exCP_naming vlan_requirements: get_input: port_cif_oam_0_port_3_vlan_requirements - subinterface_indicator: - get_input: - - port_cif_oam_0_port_3_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_cif_oam_0_port_3_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 a2d95fddbc..0e02d6611d 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 @@ -40,19 +40,9 @@ topology_template: vm_flavor_name: type: string required: true - port_cif_internal_1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_cif_oam_1_port_3_subnetpoolid: type: string required: true - port_cif_ims_core_1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean vm_image_name: type: string required: true @@ -61,11 +51,6 @@ topology_template: required: true entry_schema: type: string - port_cif_ims_li_1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_cif_oam_1_port_3_allowed_address_pairs: type: list required: true @@ -134,11 +119,6 @@ topology_template: port_cif_ims_li_1_port_network_role: type: string required: true - port_cif_oam_1_port_1_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_cif_ims_core_1_port_order: type: integer required: true @@ -312,11 +292,6 @@ topology_template: port_cif_oam_1_port_3_exCP_naming: type: org.openecomp.datatypes.Naming required: true - port_cif_oam_1_port_3_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_cif_oam_1_port_3_name: type: list required: true @@ -393,10 +368,7 @@ topology_template: get_input: port_cif_ims_li_1_port_exCP_naming vlan_requirements: get_input: port_cif_ims_li_1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_cif_ims_li_1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_cif_ims_li_1_port_ip_requirements network_role_tag: @@ -439,10 +411,7 @@ topology_template: get_input: port_cif_internal_1_port_exCP_naming vlan_requirements: get_input: port_cif_internal_1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_cif_internal_1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_cif_internal_1_port_ip_requirements network_role_tag: @@ -485,10 +454,7 @@ topology_template: get_input: port_cif_oam_1_port_1_exCP_naming vlan_requirements: get_input: port_cif_oam_1_port_1_vlan_requirements - subinterface_indicator: - get_input: - - port_cif_oam_1_port_1_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_cif_oam_1_port_1_ip_requirements network_role_tag: @@ -531,10 +497,7 @@ topology_template: get_input: port_cif_ims_core_1_port_exCP_naming vlan_requirements: get_input: port_cif_ims_core_1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_cif_ims_core_1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_cif_ims_core_1_port_ip_requirements network_role_tag: @@ -577,10 +540,7 @@ topology_template: get_input: port_cif_oam_1_port_3_exCP_naming vlan_requirements: get_input: port_cif_oam_1_port_3_vlan_requirements - subinterface_indicator: - get_input: - - port_cif_oam_1_port_3_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_cif_oam_1_port_3_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 34628a22a5..40d031a7ef 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,6 +11,11 @@ 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 @@ -21,6 +26,11 @@ 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 @@ -31,6 +41,19 @@ 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 @@ -54,14 +77,22 @@ topology_template: port_lbd_internal_1_port_order: type: integer required: true - vm_image_name: - type: string + port_lbd_internal_1_port_ip_requirements: + type: list required: true - port_lbd_dpdk_1_port_subinterface_indicator: + entry_schema: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_internal_1_port_security_groups: type: list required: true entry_schema: - type: boolean + type: json + port_lbd_ims_core_1_port_subnetpoolid: + type: string + required: true + vm_image_name: + type: string + required: true port_lbd_dpdk_1_port_exCP_naming: type: org.openecomp.datatypes.Naming required: true @@ -84,76 +115,6 @@ topology_template: port_lbd_ims_core_1_port_network_role: 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_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_ims_core_1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean - 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_subnetpoolid: type: string required: true @@ -187,6 +148,16 @@ 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 @@ -197,6 +168,14 @@ 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 @@ -210,16 +189,22 @@ 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 - port_lbd_internal_1_port_subinterface_indicator: + compute_lbd_name: type: list required: true entry_schema: - type: boolean + type: string + port_lbd_ims_core_1_port_network_role_tag: + type: string + required: true port_lbd_dpdk_1_port_network_role: type: string required: true @@ -241,10 +226,7 @@ topology_template: get_input: port_lbd_ims_core_1_port_exCP_naming vlan_requirements: get_input: port_lbd_ims_core_1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_lbd_ims_core_1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_lbd_ims_core_1_port_ip_requirements network_role_tag: @@ -287,10 +269,7 @@ topology_template: get_input: port_lbd_dpdk_1_port_exCP_naming vlan_requirements: get_input: port_lbd_dpdk_1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_lbd_dpdk_1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_lbd_dpdk_1_port_ip_requirements network_role_tag: @@ -331,22 +310,19 @@ topology_template: get_input: port_lbd_internal_1_port_exCP_naming vlan_requirements: get_input: port_lbd_internal_1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_lbd_internal_1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_lbd_internal_1_port_ip_requirements network_role_tag: get_input: port_lbd_internal_1_port_network_role_tag network_role: get_input: port_lbd_internal_1_port_network_role - subnetpoolid: - get_input: port_lbd_internal_1_port_subnetpoolid fixed_ips: get_input: - port_lbd_internal_1_port_fixed_ips - index_value + subnetpoolid: + get_input: port_lbd_internal_1_port_subnetpoolid name: get_input: - port_lbd_internal_1_port_name 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 15b0d89cd5..6cf9d097ad 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,6 +19,16 @@ 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 @@ -28,9 +38,19 @@ topology_template: port_lbd_internal_0_port_network_role: type: string required: true + port_lbd_internal_0_port_security_groups: + type: list + required: true + entry_schema: + type: json 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 @@ -44,9 +64,22 @@ 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 @@ -55,11 +88,22 @@ 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 @@ -73,11 +117,27 @@ topology_template: required: true entry_schema: type: string - port_lbd_internal_0_port_subinterface_indicator: + 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: boolean + 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 @@ -89,6 +149,11 @@ 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 @@ -97,11 +162,14 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_lbd_ims_core_0_port_subinterface_indicator: + 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: boolean + type: org.openecomp.datatypes.heat.neutron.port.FixedIps port_lbd_internal_0_port_network: type: list required: true @@ -110,119 +178,36 @@ topology_template: port_lbd_dpdk_0_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_0_port_security_groups: + compute_lbd_metadata: type: list required: true entry_schema: type: json - port_lbd_ims_core_0_port_name: + compute_lbd_name: type: list required: true entry_schema: type: string - port_lbd_internal_0_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_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: + port_lbd_internal_0_port_ip_requirements: type: list required: true entry_schema: - type: json - port_lbd_dpdk_0_port_security_groups: + type: org.openecomp.datatypes.network.IpRequirements + port_lbd_ims_core_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_subnetpoolid: - type: string - required: true - port_lbd_ims_core_0_port_network_role: - type: string - required: true - port_lbd_dpdk_0_port_network: + port_lbd_ims_core_0_port_name: type: list required: true entry_schema: type: string - port_lbd_dpdk_0_port_network_role_tag: - type: string - required: true - port_lbd_dpdk_0_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean - 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: + port_lbd_internal_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 @@ -241,10 +226,7 @@ topology_template: get_input: port_lbd_ims_core_0_port_exCP_naming vlan_requirements: get_input: port_lbd_ims_core_0_port_vlan_requirements - subinterface_indicator: - get_input: - - port_lbd_ims_core_0_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_lbd_ims_core_0_port_ip_requirements network_role_tag: @@ -287,10 +269,7 @@ topology_template: get_input: port_lbd_dpdk_0_port_exCP_naming vlan_requirements: get_input: port_lbd_dpdk_0_port_vlan_requirements - subinterface_indicator: - get_input: - - port_lbd_dpdk_0_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_lbd_dpdk_0_port_ip_requirements network_role_tag: @@ -331,22 +310,19 @@ topology_template: get_input: port_lbd_internal_0_port_exCP_naming vlan_requirements: get_input: port_lbd_internal_0_port_vlan_requirements - subinterface_indicator: - get_input: - - port_lbd_internal_0_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_lbd_internal_0_port_ip_requirements network_role_tag: get_input: port_lbd_internal_0_port_network_role_tag network_role: get_input: port_lbd_internal_0_port_network_role - subnetpoolid: - get_input: port_lbd_internal_0_port_subnetpoolid fixed_ips: get_input: - port_lbd_internal_0_port_fixed_ips - index_value + subnetpoolid: + get_input: port_lbd_internal_0_port_subnetpoolid name: get_input: - port_lbd_internal_0_port_name 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 1448429d91..342b6795fc 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 @@ -22,11 +22,6 @@ topology_template: port_oam_internal_0_port_subnetpoolid: type: string required: true - port_oam_internal_0_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_oam_oam_0_port_fixed_ips: type: list required: true @@ -90,11 +85,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.heat.neutron.port.FixedIps - port_oam_oam_0_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_oam_oam_0_port_network_role_tag: type: string required: true @@ -188,10 +178,7 @@ topology_template: get_input: port_oam_oam_0_port_exCP_naming vlan_requirements: get_input: port_oam_oam_0_port_vlan_requirements - subinterface_indicator: - get_input: - - port_oam_oam_0_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_oam_oam_0_port_ip_requirements network_role_tag: @@ -234,10 +221,7 @@ topology_template: get_input: port_oam_internal_0_port_exCP_naming vlan_requirements: get_input: port_oam_internal_0_port_vlan_requirements - subinterface_indicator: - get_input: - - port_oam_internal_0_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_oam_internal_0_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 08a7d58f36..1c727e5b8f 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 @@ -38,11 +38,6 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.IpRequirements - port_oam_oam_1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_oam_oam_1_port_network_role_tag: type: string required: true @@ -141,11 +136,6 @@ topology_template: required: true entry_schema: type: json - port_oam_internal_1_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean compute_oam_availability_zone: type: list required: true @@ -188,10 +178,7 @@ topology_template: get_input: port_oam_internal_1_port_exCP_naming vlan_requirements: get_input: port_oam_internal_1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_oam_internal_1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_oam_internal_1_port_ip_requirements network_role_tag: @@ -234,10 +221,7 @@ topology_template: get_input: port_oam_oam_1_port_exCP_naming vlan_requirements: get_input: port_oam_oam_1_port_vlan_requirements - subinterface_indicator: - get_input: - - port_oam_oam_1_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_oam_oam_1_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 2b4a83915e..6d835ea8fb 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,11 +14,6 @@ topology_template: port_oam_oam_2_port_network_role_tag: type: string required: true - port_oam_oam_2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean port_oam_oam_2_port_security_groups: type: list required: true @@ -97,11 +92,6 @@ topology_template: port_oam_oam_2_port_mac_requirements: type: org.openecomp.datatypes.network.MacRequirements required: true - port_oam_internal_2_port_subinterface_indicator: - type: list - required: true - entry_schema: - type: boolean index_value: type: integer description: Index value of this substitution service template runtime instance @@ -188,10 +178,7 @@ topology_template: get_input: port_oam_internal_2_port_exCP_naming vlan_requirements: get_input: port_oam_internal_2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_oam_internal_2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_oam_internal_2_port_ip_requirements network_role_tag: @@ -234,10 +221,7 @@ topology_template: get_input: port_oam_oam_2_port_exCP_naming vlan_requirements: get_input: port_oam_oam_2_port_vlan_requirements - subinterface_indicator: - get_input: - - port_oam_oam_2_port_subinterface_indicator - - index_value + subinterface_indicator: false ip_requirements: get_input: port_oam_oam_2_port_ip_requirements network_role_tag: diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/fulltest/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 658b0d62a4..73d44bd634 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 @@ -211,6 +211,10 @@ topology_template: cscf_internal_0_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_cscf_internal_0_port_0_subnetpoolid + network: + get_input: internal_net_id ip_requirements: get_input: port_cscf_internal_0_port_0_ip_requirements security_groups: @@ -226,10 +230,9 @@ topology_template: get_input: - cscf_internal_v6_ips - get_input: index - subnetpoolid: - get_input: port_cscf_internal_0_port_0_subnetpoolid mac_requirements: get_input: port_cscf_internal_0_port_0_mac_requirements + subinterface_indicator: false name: str_replace: template: $PREFIX$DELeth0 @@ -246,8 +249,6 @@ topology_template: get_input: port_cscf_internal_0_port_0_vlan_requirements network_role_tag: get_input: port_cscf_internal_0_port_0_network_role_tag - network: - get_input: internal_net_id order: get_input: port_cscf_internal_0_port_0_order requirements: 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 65e2fb86e9..e13629478c 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 @@ -224,6 +224,10 @@ topology_template: tdcore_internal_0_port_0: type: org.openecomp.resource.cp.nodes.heat.network.neutron.Port properties: + subnetpoolid: + get_input: port_tdcore_internal_0_port_0_subnetpoolid + network: + get_input: internal_net_id ip_requirements: get_input: port_tdcore_internal_0_port_0_ip_requirements security_groups: @@ -235,10 +239,9 @@ topology_template: get_input: - tdcore_internal_ips - get_input: index - subnetpoolid: - get_input: port_tdcore_internal_0_port_0_subnetpoolid mac_requirements: get_input: port_tdcore_internal_0_port_0_mac_requirements + subinterface_indicator: false name: str_replace: template: $PREFIX$DELeth0 @@ -255,8 +258,6 @@ topology_template: get_input: port_tdcore_internal_0_port_0_vlan_requirements network_role_tag: get_input: port_tdcore_internal_0_port_0_network_role_tag - network: - get_input: internal_net_id order: get_input: port_tdcore_internal_0_port_0_order requirements: @@ -289,6 +290,7 @@ topology_template: - get_input: index mac_requirements: get_input: port_tdcore_dpdk_0_port_1_mac_requirements + subinterface_indicator: false name: str_replace: template: $PREFIX$DELeth1 |