Remove references to "tenant_id" in test_security_groups
Change-Id: I4cbeb5b0dff226ccb6c7d7893b4fa5a0b49a8f64 Related-Bug: #1858783
This commit is contained in:
parent
630ce1fb84
commit
cc92cc9f44
|
@ -272,19 +272,19 @@ class RbacSharedSecurityGroupTest(base.BaseAdminNetworkTest):
|
|||
name=data_utils.rand_name('test-sg'),
|
||||
project={'id': self.admin_client.tenant_id})
|
||||
|
||||
def _make_admin_sg_shared_to_tenant_id(self, tenant_id):
|
||||
def _make_admin_sg_shared_to_project_id(self, project_id):
|
||||
sg = self._create_security_group()
|
||||
rbac_policy = self.admin_client.create_rbac_policy(
|
||||
object_type='security_group',
|
||||
object_id=sg['id'],
|
||||
action='access_as_shared',
|
||||
target_tenant=tenant_id,
|
||||
target_tenant=project_id,
|
||||
)['rbac_policy']
|
||||
return {'security_group': sg, 'rbac_policy': rbac_policy}
|
||||
|
||||
@decorators.idempotent_id('2a41eb8f-2a35-11e9-bae9-acde48001122')
|
||||
def test_policy_target_update(self):
|
||||
res = self._make_admin_sg_shared_to_tenant_id(
|
||||
res = self._make_admin_sg_shared_to_project_id(
|
||||
self.client.tenant_id)
|
||||
# change to client2
|
||||
update_res = self.admin_client.update_rbac_policy(
|
||||
|
@ -298,7 +298,7 @@ class RbacSharedSecurityGroupTest(base.BaseAdminNetworkTest):
|
|||
|
||||
@decorators.idempotent_id('2a619a8a-2a35-11e9-90d9-acde48001122')
|
||||
def test_port_presence_prevents_policy_rbac_policy_deletion(self):
|
||||
res = self._make_admin_sg_shared_to_tenant_id(
|
||||
res = self._make_admin_sg_shared_to_project_id(
|
||||
self.client2.tenant_id)
|
||||
sg_id = res['security_group']['id']
|
||||
net = self.create_network(client=self.client2)
|
||||
|
@ -341,14 +341,14 @@ class RbacSharedSecurityGroupTest(base.BaseAdminNetworkTest):
|
|||
object_type='security_group', object_id=sg['id'],
|
||||
action='access_as_shared', target_tenant=self.client2.tenant_id)
|
||||
field_args = (('id',), ('id', 'action'), ('object_type', 'object_id'),
|
||||
('tenant_id', 'target_tenant'))
|
||||
('project_id', 'target_tenant'))
|
||||
for fields in field_args:
|
||||
res = self.admin_client.list_rbac_policies(fields=fields)
|
||||
self.assertEqual(set(fields), set(res['rbac_policies'][0].keys()))
|
||||
|
||||
@decorators.idempotent_id('2abf8f9e-2a35-11e9-85f7-acde48001122')
|
||||
def test_rbac_policy_show(self):
|
||||
res = self._make_admin_sg_shared_to_tenant_id(
|
||||
res = self._make_admin_sg_shared_to_project_id(
|
||||
self.client.tenant_id)
|
||||
p1 = res['rbac_policy']
|
||||
p2 = self.admin_client.create_rbac_policy(
|
||||
|
@ -384,7 +384,7 @@ class RbacSharedSecurityGroupTest(base.BaseAdminNetworkTest):
|
|||
|
||||
@decorators.idempotent_id('2aff3900-2a35-11e9-96b3-acde48001122')
|
||||
def test_regular_client_blocked_from_sharing_anothers_policy(self):
|
||||
sg = self._make_admin_sg_shared_to_tenant_id(
|
||||
sg = self._make_admin_sg_shared_to_project_id(
|
||||
self.client.tenant_id)['security_group']
|
||||
with testtools.ExpectedException(exceptions.BadRequest):
|
||||
self.client.create_rbac_policy(
|
||||
|
|
Loading…
Reference in New Issue