diff options
author | 2018-04-10 15:19:51 +0300 | |
---|---|---|
committer | 2018-04-10 14:32:37 +0000 | |
commit | 7a9073719da3db83024e66a1da9ba14546cfd175 (patch) | |
tree | 3d2b8e442fe7837c4ab041ac147ffe7a192bbbb0 /openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_module.yaml | |
parent | 14f12f45bb7a41513d82b73f4c72b14c2e5584e3 (diff) |
Defect 451622: Fix for defect 430981 not correct
Only one default ipVersion - version4 should be created
Change-Id: I27aad6acdacf66cf48f71f0a17cdd414aa510f93
Issue-ID: SDC-1203
Signed-off-by: eleonorali <eleonoral@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_module.yaml')
-rw-r--r-- | openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_module.yaml | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_module.yaml b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_module.yaml index b787785643..136fba45d3 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_module.yaml +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/resources/mock/services/heattotosca/neutron_dual_stacks/inputfiles/Use_Case_1_module.yaml @@ -29,6 +29,18 @@ parameters: dns_int_bearer_v6_ips: type: comma_delimited_list description: fixed IPv6 assignment for VM's on the Bearer network + dns_int_bearer_floating_v6_ip: + type: comma_delimited_list + description: floating IPv6 assignment for VM's on the Bearer network + dns_int_bearer_floating_ip: + type: comma_delimited_list + description: floating IPv4 assignment for VM's on the Bearer network + dns_oam_protected_floating_v6_ip: + type: comma_delimited_list + description: floating IPv6 assignment for VM's on the oam_protected + dns_oam_protected_floating_ip: + type: comma_delimited_list + description: floating IPv4 assignment for VM's on the oam_protected dns_names: type: comma_delimited_list description: server name @@ -53,7 +65,7 @@ parameters: type: string description: Unique ID for this VF module instance # For manual spinups, value must be in the ENV file. Must be removed from ENV before uploading to ASDC - + resources: dns_0_oam_protected_port_0: @@ -65,7 +77,7 @@ resources: params: VNF_NAME: {get_param: vnf_name} network: { get_param: oam_protected_net_name } - allowed_address_pairs: [{ "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}, { "ip_address": { get_param: [ dns_oam_protected_floating_v6_ip, 5 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}] + allowed_address_pairs: [{ "ip_address": { get_param: dns_oam_protected_floating_ip}}, { "ip_address": { get_param: dns_oam_protected_floating_v6_ip}}, { "ip_address": { get_param: dns_oam_protected_floating_ip}}] security_groups: [{ get_param: security_group }] dns_0_oam_protected_port_1: @@ -77,9 +89,9 @@ resources: params: VNF_NAME: {get_param: vnf_name} network: { get_param: oam_protected_net_name } - fixed_ips: [{ "ip_address": { get_param: [ dns_int_bearer_ips_v6_ips, 0 ]}}] + fixed_ips: [{ "ip_address": { get_param: [ dns_int_bearer_v6_ips, 0 ]}}] security_groups: [{ get_param: security_group }] - + dns_0_int_bearer_port: type: OS::Neutron::Port properties: @@ -90,7 +102,7 @@ resources: VNF_NAME: {get_param: vnf_name} network: { get_param: int_bearer_net_name } fixed_ips: [{ "ip_address": { get_param: [ dns_int_bearer_ips, 0 ]}}, { "ip_address": { get_param: [ dns_int_bearer_v6_ips, 0 ]}}] - allowed_address_pairs: [{ "ip_address": { get_param: [ dns_int_bearer, 0 ]}}, { "ip_address": { get_param: [ dns_int_bearer, 0 ]}}] + allowed_address_pairs: [{ "ip_address": { get_param: dns_int_bearer_floating_v6_ip}}, { "ip_address": { get_param: dns_int_bearer_floating_ip}}] security_groups: [{ get_param: security_group }] dns_server_0: @@ -107,7 +119,7 @@ resources: metadata: vnf_id: { get_param: vnf_id } vf_module_id: { get_param: vf_module_id } - vnf_name: {get_param: vnf_name } + vnf_name: {get_param: vnf_name } dns_1_oam_protected_port_0: type: OS::Neutron::Port @@ -119,7 +131,7 @@ resources: VNF_NAME: {get_param: vnf_name} network: { get_param: oam_protected_net_name } fixed_ips: [{ "ip_address": { get_param: [ dns_oam_protected_ips, 6 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 7 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}] - allowed_address_pairs: [{ "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}, { "ip_address": { get_param: [ dns_oam_protected_floating_v6_ip, 5 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}] + allowed_address_pairs: [{ "ip_address": { get_param: dns_oam_protected_floating_ip}}, { "ip_address": { get_param: dns_oam_protected_floating_ip}}] security_groups: [{ get_param: security_group }] dns_1_oam_protected_port_1: @@ -132,9 +144,9 @@ resources: VNF_NAME: {get_param: vnf_name} network: { get_param: oam_protected_net_name } fixed_ips: [{ "ip_address": { get_param: [ dns_oam_protected_v6_ips, 6 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 7 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}] - allowed_address_pairs: [{ "ip_address": { get_param: [ dns_oam_protected_floating_v6_ip, 4 ]}}, { "ip_address": { get_param: [ dns_oam_protected_ips, 5 ]}}, { "ip_address": { get_param: [ dns_oam_protected_floating_v6_ip, 5 ]}}] + allowed_address_pairs: [{ "ip_address": { get_param: dns_oam_protected_floating_v6_ip}}, { "ip_address": { get_param: dns_oam_protected_floating_ip}}, { "ip_address": { get_param: dns_oam_protected_floating_v6_ip}}] security_groups: [{ get_param: security_group }] - + dns_1_int_bearer_port: type: OS::Neutron::Port properties: @@ -145,7 +157,7 @@ resources: VNF_NAME: {get_param: vnf_name} network: { get_param: int_bearer_net_name } fixed_ips: [{ "ip_address": { get_param: [ dns_int_bearer_ips, 0 ]}}, { "ip_address": { get_param: [ dns_int_bearer_v6_ips, 0 ]}}] - allowed_address_pairs: [{ "ip_address": { get_param: [ dns_int_bearer_floating_v6_ip, 0 ]}}, { "ip_address": { get_param: [ dns_int_bearer_floating_v6_ip, 0 ]}}] + allowed_address_pairs: [{ "ip_address": { get_param: dns_int_bearer_floating_v6_ip}}, { "ip_address": { get_param: dns_int_bearer_floating_ip}}] security_groups: [{ get_param: security_group }] dns_server_1: @@ -162,6 +174,6 @@ resources: metadata: vnf_id: { get_param: vnf_id } vf_module_id: { get_param: vf_module_id } - vnf_name: {get_param: vnf_name } + vnf_name: {get_param: vnf_name } |