diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-05-27 13:37:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-05-27 13:37:13 +0000 |
| commit | 4b9cd0040dc6a77fbc1e91e3bec71b5bf515e1c1 (patch) | |
| tree | e0e5adc32ac4f40a476a5743a6b8a7b6bda73be8 | |
| parent | 24d9f140f5584a6360a1b073ffc1e3bfd69ca6d6 (diff) | |
| parent | 7bf24bfa1298e51b290530de823f09fc73b35d93 (diff) | |
| download | horizon-4b9cd0040dc6a77fbc1e91e3bec71b5bf515e1c1.tar.gz | |
Merge "Orchestration endpoints for keystone test data"
| -rw-r--r-- | openstack_dashboard/dashboards/admin/info/tests.py | 3 | ||||
| -rw-r--r-- | openstack_dashboard/test/test_data/keystone_data.py | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/openstack_dashboard/dashboards/admin/info/tests.py b/openstack_dashboard/dashboards/admin/info/tests.py index 9bb88fdf3..ae974d2c6 100644 --- a/openstack_dashboard/dashboards/admin/info/tests.py +++ b/openstack_dashboard/dashboards/admin/info/tests.py @@ -47,7 +47,8 @@ class ServicesViewTests(test.BaseAdminViewTests): '<Service: identity (native backend)>', '<Service: object-store>', '<Service: network>', - '<Service: ec2>']) + '<Service: ec2>', + '<Service: orchestration>']) quotas_tab = res.context['tab_group'].get_tab('quotas') self.assertQuerysetEqual(quotas_tab._tables['quotas'].data, diff --git a/openstack_dashboard/test/test_data/keystone_data.py b/openstack_dashboard/test/test_data/keystone_data.py index 9832c7da5..ad343bc02 100644 --- a/openstack_dashboard/test/test_data/keystone_data.py +++ b/openstack_dashboard/test/test_data/keystone_data.py @@ -82,7 +82,15 @@ SERVICE_CATALOG = [ {"region": "RegionOne", "adminURL": "http://admin.nova.example.com:8773/services/Admin", "publicURL": "http://public.nova.example.com:8773/services/Cloud", - "internalURL": "http://int.nova.example.com:8773/services/Cloud"}]} + "internalURL": "http://int.nova.example.com:8773/services/Cloud"}]}, + {"type": "orchestration", + "name": "Heat", + "endpoints_links": [], + "endpoints": [ + {"region": "RegionOne", + "adminURL": "http://admin.heat.example.com:8004/v1", + "publicURL": "http://public.heat.example.com:8004/v1", + "internalURL": "http://int.heat.example.com:8004/v1"}]} ] |