openstack/python-keystoneclient
Code Issues Proposed changes

Add service catalog to domain scoped token fixture

Browse Source 
This was simply forgotten previously and testing that required a service
catalog was done with the project token. This has led to some problems
of not testing the domain paths correctly.

Fix the one test that was incorrectly relying on an empty service
catalog being returned from a domain scoped token.

Change-Id: I66e3a9302d6a73ba17d4ed45f2366d9bb91461ab
This commit is contained in:
Jamie Lennox
2013-12-17 16:14:20 +10:00
parent 6ad5f2f4cc
commit 2ae9655a66
2 changed files with 83 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
keystoneclient/tests/v3/client_fixtures.py
View File

@@ -38,7 +38,88 @@ DOMAIN_SCOPED_TOKEN = {
'methods': [
'password'
],
'catalog': {},
'catalog': [{
'endpoints': [{
'url':
'http://public.com:8776/v1/None',
'region': 'RegionOne',
'interface': 'public'
}, {
'url':
'http://internal:8776/v1/None',
'region': 'RegionOne',
'interface': 'internal'
}, {
'url':
'http://admin:8776/v1/None',
'region': 'RegionOne',
'interface': 'admin'
}],
'type': 'volume'
}, {
'endpoints': [{
'url': 'http://public.com:9292/v1',
'region': 'RegionOne',
'interface': 'public'
}, {
'url': 'http://internal:9292/v1',
'region': 'RegionOne',
'interface': 'internal'
}, {
'url': 'http://admin:9292/v1',
'region': 'RegionOne',
'interface': 'admin'
}],
'type': 'image'
}, {
'endpoints': [{
'url':
'http://public.com:8774/v1.1/None',
'region': 'RegionOne',
'interface': 'public'
}, {
'url':
'http://internal:8774/v1.1/None',
'region': 'RegionOne',
'interface': 'internal'
}, {
'url':
'http://admin:8774/v1.1/None',
'region': 'RegionOne',
'interface': 'admin'
}],
'type': 'compute'
}, {
'endpoints': [{
'url': 'http://public.com:8773/services/Cloud',
'region': 'RegionOne',
'interface': 'public'
}, {
'url': 'http://internal:8773/services/Cloud',
'region': 'RegionOne',
'interface': 'internal'
}, {
'url': 'http://admin:8773/services/Admin',
'region': 'RegionOne',
'interface': 'admin'
}],
'type': 'ec2'
}, {
'endpoints': [{
'url': 'http://public.com:5000/v3',
'region': 'RegionOne',
'interface': 'public'
}, {
'url': 'http://internal:5000/v3',
'region': 'RegionOne',
'interface': 'internal'
}, {
'url': 'http://admin:35357/v3',
'region': 'RegionOne',
'interface': 'admin'
}],
'type': 'identity'
}],
'expires_at': '2010-11-01T03:32:15-05:00',
'user': {
'domain': {

2
keystoneclient/tests/v3/test_access.py
View File

@@ -77,7 +77,7 @@ class AccessInfoTest(utils.TestCase):
self.assertTrue(auth_ref)
self.assertIn('methods', auth_ref)
self.assertIn('catalog', auth_ref)
self.assertFalse(auth_ref['catalog'])
self.assertTrue(auth_ref['catalog'])
self.assertEqual(auth_ref.auth_token,
'3e2813b7ba0b4006840c3825860b86ed')