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/out/MainServiceTemplate.yaml')
1 files changed, 128 insertions, 76 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/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 b78169323f..d01b20e756 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 @@ -2094,6 +2094,8 @@ topology_template: port_cdi_ims_core_1_port_mac_requirements: mac_count_required: is_required: false + port_cdi_ims_core_1_port_subinterface_indicator: + - true vm_image_name: get_input: cdi_image_name compute_cdi_scheduler_hints: @@ -2168,6 +2170,8 @@ topology_template: is_required: true floating_ip_count_required: is_required: false + port_cdi_internal_1_port_subinterface_indicator: + - true compute_cdi_metadata: - vf_module_id: get_input: vf_module_id @@ -2549,8 +2553,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 @@ -2564,6 +2566,47 @@ topology_template: - ip_address: 128.0.0.0/1 - ip_address: ::/1 - ip_address: 8000::/1 + vm_flavor_name: + get_input: lbd_flavor_name + port_lbd_ims_core_1_port_mac_requirements: + mac_count_required: + is_required: false + compute_lbd_availability_zone: + - get_input: availability_zone_1 + vm_image_name: + get_input: lbd_image_name + port_lbd_dpdk_1_port_subinterface_indicator: + - true + port_lbd_dpdk_1_port_network: + - cscf_internal_dpdk_network_0 + port_lbd_ims_core_1_port_name: + - str_replace: + template: $PREFIX$DELeth2 + params: + $PREFIX: + 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: 4 ip_count_required: @@ -2578,13 +2621,8 @@ topology_template: 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: - mac_count_required: - is_required: false - compute_lbd_availability_zone: - - get_input: availability_zone_1 + port_lbd_ims_core_1_port_subinterface_indicator: + - true port_lbd_internal_1_port_ip_requirements: - ip_version: 4 ip_count_required: @@ -2598,18 +2636,6 @@ topology_template: 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: - - cscf_internal_dpdk_network_0 - port_lbd_ims_core_1_port_name: - - str_replace: - template: $PREFIX$DELeth2 - params: - $PREFIX: - 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: @@ -2620,23 +2646,11 @@ 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: @@ -2658,12 +2672,8 @@ 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 + port_lbd_internal_1_port_subinterface_indicator: + - true service_template_filter: substitute_service_template: Nested_lbdServiceTemplate.yaml count: 1 @@ -2921,8 +2931,12 @@ 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: + - true compute_cdi_config_drive: - true + port_cdi_internal_0_port_subinterface_indicator: + - true port_cdi_internal_0_port_security_groups: - - cscf_RSG port_cdi_ims_core_0_port_security_groups: @@ -3017,6 +3031,8 @@ topology_template: is_required: false floating_ip_count_required: is_required: false + port_oam_oam_1_port_subinterface_indicator: + - true port_oam_oam_1_port_network_role_tag: oam port_oam_oam_1_port_security_groups: - - cscf_RSG @@ -3070,6 +3086,8 @@ topology_template: get_input: vcscf_name_delimeter compute_oam_scheduler_hints: - group: oam_server_group_group + port_oam_internal_1_port_subinterface_indicator: + - true compute_oam_availability_zone: - get_input: availability_zone_1 compute_oam_metadata: @@ -3113,6 +3131,8 @@ topology_template: - substitutable properties: port_oam_oam_2_port_network_role_tag: oam + port_oam_oam_2_port_subinterface_indicator: + - true port_oam_oam_2_port_security_groups: - - cscf_RSG port_oam_oam_2_port_name: @@ -3156,6 +3176,8 @@ topology_template: port_oam_oam_2_port_mac_requirements: mac_count_required: is_required: false + port_oam_internal_2_port_subinterface_indicator: + - true port_oam_oam_2_port_network: - get_input: oam_net_id compute_oam_user_data_format: @@ -3308,6 +3330,8 @@ topology_template: get_input: oam_name_0 $DEL: get_input: vcscf_name_delimeter + port_oam_internal_0_port_subinterface_indicator: + - true port_oam_oam_0_port_fixed_ips: - ip_address: get_input: oam_oam_ip_0 @@ -3349,6 +3373,8 @@ topology_template: port_oam_internal_0_port_fixed_ips: - ip_address: get_input: oam_internal_ip_0 + port_oam_oam_0_port_subinterface_indicator: + - true port_oam_oam_0_port_network_role_tag: oam compute_oam_user_data_format: - RAW @@ -3415,17 +3441,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: @@ -3435,14 +3452,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: @@ -3456,8 +3465,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 @@ -3472,15 +3479,14 @@ topology_template: get_input: lbd_name_0 $DEL: get_input: vcscf_name_delimeter + port_lbd_internal_0_port_subinterface_indicator: + - true 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: 4 ip_count_required: @@ -3492,14 +3498,52 @@ topology_template: 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_ims_core_0_port_subinterface_indicator: + - true 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: + - true + 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 @@ -3510,8 +3554,6 @@ 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: @@ -3523,16 +3565,6 @@ topology_template: is_required: false 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 @@ -3778,6 +3810,8 @@ topology_template: get_input: cif_name_0 $DEL: get_input: vcscf_name_delimeter + port_cif_oam_0_port_3_subinterface_indicator: + - true vm_image_name: get_input: cif_image_name compute_cif_user_data_format: @@ -3845,6 +3879,10 @@ 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: + - true + port_cif_ims_li_0_port_subinterface_indicator: + - true port_cif_oam_0_port_3_security_groups: - - cscf_RSG port_cif_ims_core_0_port_ip_requirements: @@ -3861,6 +3899,8 @@ topology_template: port_cif_ims_li_0_port_mac_requirements: mac_count_required: is_required: false + port_cif_oam_0_port_1_subinterface_indicator: + - true port_cif_oam_0_port_1_network: - get_input: oam_net_id port_cif_ims_li_0_port_security_groups: @@ -3883,6 +3923,8 @@ 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: + - true port_cif_internal_0_port_mac_requirements: mac_count_required: is_required: false @@ -3981,10 +4023,16 @@ topology_template: - get_input: oam_net_id vm_flavor_name: get_input: cif_flavor_name + port_cif_internal_1_port_subinterface_indicator: + - true + port_cif_ims_core_1_port_subinterface_indicator: + - true vm_image_name: get_input: cif_image_name compute_cif_user_data_format: - RAW + port_cif_ims_li_1_port_subinterface_indicator: + - true port_cif_oam_1_port_3_allowed_address_pairs: - ip_address: get_input: cif_oam_vip_1 @@ -4026,6 +4074,8 @@ topology_template: get_input: vnf_name vf_module_name: get_input: vf_module_name + port_cif_oam_1_port_1_subinterface_indicator: + - true port_cif_oam_1_port_1_fixed_ips: - ip_address: get_input: cif_oam_ip_1 @@ -4139,6 +4189,8 @@ topology_template: get_input: vcscf_name_delimeter compute_cif_config_drive: - true + port_cif_oam_1_port_3_subinterface_indicator: + - true port_cif_oam_1_port_3_name: - str_replace: template: $PREFIX$DELeth3 |