diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase')
3 files changed, 74 insertions, 611 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/expectedOutput/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/expectedOutput/MainServiceTemplate.yaml index 816106ec02..50b4130270 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/expectedOutput/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/expectedOutput/MainServiceTemplate.yaml @@ -104,6 +104,21 @@ topology_template: type: string description: mmsc traffic end IP default: 172.26.2.254 + eca_traffic_net_local_ip_2: + label: eca traffic network local ip_2 + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - MMSC_Capacity_Line + source_type: HEAT + param_name: eca_traffic_net_local_ip_2 + type: string + description: the local ip2 of the eca traffic network + default: 172.26.5.4 nems_traffic_end: label: nems traffic end hidden: false @@ -119,6 +134,21 @@ topology_template: type: string description: nems traffic end default: 172.26.3.254 + eca_traffic_net_local_ip_1: + label: eca traffic network local ip1 + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - MMSC_Capacity_Line + source_type: HEAT + param_name: eca_traffic_net_local_ip_1 + type: string + description: the local ip1 of the eca traffic network + default: 172.26.5.3 mmsc_cinder_volume_size: label: MMSC Cinder volume size hidden: false @@ -427,21 +457,6 @@ topology_template: type: string description: nems imap end default: 172.26.7.254 - eca_traffic_net_local_ip1: - label: eca traffic network local ip1 - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - MMSC_Capacity_Line - source_type: HEAT - param_name: eca_traffic_net_local_ip1 - type: string - description: the local ip1 of the eca traffic network - default: 172.26.5.3 cmaui_image: hidden: false immutable: false @@ -456,21 +471,6 @@ topology_template: type: string description: Image for CMAUI server default: cmaui-5.0.2.5_v25 - eca_traffic_net_local_ip2: - label: eca traffic network local ip2 - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - MMSC_Capacity_Line - source_type: HEAT - param_name: eca_traffic_net_local_ip2 - type: string - description: the local ip2 of the eca traffic network - default: 172.26.5.4 nems_volume_size: label: nems fe volume size hidden: false @@ -899,6 +899,34 @@ topology_template: type: string description: ha_failover network name default: int_mms_ha_net_2 + mms_traffic_net_local_ip_1: + label: mmsc traffic network local ip1 + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - MMSC_Capacity_Line + source_type: HEAT + param_name: mms_traffic_net_local_ip_1 + type: string + description: the local ip1 of the mmsc traffic network + mms_traffic_net_local_ip_2: + label: mmsc traffic network local ip2 + hidden: false + immutable: false + annotations: + source: + type: org.openecomp.annotations.Source + properties: + vf_module_label: + - MMSC_Capacity_Line + source_type: HEAT + param_name: mms_traffic_net_local_ip_2 + type: string + description: the local ip2 of the mmsc traffic network arb_names: label: arbiter server names hidden: false @@ -1256,36 +1284,6 @@ topology_template: type: string description: NEMS user web network subnet mask default: 255.255.255.0 - mms_traffic_net_local_ip1: - label: mmsc traffic network local ip1 - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - MMSC_Capacity_Line - source_type: HEAT - param_name: mms_traffic_net_local_ip1 - type: string - description: the local ip1 of the mmsc traffic network - default: 172.26.2.3 - mms_traffic_net_local_ip2: - label: mmsc traffic network local ip2 - hidden: false - immutable: false - annotations: - source: - type: org.openecomp.annotations.Source - properties: - vf_module_label: - - MMSC_Capacity_Line - source_type: HEAT - param_name: mms_traffic_net_local_ip2 - type: string - description: the local ip2 of the mmsc traffic network - default: 172.26.2.4 oam_image_name: label: image name hidden: false @@ -2468,11 +2466,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2501,16 +2494,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: - get_input: mms_traffic_net_local_ip2 + get_input: mms_traffic_net_local_ip_2 mac_requirements: mac_count_required: is_required: false @@ -2537,11 +2525,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2572,11 +2555,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2623,11 +2601,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2658,11 +2631,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2693,11 +2661,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2728,11 +2691,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2761,11 +2719,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2794,11 +2747,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2829,11 +2777,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2864,11 +2807,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -2944,16 +2882,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: - get_input: eca_traffic_net_local_ip2 + get_input: eca_traffic_net_local_ip_2 mac_requirements: mac_count_required: is_required: false @@ -2980,11 +2913,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3013,11 +2941,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3062,11 +2985,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3123,11 +3041,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3156,11 +3069,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3191,11 +3099,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3224,11 +3127,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3257,11 +3155,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3290,11 +3183,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3323,11 +3211,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3380,11 +3263,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3413,11 +3291,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3448,11 +3321,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3489,11 +3357,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3522,11 +3385,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3555,11 +3413,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3588,11 +3441,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3621,11 +3469,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3654,11 +3497,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3687,11 +3525,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3722,11 +3555,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3757,11 +3585,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3792,11 +3615,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3825,11 +3643,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3860,11 +3673,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3893,11 +3701,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3932,11 +3735,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -3967,11 +3765,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -4022,11 +3815,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -4055,11 +3843,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -4094,11 +3877,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -4127,11 +3905,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -4160,11 +3933,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -4238,11 +4006,6 @@ topology_template: ip_count_required: is_required: true floating_ip_count_required: - is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: is_required: false security_groups: - get_input: security_group_name @@ -4301,16 +4064,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: - get_input: eca_traffic_net_local_ip1 + get_input: eca_traffic_net_local_ip_1 mac_requirements: mac_count_required: is_required: false @@ -4336,11 +4094,6 @@ topology_template: ip_count_required: is_required: true floating_ip_count_required: - is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: is_required: false security_groups: - get_input: security_group_name @@ -4399,16 +4152,11 @@ topology_template: is_required: true floating_ip_count_required: is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: - ip_address: - get_input: mms_traffic_net_local_ip1 + get_input: mms_traffic_net_local_ip_1 mac_requirements: mac_count_required: is_required: false @@ -4451,11 +4199,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -4567,11 +4310,6 @@ topology_template: ip_count_required: is_required: true floating_ip_count_required: - is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: is_required: false security_groups: - get_input: security_group_name @@ -4630,11 +4368,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -4663,11 +4396,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -4698,11 +4426,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -4731,11 +4454,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -4764,11 +4482,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -4797,11 +4510,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -4830,11 +4538,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -4882,11 +4585,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -4917,11 +4615,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -4952,11 +4645,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -4988,11 +4676,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5021,11 +4704,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5054,11 +4732,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5125,11 +4798,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5156,11 +4824,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5211,11 +4874,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5244,11 +4902,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5277,11 +4930,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5332,11 +4980,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5365,11 +5008,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5400,11 +5038,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5451,11 +5084,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5534,11 +5162,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5567,11 +5190,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5600,11 +5218,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5634,11 +5247,6 @@ topology_template: ip_count_required: is_required: true floating_ip_count_required: - is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: is_required: false security_groups: - get_input: security_group_name @@ -5697,11 +5305,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5730,11 +5333,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5765,11 +5363,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5798,11 +5391,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5833,11 +5421,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5868,11 +5451,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5901,11 +5479,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5950,11 +5523,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -5983,11 +5551,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6048,11 +5611,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6119,11 +5677,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6218,11 +5771,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6251,11 +5799,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6284,11 +5827,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6317,11 +5855,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6352,11 +5885,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6385,11 +5913,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6418,11 +5941,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6453,11 +5971,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6488,11 +6001,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6569,11 +6077,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6602,11 +6105,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6635,11 +6133,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6670,11 +6163,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: true - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6706,11 +6194,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6757,11 +6240,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6790,11 +6268,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6844,11 +6317,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -6877,11 +6345,6 @@ topology_template: is_required: true floating_ip_count_required: is_required: false - - ip_version: 6 - ip_count_required: - is_required: false - floating_ip_count_required: - is_required: false security_groups: - get_input: security_group_name fixed_ips: @@ -7162,4 +6625,4 @@ topology_template: HOT template that creates Security Group and ECA network members: - mms_security_group - - eca_mgmt_net + - eca_mgmt_net
\ No newline at end of file diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/inputs/MMSC_Capacity_Line.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/inputs/MMSC_Capacity_Line.yml index 9e36eb9cd4..b315cda4e2 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/inputs/MMSC_Capacity_Line.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/inputs/MMSC_Capacity_Line.yml @@ -81,11 +81,11 @@ parameters: type: string label: mmsc traffic end IP description: mmsc traffic end IP - mms_traffic_net_local_ip1: + mms_traffic_net_local_ip_1: type: string label: mmsc traffic network local ip1 description: the local ip1 of the mmsc traffic network - mms_traffic_net_local_ip2: + mms_traffic_net_local_ip_2: type: string label: mmsc traffic network local ip2 description: the local ip2 of the mmsc traffic network @@ -237,13 +237,13 @@ parameters: type: string label: eca_traffic network gateway description: eca_traffic network gateway - eca_traffic_net_local_ip1: + eca_traffic_net_local_ip_1: type: string label: eca traffic network local ip1 description: the local ip1 of the eca traffic network - eca_traffic_net_local_ip2: + eca_traffic_net_local_ip_2: type: string - label: eca traffic network local ip2 + label: eca traffic network local ip_2 description: the local ip2 of the eca traffic network eca_traffic_net_floating_ip: type: string @@ -573,7 +573,7 @@ resources: type: OS::Neutron::Port properties: network_id: {get_resource: mms_traffic_net} - fixed_ips: [{"ip_address": {get_param: mms_traffic_net_local_ip1}}] + fixed_ips: [{"ip_address": {get_param: mms_traffic_net_local_ip_1}}] allowed_address_pairs: [{"ip_address": {get_param: mms_traffic_net_floating_ip} }] security_groups: [{get_param: security_group_name}] replacement_policy: AUTO @@ -626,7 +626,7 @@ resources: type: OS::Neutron::Port properties: network_id: {get_resource: eca_traffic_net} - fixed_ips: [{"ip_address": {get_param: eca_traffic_net_local_ip1}}] + fixed_ips: [{"ip_address": {get_param: eca_traffic_net_local_ip_1}}] allowed_address_pairs: [{"ip_address": {get_param: eca_traffic_net_floating_ip} }] security_groups: [{get_param: security_group_name}] replacement_policy: AUTO @@ -662,7 +662,7 @@ resources: type: OS::Neutron::Port properties: network_id: {get_resource: mms_traffic_net} - fixed_ips: [{"ip_address": {get_param: mms_traffic_net_local_ip2}}] + fixed_ips: [{"ip_address": {get_param: mms_traffic_net_local_ip_2}}] allowed_address_pairs: [{"ip_address": {get_param: mms_traffic_net_floating_ip}}] security_groups: [{get_param: security_group_name}] replacement_policy: AUTO @@ -715,7 +715,7 @@ resources: type: OS::Neutron::Port properties: network_id: {get_resource: eca_traffic_net} - fixed_ips: [{"ip_address": {get_param: eca_traffic_net_local_ip2}}] + fixed_ips: [{"ip_address": {get_param: eca_traffic_net_local_ip_2}}] allowed_address_pairs: [{"ip_address": {get_param: eca_traffic_net_floating_ip} }] security_groups: [{get_param: security_group_name}] replacement_policy: AUTO diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/inputs/MMSC_Capacity_Line_1.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/inputs/MMSC_Capacity_Line_1.env index b346d67d97..c32322266e 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/inputs/MMSC_Capacity_Line_1.env +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/allHeatsAreBase/inputs/MMSC_Capacity_Line_1.env @@ -56,8 +56,8 @@ parameters: eca_traffic_net_gateway: 172.26.5.1 eca_traffic_start: 172.26.5.3 eca_traffic_end: 172.26.5.254 - eca_traffic_net_local_ip1: 172.26.5.3 - eca_traffic_net_local_ip2: 172.26.5.4 + eca_traffic_net_local_ip_1: 172.26.5.3 + eca_traffic_net_local_ip_2: 172.26.5.4 eca_traffic_net_floating_ip: 172.26.5.5 ha_net_name: int_mms_ha_net_2 ha_net_cidr: 172.26.1.0/24 |