Replace the usage of 'admin_manager' with 'os_admin'
In tempest, alias 'admin_manager' has been moved to 'os_admin' in version Pike, and it will be removed in version Queens [1]. The other usages which also need to be replaced, are listed below: * manager > os_primary [2] * os_adm > os_admin [3] * os > os_primary [4] [1] https://review.openstack.org/#/c/467852/ [2] https://review.openstack.org/#/c/468036/ [3] https://review.openstack.org/#/c/467605/ [4] https://review.openstack.org/#/c/466991/ Change-Id: If8880565ba6a70b1b1419394f4706fe37cfff1c4
This commit is contained in:
parent
e17328cf94
commit
e12b6614fa
@ -95,7 +95,7 @@ class SecServicesMappingNegativeTest(base.BaseSharesTest):
|
||||
not CONF.share.multitenancy_enabled, "Only for multitenancy.")
|
||||
def test_delete_ss_from_sn_used_by_share_server(self):
|
||||
sn = self.shares_client.get_share_network(
|
||||
self.os.shares_client.share_network_id)
|
||||
self.os_primary.shares_client.share_network_id)
|
||||
fresh_sn = self.create_share_network(
|
||||
neutron_net_id=sn["neutron_net_id"],
|
||||
neutron_subnet_id=sn["neutron_subnet_id"])
|
||||
|
@ -81,7 +81,7 @@ class SecurityServicesNegativeTest(base.BaseSharesTest):
|
||||
ss = self.create_security_service(**ss_data)
|
||||
|
||||
sn = self.shares_client.get_share_network(
|
||||
self.os.shares_client.share_network_id)
|
||||
self.os_primary.shares_client.share_network_id)
|
||||
fresh_sn = self.create_share_network(
|
||||
neutron_net_id=sn["neutron_net_id"],
|
||||
neutron_subnet_id=sn["neutron_subnet_id"])
|
||||
|
@ -749,7 +749,7 @@ class NetworkScenarioTest(ScenarioTest):
|
||||
:returns: True if subnet with cidr already exist in tenant
|
||||
False else
|
||||
"""
|
||||
cidr_in_use = self.admin_manager.subnets_client.list_subnets(
|
||||
cidr_in_use = self.os_admin.subnets_client.list_subnets(
|
||||
tenant_id=tenant_id, cidr=cidr)['subnets']
|
||||
return len(cidr_in_use) != 0
|
||||
|
||||
@ -797,7 +797,7 @@ class NetworkScenarioTest(ScenarioTest):
|
||||
return subnet
|
||||
|
||||
def _get_server_port_id_and_ip4(self, server, ip_addr=None):
|
||||
ports = self.admin_manager.ports_client.list_ports(
|
||||
ports = self.os_admin.ports_client.list_ports(
|
||||
device_id=server['id'], fixed_ip=ip_addr)['ports']
|
||||
# A port can have more than one IP address in some cases.
|
||||
# If the network is dual-stack (IPv4 + IPv6), this port is associated
|
||||
@ -827,7 +827,7 @@ class NetworkScenarioTest(ScenarioTest):
|
||||
return port_map[0]
|
||||
|
||||
def _get_network_by_name(self, network_name):
|
||||
net = self.admin_manager.networks_client.list_networks(
|
||||
net = self.os_admin.networks_client.list_networks(
|
||||
name=network_name)['networks']
|
||||
self.assertNotEqual(len(net), 0,
|
||||
"Unable to get network by name: %s" % network_name)
|
||||
|
@ -222,8 +222,9 @@ class ShareBasicOpsBase(manager.ShareScenarioTest):
|
||||
|
||||
def wait_for_active_instance(self, instance_id):
|
||||
waiters.wait_for_server_status(
|
||||
self.manager.servers_client, instance_id, "ACTIVE")
|
||||
return self.manager.servers_client.show_server(instance_id)["server"]
|
||||
self.os_primary.servers_client, instance_id, "ACTIVE")
|
||||
return self.os_primary.servers_client.show_server(
|
||||
instance_id)["server"]
|
||||
|
||||
@tc.attr(base.TAG_POSITIVE, base.TAG_BACKEND)
|
||||
def test_mount_share_one_vm(self):
|
||||
|
Loading…
Reference in New Issue
Block a user