openstack/octavia
Code Issues Proposed changes

Don't use Tempest internal methods

Browse Source 
All changed methods are clearly internal methods of Tempest, and the
Tempest commit 64e6b4457c748f74bfb4fbf3860ab65b65ae9beb has removed
the internal methods and now the gate issue happens.
This patch makes this project to use better ones instead.

Related-Bug: #1667824
Change-Id: I901baea1010f05f393919e5ecdd16dc1b322b213
This commit is contained in:
Ken'ichi Ohmichi 2017-02-24 15:04:22 -08:00 committed by Michael Johnson
parent 97f4193b85
commit 6ea36282f4
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
octavia/tests/tempest/v1/scenario/base.py
View File

@ -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):

9
octavia/tests/tempest/v2/scenario/base.py
View File

@ -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):