diff --git a/keystoneclient/fixture/v2.py b/keystoneclient/fixture/v2.py index cd4207b5f..81bc70ea4 100644 --- a/keystoneclient/fixture/v2.py +++ b/keystoneclient/fixture/v2.py @@ -166,7 +166,7 @@ class Token(dict): @property def trust_id(self): - return self.root.setdefault('trust', {})['id'] + return self.root.setdefault('trust', {}).get('id') @trust_id.setter def trust_id(self, value): diff --git a/keystoneclient/tests/unit/test_fixtures.py b/keystoneclient/tests/unit/test_fixtures.py index f136e7020..3e41b4045 100644 --- a/keystoneclient/tests/unit/test_fixtures.py +++ b/keystoneclient/tests/unit/test_fixtures.py @@ -35,6 +35,7 @@ class V2TokenTests(utils.TestCase): self.assertEqual(user_id, token['access']['user']['id']) self.assertEqual(user_name, token.user_name) self.assertEqual(user_name, token['access']['user']['name']) + self.assertIsNone(token.trust_id) def test_tenant_scoped(self): tenant_id = uuid.uuid4().hex @@ -48,6 +49,7 @@ class V2TokenTests(utils.TestCase): self.assertEqual(tenant_name, token.tenant_name) tn = token['access']['token']['tenant']['name'] self.assertEqual(tenant_name, tn) + self.assertIsNone(token.trust_id) def test_trust_scoped(self): trust_id = uuid.uuid4().hex