Reuse project scoped token check for trusts
After some refactoring [1][2][3], the assertValidProjectTrustScopedTokenResponse method was just a wrapper around assertValidProjectScopedTokenResponse. This commit makes it so that tests just use the later directly. [1] https://review.openstack.org/#/c/254258 [2] https://review.openstack.org/#/c/253671 [3] https://review.openstack.org/#/c/253670 Change-Id: I97a4c4b578403c8dfcd93b821964ed36b8b168ab
This commit is contained in:
parent
fe14d330c7
commit
0d7e29f436
|
@ -747,18 +747,6 @@ class RestfulTestCase(unit.SQLDriverOverrides, rest.RestfulTestCase,
|
||||||
|
|
||||||
return token
|
return token
|
||||||
|
|
||||||
def assertValidProjectTrustScopedTokenResponse(self, r, *args, **kwargs):
|
|
||||||
token = self.assertValidProjectScopedTokenResponse(r, *args, **kwargs)
|
|
||||||
|
|
||||||
trust = token.get('OS-TRUST:trust')
|
|
||||||
self.assertIsNotNone(trust)
|
|
||||||
self.assertIsNotNone(trust.get('id'))
|
|
||||||
self.assertIsInstance(trust.get('impersonation'), bool)
|
|
||||||
self.assertIsNotNone(trust.get('trustor_user'))
|
|
||||||
self.assertIsNotNone(trust.get('trustee_user'))
|
|
||||||
self.assertIsNotNone(trust['trustor_user'].get('id'))
|
|
||||||
self.assertIsNotNone(trust['trustee_user'].get('id'))
|
|
||||||
|
|
||||||
def assertValidDomainScopedTokenResponse(self, r, *args, **kwargs):
|
def assertValidDomainScopedTokenResponse(self, r, *args, **kwargs):
|
||||||
token = self.assertValidScopedTokenResponse(r, *args, **kwargs)
|
token = self.assertValidScopedTokenResponse(r, *args, **kwargs)
|
||||||
|
|
||||||
|
|
|
@ -3709,7 +3709,7 @@ class TestTrustAuth(test_v3.RestfulTestCase):
|
||||||
password=self.trustee_user['password'],
|
password=self.trustee_user['password'],
|
||||||
trust_id=trust_id)
|
trust_id=trust_id)
|
||||||
r = self.v3_create_token(auth_data)
|
r = self.v3_create_token(auth_data)
|
||||||
self.assertValidProjectTrustScopedTokenResponse(
|
self.assertValidProjectScopedTokenResponse(
|
||||||
r, self.trustee_user)
|
r, self.trustee_user)
|
||||||
trust_token = r.headers['X-Subject-Token']
|
trust_token = r.headers['X-Subject-Token']
|
||||||
self.delete('/OS-TRUST/trusts/%(trust_id)s' % {
|
self.delete('/OS-TRUST/trusts/%(trust_id)s' % {
|
||||||
|
@ -3820,7 +3820,7 @@ class TestTrustAuth(test_v3.RestfulTestCase):
|
||||||
trust_id=trust['id'])
|
trust_id=trust['id'])
|
||||||
r = self.v3_create_token(auth_data)
|
r = self.v3_create_token(auth_data)
|
||||||
|
|
||||||
self.assertValidProjectTrustScopedTokenResponse(r, self.user)
|
self.assertValidProjectScopedTokenResponse(r, self.user)
|
||||||
trust_token = r.headers.get('X-Subject-Token')
|
trust_token = r.headers.get('X-Subject-Token')
|
||||||
|
|
||||||
self.get('/OS-TRUST/trusts?trustor_user_id=%s' %
|
self.get('/OS-TRUST/trusts?trustor_user_id=%s' %
|
||||||
|
|
|
@ -306,7 +306,7 @@ class TestCredentialTrustScoped(test_v3.RestfulTestCase):
|
||||||
password=self.trustee_user['password'],
|
password=self.trustee_user['password'],
|
||||||
trust_id=trust['id'])
|
trust_id=trust['id'])
|
||||||
r = self.v3_create_token(auth_data)
|
r = self.v3_create_token(auth_data)
|
||||||
self.assertValidProjectTrustScopedTokenResponse(r, self.user)
|
self.assertValidProjectScopedTokenResponse(r, self.user)
|
||||||
trust_id = r.result['token']['OS-TRUST:trust']['id']
|
trust_id = r.result['token']['OS-TRUST:trust']['id']
|
||||||
token_id = r.headers.get('X-Subject-Token')
|
token_id = r.headers.get('X-Subject-Token')
|
||||||
|
|
||||||
|
|
|
@ -261,7 +261,7 @@ class TestTrustOperations(test_v3.RestfulTestCase):
|
||||||
password=self.default_domain_user['password'],
|
password=self.default_domain_user['password'],
|
||||||
trust_id=trust['id'])
|
trust_id=trust['id'])
|
||||||
r = self.v3_create_token(auth_data)
|
r = self.v3_create_token(auth_data)
|
||||||
self.assertValidProjectTrustScopedTokenResponse(
|
self.assertValidProjectScopedTokenResponse(
|
||||||
r, self.default_domain_user)
|
r, self.default_domain_user)
|
||||||
token = r.headers.get('X-Subject-Token')
|
token = r.headers.get('X-Subject-Token')
|
||||||
|
|
||||||
|
@ -296,7 +296,7 @@ class TestTrustOperations(test_v3.RestfulTestCase):
|
||||||
password=self.trustee_user['password'],
|
password=self.trustee_user['password'],
|
||||||
trust_id=trust['id'])
|
trust_id=trust['id'])
|
||||||
r = self.v3_create_token(auth_data)
|
r = self.v3_create_token(auth_data)
|
||||||
self.assertValidProjectTrustScopedTokenResponse(
|
self.assertValidProjectScopedTokenResponse(
|
||||||
r, self.trustee_user)
|
r, self.trustee_user)
|
||||||
token = r.headers.get('X-Subject-Token')
|
token = r.headers.get('X-Subject-Token')
|
||||||
|
|
||||||
|
@ -337,7 +337,7 @@ class TestTrustOperations(test_v3.RestfulTestCase):
|
||||||
password=trustee_user['password'],
|
password=trustee_user['password'],
|
||||||
trust_id=trust['id'])
|
trust_id=trust['id'])
|
||||||
r = self.v3_create_token(auth_data)
|
r = self.v3_create_token(auth_data)
|
||||||
self.assertValidProjectTrustScopedTokenResponse(r, trustee_user)
|
self.assertValidProjectScopedTokenResponse(r, trustee_user)
|
||||||
token = r.headers.get('X-Subject-Token')
|
token = r.headers.get('X-Subject-Token')
|
||||||
|
|
||||||
# ensure the token is invalid against v2
|
# ensure the token is invalid against v2
|
||||||
|
@ -366,8 +366,8 @@ class TestTrustOperations(test_v3.RestfulTestCase):
|
||||||
resp = self.v3_create_token(auth_data)
|
resp = self.v3_create_token(auth_data)
|
||||||
resp_body = resp.json_body['token']
|
resp_body = resp.json_body['token']
|
||||||
|
|
||||||
self.assertValidProjectTrustScopedTokenResponse(resp,
|
self.assertValidProjectScopedTokenResponse(resp,
|
||||||
self.trustee_user)
|
self.trustee_user)
|
||||||
self.assertEqual(self.trustee_user['id'], resp_body['user']['id'])
|
self.assertEqual(self.trustee_user['id'], resp_body['user']['id'])
|
||||||
self.assertEqual(self.trustee_user['name'], resp_body['user']['name'])
|
self.assertEqual(self.trustee_user['name'], resp_body['user']['name'])
|
||||||
self.assertEqual(self.domain['id'], resp_body['user']['domain']['id'])
|
self.assertEqual(self.domain['id'], resp_body['user']['domain']['id'])
|
||||||
|
@ -396,7 +396,7 @@ class TestTrustOperations(test_v3.RestfulTestCase):
|
||||||
resp = self.v3_create_token(auth_data)
|
resp = self.v3_create_token(auth_data)
|
||||||
resp_body = resp.json_body['token']
|
resp_body = resp.json_body['token']
|
||||||
|
|
||||||
self.assertValidProjectTrustScopedTokenResponse(resp, self.user)
|
self.assertValidProjectScopedTokenResponse(resp, self.user)
|
||||||
self.assertEqual(self.user['id'], resp_body['user']['id'])
|
self.assertEqual(self.user['id'], resp_body['user']['id'])
|
||||||
self.assertEqual(self.user['name'], resp_body['user']['name'])
|
self.assertEqual(self.user['name'], resp_body['user']['name'])
|
||||||
self.assertEqual(self.domain['id'], resp_body['user']['domain']['id'])
|
self.assertEqual(self.domain['id'], resp_body['user']['domain']['id'])
|
||||||
|
|
Loading…
Reference in New Issue