diff --git a/octavia/tests/tempest/v1/scenario/base.py b/octavia/tests/tempest/v1/scenario/base.py index 7ad202e89d..8aaa8aca79 100644 --- a/octavia/tests/tempest/v1/scenario/base.py +++ b/octavia/tests/tempest/v1/scenario/base.py @@ -118,12 +118,14 @@ class BaseTestCase(manager.NetworkScenarioTest): """ tenant_id = self.load_balancers_client.tenant_id try: - tenant_net = self._list_networks(tenant_id=tenant_id)[0] + tenant_net = self.admin_manager.networks_client.list_networks( + tenant_id=tenant_id)['networks'][0] except IndexError: tenant_net = None if tenant_net: - tenant_subnet = self._list_subnets(tenant_id=tenant_id)[0] + tenant_subnet = self.admin_manager.subnets_client.list_subnets( + tenant_id=tenant_id)['subnets'][0] self.subnet = tenant_subnet self.network = tenant_net else: @@ -133,7 +135,8 @@ class BaseTestCase(manager.NetworkScenarioTest): # with the fixed network is the one we want. In the future, we # should instead pull a subnet id from config, which is set by # devstack/admin/etc. - subnet = self._list_subnets(network_id=self.network['id'])[0] + subnet = self.admin_manager.subnets_client.list_subnets( + network_id=self.network['id'])['subnets'][0] self.subnet = subnet def _create_security_group_for_test(self): diff --git a/octavia/tests/tempest/v2/scenario/base.py b/octavia/tests/tempest/v2/scenario/base.py index f0518c95ed..ceca47eaaf 100644 --- a/octavia/tests/tempest/v2/scenario/base.py +++ b/octavia/tests/tempest/v2/scenario/base.py @@ -115,12 +115,14 @@ class BaseTestCase(manager.NetworkScenarioTest): fallback in absence of tenant networking. """ try: - tenant_net = self._list_networks(tenant_id=self.tenant_id)[0] + tenant_net = self.admin_manager.networks_client.list_networks( + tenant_id=self.tenant_id)['networks'][0] except IndexError: tenant_net = None if tenant_net: - tenant_subnet = self._list_subnets(tenant_id=self.tenant_id)[0] + tenant_subnet = self.admin_manager.subnets_client.list_subnets( + tenant_id=self.tenant_id)['subnets'][0] self.subnet = tenant_subnet self.network = tenant_net else: @@ -130,7 +132,8 @@ class BaseTestCase(manager.NetworkScenarioTest): # with the fixed network is the one we want. In the future, we # should instead pull a subnet id from config, which is set by # devstack/admin/etc. - subnet = self._list_subnets(network_id=self.network['id'])[0] + subnet = self.admin_manager.subnets_client.list_subnets( + network_id=self.network['id'])['subnets'][0] self.subnet = subnet def _create_security_group_for_test(self):