Fix some tempest deprecation warnings
Saw this recently in a tempest test run:
DeprecationWarning: Read-only property 'manager'
has moved to 'os_primary' in version 'Pike' and
will be removed in version 'Queens'
Tempest BaseTestCase class credential names have changed
from manager->os_primary, admin->os_admin, and
alt_manager->os_alt, so we should start using them.
Closes-bug: #1697588
Change-Id: I44de8046fc983bf6780c310e8db174a5902c2826
This commit is contained in:
Brian Haley
Brian Haley
parent
05c22d6199
commit
bd9fc827c6
neutron/tests/tempest
@ -54,7 +54,7 @@ class RoutersNegativePolicyTest(RoutersNegativeTestBase):
|
||||
@test.attr(type='negative')
|
||||
@decorators.idempotent_id('159f576d-a423-46b5-b501-622694c02f6b')
|
||||
def test_add_interface_wrong_tenant(self):
|
||||
client2 = self.alt_manager.network_client
|
||||
client2 = self.os_alt.network_client
|
||||
network = client2.create_network()['network']
|
||||
self.addCleanup(client2.delete_network, network['id'])
|
||||
subnet = self.create_subnet(network, client=client2)
|
||||
|
||||
@ -71,7 +71,7 @@ class BaseTempestTestCase(base_api.BaseNetworkTest):
|
||||
if not security_groups:
|
||||
security_groups = [{'name': 'default'}]
|
||||
|
||||
server = self.manager.servers_client.create_server(
|
||||
server = self.os_primary.servers_client.create_server(
|
||||
name=name,
|
||||
flavorRef=flavor_ref,
|
||||
imageRef=image_ref,
|
||||
@ -81,9 +81,9 @@ class BaseTempestTestCase(base_api.BaseNetworkTest):
|
||||
|
||||
self.addCleanup(test_utils.call_and_ignore_notfound_exc,
|
||||
waiters.wait_for_server_termination,
|
||||
self.manager.servers_client, server['server']['id'])
|
||||
self.os_primary.servers_client, server['server']['id'])
|
||||
self.addCleanup(test_utils.call_and_ignore_notfound_exc,
|
||||
self.manager.servers_client.delete_server,
|
||||
self.os_primary.servers_client.delete_server,
|
||||
server['server']['id'])
|
||||
return server
|
||||
|
||||
@ -155,7 +155,7 @@ class BaseTempestTestCase(base_api.BaseNetworkTest):
|
||||
return router
|
||||
|
||||
def create_and_associate_floatingip(self, port_id):
|
||||
fip = self.manager.network_client.create_floatingip(
|
||||
fip = self.os_primary.network_client.create_floatingip(
|
||||
CONF.network.public_network_id,
|
||||
port_id=port_id)['floatingip']
|
||||
self.floating_ips.append(fip)
|
||||
@ -172,7 +172,7 @@ class BaseTempestTestCase(base_api.BaseNetworkTest):
|
||||
self.subnet = self.create_subnet(self.network)
|
||||
LOG.debug("Created subnet %s", self.subnet['id'])
|
||||
|
||||
secgroup = self.manager.network_client.create_security_group(
|
||||
secgroup = self.os_primary.network_client.create_security_group(
|
||||
name=data_utils.rand_name('secgroup-'))
|
||||
LOG.debug("Created security group %s",
|
||||
secgroup['security_group']['name'])
|
||||
@ -189,7 +189,7 @@ class BaseTempestTestCase(base_api.BaseNetworkTest):
|
||||
key_name=self.keypair['name'],
|
||||
networks=[{'uuid': self.network['id']}],
|
||||
security_groups=[{'name': secgroup['security_group']['name']}])
|
||||
waiters.wait_for_server_status(self.manager.servers_client,
|
||||
waiters.wait_for_server_status(self.os_primary.servers_client,
|
||||
self.server['server']['id'],
|
||||
constants.SERVER_STATUS_ACTIVE)
|
||||
port = self.client.list_ports(network_id=self.network['id'],
|
||||
@ -211,12 +211,12 @@ class BaseTempestTestCase(base_api.BaseNetworkTest):
|
||||
LOG.debug('Console output not supported, cannot log')
|
||||
return
|
||||
if not servers:
|
||||
servers = self.manager.servers_client.list_servers()
|
||||
servers = self.os_primary.servers_client.list_servers()
|
||||
servers = servers['servers']
|
||||
for server in servers:
|
||||
try:
|
||||
console_output = (
|
||||
self.manager.servers_client.get_console_output(
|
||||
self.os_primary.servers_client.get_console_output(
|
||||
server['id'])['output'])
|
||||
LOG.debug('Console output for %s\nbody=\n%s',
|
||||
server['id'], console_output)
|
||||
|
||||
@ -153,19 +153,19 @@ class QoSTest(base.BaseTempestTestCase):
|
||||
ssh_client = ssh.Client(self.fip['floating_ip_address'],
|
||||
CONF.validation.image_ssh_user,
|
||||
pkey=self.keypair['private_key'])
|
||||
policy = self.admin_manager.network_client.create_qos_policy(
|
||||
policy = self.os_admin.network_client.create_qos_policy(
|
||||
name='test-policy',
|
||||
description='test-qos-policy',
|
||||
shared=True)
|
||||
policy_id = policy['policy']['id']
|
||||
self.admin_manager.network_client.create_bandwidth_limit_rule(
|
||||
self.os_admin.network_client.create_bandwidth_limit_rule(
|
||||
policy_id, max_kbps=constants.LIMIT_KILO_BITS_PER_SECOND,
|
||||
max_burst_kbps=constants.LIMIT_KILO_BITS_PER_SECOND)
|
||||
port = self.client.list_ports(network_id=self.network['id'],
|
||||
device_id=self.server[
|
||||
'server']['id'])['ports'][0]
|
||||
self.admin_manager.network_client.update_port(port['id'],
|
||||
qos_policy_id=policy_id)
|
||||
self.os_admin.network_client.update_port(port['id'],
|
||||
qos_policy_id=policy_id)
|
||||
self._create_file_for_bw_tests(ssh_client)
|
||||
utils.wait_until_true(lambda: self._check_bw(
|
||||
ssh_client,
|
||||
|
||||
@ -86,7 +86,7 @@ class TrunkTest(base.BaseTempestTestCase):
|
||||
def _detach_and_delete_trunk(self, server, trunk):
|
||||
# we have to detach the interface from the server before
|
||||
# the trunk can be deleted.
|
||||
self.manager.compute.InterfacesClient().delete_interface(
|
||||
self.os_primary.compute.InterfacesClient().delete_interface(
|
||||
server['id'], trunk['port_id'])
|
||||
|
||||
def is_port_detached():
|
||||
@ -137,7 +137,7 @@ class TrunkTest(base.BaseTempestTestCase):
|
||||
}
|
||||
|
||||
def _wait_for_server(self, server):
|
||||
waiters.wait_for_server_status(self.manager.servers_client,
|
||||
waiters.wait_for_server_status(self.os_primary.servers_client,
|
||||
server['server']['id'],
|
||||
constants.SERVER_STATUS_ACTIVE)
|
||||
self.check_connectivity(server['fip']['floating_ip_address'],
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user