diff options
Diffstat (limited to 'tempest/api/compute/servers/test_list_server_filters.py')
| -rw-r--r-- | tempest/api/compute/servers/test_list_server_filters.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/tempest/api/compute/servers/test_list_server_filters.py b/tempest/api/compute/servers/test_list_server_filters.py index 5c10f3018..70e4dffdc 100644 --- a/tempest/api/compute/servers/test_list_server_filters.py +++ b/tempest/api/compute/servers/test_list_server_filters.py @@ -19,6 +19,7 @@ from tempest_lib import exceptions as lib_exc from tempest.api.compute import base from tempest.api import utils +from tempest.common import fixed_network from tempest import config from tempest import test @@ -66,9 +67,13 @@ class ListServerFiltersTestJSON(base.BaseV2ComputeTest): raise RuntimeError("Image %s (image_ref_alt) was not found!" % cls.image_ref_alt) + network = cls.get_tenant_network() + cls.fixed_network_name = network['name'] + network_kwargs = fixed_network.set_networks_kwarg(network) cls.s1_name = data_utils.rand_name(cls.__name__ + '-instance') cls.s1 = cls.create_test_server(name=cls.s1_name, - wait_until='ACTIVE') + wait_until='ACTIVE', + **network_kwargs) cls.s2_name = data_utils.rand_name(cls.__name__ + '-instance') cls.s2 = cls.create_test_server(name=cls.s2_name, @@ -80,12 +85,6 @@ class ListServerFiltersTestJSON(base.BaseV2ComputeTest): flavor=cls.flavor_ref_alt, wait_until='ACTIVE') - cls.fixed_network_name = CONF.compute.fixed_network_name - if CONF.service_available.neutron: - if hasattr(cls.isolated_creds, 'get_primary_network'): - network = cls.isolated_creds.get_primary_network() - cls.fixed_network_name = network['name'] - @test.idempotent_id('05e8a8e7-9659-459a-989d-92c2f501f4ba') @utils.skip_unless_attr('multiple_images', 'Only one image found') @test.attr(type='gate') |