diff options
| author | Ziad Sawalha <github@highbridgellc.com> | 2011-07-01 15:36:01 -0500 |
|---|---|---|
| committer | Ziad Sawalha <github@highbridgellc.com> | 2011-07-01 15:36:01 -0500 |
| commit | e9b406ea4bda2a34e64d52c86b7ace41a5f42c4c (patch) | |
| tree | 4cc3f72bc13ee7688c7967201fa7ceb6a758488c | |
| parent | 9d461d373757d0559248c468644d6d012f1720ee (diff) | |
Update auth test to account for generic service names
| -rwxr-xr-x | bin/sampledata.sh | 11 | ||||
| -rwxr-xr-x | keystone/test/unit/test_authentication.py | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/bin/sampledata.sh b/bin/sampledata.sh index 90e3c203..bec2d0c5 100755 --- a/bin/sampledata.sh +++ b/bin/sampledata.sh @@ -37,14 +37,21 @@ `dirname $0`/keystone-manage $* role grant Admin joeadmin 1234 `dirname $0`/keystone-manage $* role grant Admin joeadmin ANOTHER:TENANT -#endpointTemplates +#Keeping for compatibility for a while till dashboard catches up - endpointTemplates `dirname $0`/keystone-manage $* endpointTemplates add RegionOne swift http://swift.publicinternets.com/v1/AUTH_%tenant_id% http://swift.admin-nets.local:8080/ http://127.0.0.1:8080/v1/AUTH_%tenant_id% 1 0 `dirname $0`/keystone-manage $* endpointTemplates add RegionOne nova_compat http://nova.publicinternets.com/v1.0/ http://127.0.0.1:8774/v1.0 http://localhost:8774/v1.0 1 0 `dirname $0`/keystone-manage $* endpointTemplates add RegionOne nova http://nova.publicinternets.com/v1.1/ http://127.0.0.1:8774/v1.1 http://localhost:8774/v1.1 1 0 `dirname $0`/keystone-manage $* endpointTemplates add RegionOne glance http://glance.publicinternets.com/v1.1/%tenant_id% http://nova.admin-nets.local/v1.1/%tenant_id% http://127.0.0.1:9292/v1.1/%tenant_id% 1 0 `dirname $0`/keystone-manage $* endpointTemplates add RegionOne cdn http://cdn.publicinternets.com/v1.1/%tenant_id% http://cdn.admin-nets.local/v1.1/%tenant_id% http://127.0.0.1:7777/v1.1/%tenant_id% 1 0 + +#endpointTemplates +`dirname $0`/keystone-manage $* endpointTemplates add RegionOne object_store http://swift.publicinternets.com/v1/AUTH_%tenant_id% http://swift.admin-nets.local:8080/ http://127.0.0.1:8080/v1/AUTH_%tenant_id% 1 0 +`dirname $0`/keystone-manage $* endpointTemplates add RegionOne compute http://nova.publicinternets.com/v1.0/ http://127.0.0.1:8774/v1.0 http://localhost:8774/v1.0 1 0 +`dirname $0`/keystone-manage $* endpointTemplates add RegionOne compute_v1 http://nova.publicinternets.com/v1.1/ http://127.0.0.1:8774/v1.1 http://localhost:8774/v1.1 1 0 +`dirname $0`/keystone-manage $* endpointTemplates add RegionOne image http://glance.publicinternets.com/v1.1/%tenant_id% http://nova.admin-nets.local/v1.1/%tenant_id% http://127.0.0.1:9292/v1.1/%tenant_id% 1 0 +`dirname $0`/keystone-manage $* endpointTemplates add RegionOne cdn http://cdn.publicinternets.com/v1.1/%tenant_id% http://cdn.admin-nets.local/v1.1/%tenant_id% http://127.0.0.1:7777/v1.1/%tenant_id% 1 0 #Global endpointTemplate -`dirname $0`/keystone-manage $* endpointTemplates add RegionOne keystone http://keystone.publicinternets.com/v2.0 http://127.0.0.1:5001/v2.0 http://127.0.0.1:5000/v2.0 1 1 +`dirname $0`/keystone-manage $* endpointTemplates add RegionOne identity http://keystone.publicinternets.com/v2.0 http://127.0.0.1:5001/v2.0 http://127.0.0.1:5000/v2.0 1 1 # Groups diff --git a/keystone/test/unit/test_authentication.py b/keystone/test/unit/test_authentication.py index 5d492c44..b91ff75d 100755 --- a/keystone/test/unit/test_authentication.py +++ b/keystone/test/unit/test_authentication.py @@ -91,7 +91,7 @@ class AuthenticationTest(unittest.TestCase): #self.assertTrue(resp['x-storage-url']) self.assertTrue(resp['x-glance']) #Assert Existence of global endpoint - self.assertTrue(resp['x-keystone']) + self.assertTrue(resp['x-identity']) def test_a_authorize_user_disabled(self): header = httplib2.Http(".cache") |