diff options
| author |   Steven Wright <sw3588@att.com> | 2019-02-28 23:36:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-02-28 23:36:46 +0000 |
| commit | 5f53caf31c930151a66deb64f091a53c57129892 (patch) | |
| tree | 94f3aad6b269e74088f89c9e23cea0f4ff792495 /ice_validator/tests/fixtures | |
| parent | 32005576d817670ac58f98b32d6a4a6de0ed2d26 (diff) | |
| parent | 2e4979ee3968d97c30770c43a11e7699481656a6 (diff) | |
Merge "[VVP-171] R-84123 and R-76160 test update"
Diffstat (limited to 'ice_validator/tests/fixtures')
| -rw-r--r-- | ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/fail/fail0.yaml (renamed from ice_validator/tests/fixtures/test_neutron_port_fixed_ips/fail/fail0.yaml) | 4 | ||||
| -rw-r--r-- | ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/fail/fail1.yaml (renamed from ice_validator/tests/fixtures/test_neutron_port_fixed_ips/fail/fail1.yaml) | 10 | ||||
| -rw-r--r-- | ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/pass/pass0.yaml (renamed from ice_validator/tests/fixtures/test_neutron_port_fixed_ips/pass/pass0.yaml) | 0 | ||||
| -rw-r--r-- | ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/pass/pass0_base.yaml (renamed from ice_validator/tests/fixtures/test_neutron_port_fixed_ips/pass/pass0_base.yaml) | 0 |
4 files changed, 5 insertions, 9 deletions
diff --git a/ice_validator/tests/fixtures/test_neutron_port_fixed_ips/fail/fail0.yaml b/ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/fail/fail0.yaml index 8ca5cec..901072f 100644 --- a/ice_validator/tests/fixtures/test_neutron_port_fixed_ips/fail/fail0.yaml +++ b/ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/fail/fail0.yaml @@ -50,7 +50,7 @@ parameters: vm_typeX_bialy_guest_vlans: type: comma_delimited_list subnet_param: - type: string + type: comma_delimited_list subnet_id_param: type: comma_delimited_list @@ -63,7 +63,6 @@ resources: fixed_ips: - ip_address: { get_param: lb_1_int_intranet_floating_ip } subnet: { get_param: subnet_param } - subnet_id: { get_param: subnet_id_param } binding:vnic_type: direct value_specs: vlan_filter: {get_param: vm_typeX_bialy_vlan_filter} @@ -82,7 +81,6 @@ resources: fixed_ips: - ip_address: { get_param: lb_2_extnet_floating_v6_ip } subnet: { get_param: subnet_param } - subnet_id: { get_param: subnet_id_param } binding:vnic_type: direct value_specs: vlan_filter: {get_param: vm_typeX_bialy_vlan_filter} diff --git a/ice_validator/tests/fixtures/test_neutron_port_fixed_ips/fail/fail1.yaml b/ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/fail/fail1.yaml index 58c75bb..60f9874 100644 --- a/ice_validator/tests/fixtures/test_neutron_port_fixed_ips/fail/fail1.yaml +++ b/ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/fail/fail1.yaml @@ -49,8 +49,8 @@ parameters: type: comma_delimited_list vm_typeX_bialy_guest_vlans: type: comma_delimited_list - bialy_subnet: - type: string + bialy_susbnet: + type: comma_delimited_list bialy_subnet_id: type: string @@ -62,8 +62,7 @@ resources: network: { get_param: int_intranet_net_name } fixed_ips: - ip_address: { get_param: lb_1_int_intranet_floating_ip } - subnet: { get_param: bialy_subnet } - subnet_id: { get_param: bialy_subnet_id } + subnet: { get_param: bialy_susbnet } binding:vnic_type: direct value_specs: vlan_filter: {get_param: vm_typeX_bialy_vlan_filter} @@ -81,8 +80,7 @@ resources: network: { get_param: extnet_net_id } fixed_ips: - ip_address: { get_param: lb_2_extnet_floating_v6_ip } - subnet: { get_param: bialy_subnet } - subnet_id: { get_param: bialy_subnet_id } + subnet: { get_param: bialy_susbnet } binding:vnic_type: direct value_specs: vlan_filter: {get_param: vm_typeX_bialy_vlan_filter} diff --git a/ice_validator/tests/fixtures/test_neutron_port_fixed_ips/pass/pass0.yaml b/ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/pass/pass0.yaml index 2a651b1..2a651b1 100644 --- a/ice_validator/tests/fixtures/test_neutron_port_fixed_ips/pass/pass0.yaml +++ b/ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/pass/pass0.yaml diff --git a/ice_validator/tests/fixtures/test_neutron_port_fixed_ips/pass/pass0_base.yaml b/ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/pass/pass0_base.yaml index 04919c3..04919c3 100644 --- a/ice_validator/tests/fixtures/test_neutron_port_fixed_ips/pass/pass0_base.yaml +++ b/ice_validator/tests/fixtures/test_neutron_port_fixed_ips_subnet/pass/pass0_base.yaml |