Rename 'tenant' to 'project' in tempest-plugin
This patch is for renaming in tempest plugin side. Change-Id: I8890eff2b97ea3f1aeeae133cefddbd1cddea5f9 Depends-On: Id434c44e0263711fe09094007ce202d42c2405ab
This commit is contained in:
parent
5ee97781a1
commit
d6d205168e
@ -54,7 +54,7 @@ class TestContainer(base.BaseZunTest):
|
|||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
hosts = []
|
hosts = []
|
||||||
_, model = self.os_admin.container_client.list_containers(
|
_, model = self.os_admin.container_client.list_containers(
|
||||||
params={'all_tenants': True})
|
params={'all_projects': True})
|
||||||
for c in model.containers:
|
for c in model.containers:
|
||||||
if c['uuid'] in self.containers:
|
if c['uuid'] in self.containers:
|
||||||
if c['host'] and c['host'] not in hosts:
|
if c['host'] and c['host'] not in hosts:
|
||||||
@ -64,7 +64,7 @@ class TestContainer(base.BaseZunTest):
|
|||||||
# we have to be admin to do this action.
|
# we have to be admin to do this action.
|
||||||
self.os_admin.container_client.delete_container(
|
self.os_admin.container_client.delete_container(
|
||||||
c['uuid'],
|
c['uuid'],
|
||||||
params={'force': True, 'all_tenants': True})
|
params={'force': True, 'all_projects': True})
|
||||||
self.container_client.ensure_container_deleted(c['uuid'])
|
self.container_client.ensure_container_deleted(c['uuid'])
|
||||||
|
|
||||||
# cleanup the network resources
|
# cleanup the network resources
|
||||||
@ -506,7 +506,7 @@ class TestContainer(base.BaseZunTest):
|
|||||||
if container:
|
if container:
|
||||||
if not hasattr(container, 'host'):
|
if not hasattr(container, 'host'):
|
||||||
_, container = self.os_admin.container_client.get_container(
|
_, container = self.os_admin.container_client.get_container(
|
||||||
container.uuid, params={'all_tenants': True})
|
container.uuid, params={'all_projects': True})
|
||||||
host = container.host
|
host = container.host
|
||||||
# NOTE(kiennt): By default, devstack-plugin-container will
|
# NOTE(kiennt): By default, devstack-plugin-container will
|
||||||
# set docker_api_url = {
|
# set docker_api_url = {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user