diff options
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources')
4 files changed, 115 insertions, 654 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml index ccaa73eb34..cdc13a00ee 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/MainServiceTemplate.yaml @@ -36,21 +36,6 @@ topology_template: type: string description: the flavor name of MMSC load balancer instance default: m1.xlarge - ha_net_local_ip2: - label: ha net 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: ha_net_local_ip2 - type: string - description: the local ip2 of the ha network - default: 172.26.1.4 mmsc_dmz_protected_snat_ips: label: mmsc dmz_protected snat ips hidden: false @@ -72,8 +57,8 @@ topology_template: - 107.239.14.27 entry_schema: type: string - ha_net_local_ip1: - label: ha net network local ip1 + mms_traffic_end: + label: mmsc traffic end IP hidden: false immutable: false annotations: @@ -83,12 +68,12 @@ topology_template: vf_module_label: - MMSC_Capacity_Line source_type: HEAT - param_name: ha_net_local_ip1 + param_name: mms_traffic_end type: string - description: the local ip1 of the ha network - default: 172.26.1.3 - mms_traffic_end: - label: mmsc traffic end IP + description: mmsc traffic end IP + default: 172.26.2.254 + eca_traffic_net_local_ip_2: + label: eca traffic network local ip2 hidden: false immutable: false annotations: @@ -98,10 +83,10 @@ topology_template: vf_module_label: - MMSC_Capacity_Line source_type: HEAT - param_name: mms_traffic_end + param_name: eca_traffic_net_local_ip_2 type: string - description: mmsc traffic end IP - default: 172.26.2.254 + description: the local ip2 of the eca traffic network + default: 172.26.5.4 nems_traffic_end: label: nems traffic end hidden: false @@ -117,6 +102,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 @@ -243,7 +243,6 @@ topology_template: param_name: nems_traffic_net_local_ip1 type: string description: the local ip1 of the nems traffic network - default: 172.26.3.3 nems_traffic_net_local_ip2: label: nems traffic network local ip2 hidden: false @@ -258,7 +257,6 @@ topology_template: param_name: nems_traffic_net_local_ip2 type: string description: the local ip2 of the nems traffic network - default: 172.26.3.4 nems_fe_names: label: NEMS_FE server names hidden: false @@ -391,21 +389,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 @@ -420,21 +403,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 @@ -813,6 +781,36 @@ 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 + default: 172.26.2.3 + 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 + default: 172.26.2.4 cmaui_flavor: hidden: false immutable: false @@ -976,7 +974,6 @@ topology_template: param_name: nems_user_web_net_local_ip1 type: string description: the local ip1 of the nems user web network - default: 172.26.4.3 eca_trx_mgmt_ips: label: eca mgmt net IP for ECA_TRX hidden: false @@ -1043,7 +1040,6 @@ topology_template: param_name: nems_user_web_net_local_ip2 type: string description: the local ip2 of the nems user web network - default: 172.26.4.4 nems_traffic_gateway: label: NEMS traffic network gateway hidden: false @@ -1119,36 +1115,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_net_name: hidden: false immutable: false @@ -1819,6 +1785,36 @@ topology_template: type: string description: Image for MMSC server default: mmsc-6.0.2_v5 + ha_net_local_ip_2: + label: ha net 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: ha_net_local_ip_2 + type: string + description: the local ip2 of the ha network + default: 172.26.1.4 + ha_net_local_ip_1: + label: ha net 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: ha_net_local_ip_1 + type: string + description: the local ip1 of the ha network + default: 172.26.1.3 nems_imap_cidr: label: nems imap cidr hidden: false @@ -2194,11 +2190,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: @@ -2227,16 +2218,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 @@ -2263,11 +2249,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: @@ -2298,11 +2279,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: @@ -2349,11 +2325,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: @@ -2384,11 +2355,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: @@ -2419,11 +2385,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: @@ -2454,11 +2415,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: @@ -2487,11 +2443,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: @@ -2520,11 +2471,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: @@ -2555,11 +2501,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: @@ -2590,11 +2531,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: @@ -2670,16 +2606,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 @@ -2706,16 +2637,11 @@ 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: - ip_address: - get_input: ha_net_local_ip2 + get_input: ha_net_local_ip_2 mac_requirements: mac_count_required: is_required: false @@ -2755,16 +2681,11 @@ 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: - ip_address: - get_input: ha_net_local_ip1 + get_input: ha_net_local_ip_1 mac_requirements: mac_count_required: is_required: false @@ -2816,11 +2737,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: @@ -2849,11 +2765,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: @@ -2884,11 +2795,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: @@ -2917,11 +2823,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: @@ -2950,11 +2851,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: @@ -2983,11 +2879,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: @@ -3016,11 +2907,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: @@ -3052,11 +2938,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: @@ -3085,11 +2966,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: @@ -3120,11 +2996,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: @@ -3155,11 +3026,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: @@ -3188,11 +3054,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: @@ -3221,11 +3082,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: @@ -3254,11 +3110,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: @@ -3287,11 +3138,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: @@ -3320,11 +3166,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: @@ -3353,11 +3194,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: @@ -3388,11 +3224,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: @@ -3423,11 +3254,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: @@ -3458,11 +3284,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: @@ -3491,11 +3312,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: @@ -3526,11 +3342,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: @@ -3565,11 +3376,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: @@ -3652,11 +3458,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: @@ -3685,11 +3486,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: @@ -3724,11 +3520,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 +3548,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: @@ -3790,11 +3576,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: @@ -3868,11 +3649,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 @@ -3931,16 +3707,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 @@ -3966,11 +3737,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 @@ -4029,16 +3795,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 @@ -4081,11 +3842,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: @@ -4185,11 +3941,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 @@ -4248,11 +3999,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: @@ -4281,11 +4027,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: @@ -4316,11 +4057,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: @@ -4349,11 +4085,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: @@ -4382,11 +4113,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: @@ -4415,11 +4141,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: @@ -4467,11 +4188,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: @@ -4502,11 +4218,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: @@ -4537,11 +4248,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: @@ -4573,11 +4279,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: @@ -4606,11 +4307,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: @@ -4677,11 +4373,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: @@ -4708,11 +4399,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: @@ -4763,11 +4449,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: @@ -4796,11 +4477,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: @@ -4829,11 +4505,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: @@ -4884,11 +4555,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 +4583,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 +4613,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: @@ -5003,11 +4659,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: @@ -5086,11 +4737,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: @@ -5119,11 +4765,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: @@ -5153,11 +4794,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 @@ -5216,11 +4852,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: @@ -5249,11 +4880,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: @@ -5284,11 +4910,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: @@ -5317,11 +4938,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: @@ -5352,11 +4968,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: @@ -5387,11 +4998,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: @@ -5420,11 +5026,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: @@ -5469,11 +5070,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: @@ -5497,11 +5093,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: @@ -5562,11 +5153,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: @@ -5633,11 +5219,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: @@ -5732,11 +5313,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 +5341,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 +5369,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: @@ -5831,11 +5397,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: @@ -5866,11 +5427,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: @@ -5899,11 +5455,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: @@ -5932,11 +5483,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: @@ -5967,11 +5513,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: @@ -6002,11 +5543,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: @@ -6083,11 +5619,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: @@ -6116,11 +5647,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: @@ -6149,11 +5675,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: @@ -6184,11 +5705,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: @@ -6220,11 +5736,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: @@ -6271,11 +5782,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: @@ -6304,11 +5810,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: @@ -6337,11 +5838,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: @@ -6370,11 +5866,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: @@ -6622,4 +6113,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/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml index b837fb195f..9b69834f06 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/expectedOutput/eca_oamServiceTemplate.yaml @@ -226,11 +226,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: @@ -259,11 +254,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: @@ -352,11 +342,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: @@ -385,11 +370,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: @@ -418,11 +398,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: @@ -451,11 +426,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: @@ -1199,4 +1169,4 @@ topology_template: - local_storage dependency_arb_int_port: - arb_int_port - - dependency
\ No newline at end of file + - dependency diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/inputs/MMSC_Capacity_Line.yml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/inputs/MMSC_Capacity_Line.yml index 9e36eb9cd4..a6626b7850 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/inputs/MMSC_Capacity_Line.yml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/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,11 +237,11 @@ 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 description: the local ip2 of the eca traffic network @@ -265,11 +265,11 @@ parameters: type: string label: ha net cidr description: ha net cidr - ha_net_local_ip1: + ha_net_local_ip_1: type: string label: ha net network local ip1 description: the local ip1 of the ha network - ha_net_local_ip2: + ha_net_local_ip_2: type: string label: ha net network local ip2 description: the local ip2 of the ha network @@ -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 @@ -618,7 +618,7 @@ resources: type: OS::Neutron::Port properties: network_id: {get_resource: ha_net} - fixed_ips: [{"ip_address": {get_param: ha_net_local_ip1}}] + fixed_ips: [{"ip_address": {get_param: ha_net_local_ip_1}}] 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 @@ -707,7 +707,7 @@ resources: type: OS::Neutron::Port properties: network_id: {get_resource: ha_net} - fixed_ips: [{"ip_address": {get_param: ha_net_local_ip2}}] + fixed_ips: [{"ip_address": {get_param: ha_net_local_ip_2}}] 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/referencedHeatResources/inputs/MMSC_Capacity_Line_1.env b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/inputs/MMSC_Capacity_Line_1.env index b346d67d97..a00a4209c6 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/inputs/MMSC_Capacity_Line_1.env +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/multiHeat/referencedHeatResources/inputs/MMSC_Capacity_Line_1.env @@ -17,8 +17,8 @@ parameters: mms_traffic_net_gateway: 172.26.2.1 mms_traffic_start: 172.26.2.3 mms_traffic_end: 172.26.2.254 - mms_traffic_net_local_ip1: 172.26.2.3 - mms_traffic_net_local_ip2: 172.26.2.4 + mms_traffic_net_local_ip_1: 172.26.2.3 + mms_traffic_net_local_ip_2: 172.26.2.4 mms_traffic_net_floating_ip: 172.26.2.5 nems_internal_name: int_mms_nems_internal_net_2 nems_internal_start: 172.26.6.3 @@ -32,8 +32,8 @@ parameters: nems_traffic_cidr: 172.26.3.0/24 nems_traffic_netmask: 255.255.255.0 nems_traffic_gateway: 172.26.3.1 - nems_traffic_net_local_ip1: 172.26.3.3 - nems_traffic_net_local_ip2: 172.26.3.4 + nems_traffic_net_local_ip_1: 172.26.3.3 + nems_traffic_net_local_ip_2: 172.26.3.4 nems_traffic_net_floating_ip: 172.26.3.5 nems_user_web_name: int_mms_nems_web_net_2 nems_user_web_start: 172.26.4.3 @@ -41,8 +41,8 @@ parameters: nems_user_web_cidr: 172.26.4.0/24 nems_user_web_netmask: 255.255.255.0 nems_user_web_gateway: 172.26.4.1 - nems_user_web_net_local_ip1: 172.26.4.3 - nems_user_web_net_local_ip2: 172.26.4.4 + nems_user_web_net_local_ip_1: 172.26.4.3 + nems_user_web_net_local_ip_2: 172.26.4.4 nems_user_web_net_floating_ip: 172.26.4.5 nems_imap_name: int_mms_nems_imap_net_2 nems_imap_start: 172.26.7.3 @@ -56,15 +56,15 @@ 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 ha_net_start: 172.26.1.3 ha_net_end: 172.26.1.254 - ha_net_local_ip1: 172.26.1.3 - ha_net_local_ip2: 172.26.1.4 + ha_net_local_ip_1: 172.26.1.3 + ha_net_local_ip_2: 172.26.1.4 lb_names: ZRDM1MMSC03ALB001,ZRDM1MMSC03ALB002 lb_image_name: BIGIP-11.5.3.0.0.163 lb_flavor_name: m1.xlarge |