x
/
mogan
Code Issues Proposed changes

Merge "Tempest: use network client than compute client to retrive network"

This commit is contained in:
Jenkins 2017-07-29 01:49:17 +00:00 committed by Gerrit Code Review
parent aa4396c9d1 4174d1fae2
commit b58a2d26fc
2 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mogan/tests/tempest/api/base.py
View File

@ -46,7 +46,7 @@ class BaseBaremetalComputeTest(tempest.test.BaseTestCase):
def setup_clients(cls):
super(BaseBaremetalComputeTest, cls).setup_clients()
cls.baremetal_compute_client = cls.os_admin.baremetal_compute_client
cls.compute_networks_client = cls.os_admin.compute_networks_client
cls.networks_client = cls.os_admin.networks_client
cls.baremetal_node_client = cls.os_admin.baremetal_node_client
cls.network_floatingip_client =\
cls.os_admin.network_floatingip_client
@ -63,8 +63,8 @@ class BaseBaremetalComputeTest(tempest.test.BaseTestCase):
@classmethod
def _get_net_id(cls):
for net in cls.compute_networks_client.list_networks()['networks']:
if net['label'] == CONF.compute.fixed_network_name:
for net in cls.networks_client.list_networks()['networks']:
if net['name'] == CONF.compute.fixed_network_name:
return net['id']
else:
raise lib_exc.TempestException('Could not find fixed network!')

19
mogan/tests/tempest/service/client.py
View File

@ -16,9 +16,9 @@
from oslo_serialization import jsonutils as json
from tempest import config
from tempest.lib.common import rest_client
from tempest.lib.services.compute import networks_client as network_cli
from tempest.lib.services.image.v2 import images_client as image_cli
from tempest.lib.services.network import floating_ips_client as fip_cli
from tempest.lib.services.network import networks_client as network_cli
from tempest import manager
CONF = config.CONF
@ -301,7 +301,7 @@ class Manager(manager.Manager):
load_clients = [
'baremetal_compute_client',
'compute_networks_client',
'networks_client',
'image_client_v2',
'baremetal_node_client',
'network_floatingip_client'
@ -321,15 +321,6 @@ class Manager(manager.Manager):
}
baremetal_compute_params.update(default_params)
compute_params = {
'service': CONF.compute.catalog_type,
'region': CONF.compute.region or CONF.identity.region,
'endpoint_type': CONF.compute.endpoint_type,
'build_interval': CONF.compute.build_interval,
'build_timeout': CONF.compute.build_timeout,
}
compute_params.update(default_params)
image_params = {
'service': CONF.image.catalog_type,
'region': CONF.image.region or CONF.identity.region,
@ -364,10 +355,10 @@ class Manager(manager.Manager):
self.baremetal_compute_client = BaremetalComputeClient(
self.auth_provider, **self.baremetal_compute_params)
def set_compute_networks_client(self):
self.compute_networks_client = network_cli.NetworksClient(
def set_networks_client(self):
self.networks_client = network_cli.NetworksClient(
self.auth_provider,
**self.compute_params)
**self.network_params)
def set_network_floatingip_client(self):
self.network_floatingip_client = fip_cli.FloatingIPsClient(