x/tuskar-ui
Code Issues Proposed changes

Merge "Orchestration endpoints for keystone test data"

Browse Source
This commit is contained in:
Jenkins 2013-05-27 13:37:13 +00:00 committed by Gerrit Code Review
commit 4b9cd0040d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openstack_dashboard/dashboards/admin/info/tests.py
View File

@ -47,7 +47,8 @@ class ServicesViewTests(test.BaseAdminViewTests):
'<Service: identity (native backend)>', '<Service: identity (native backend)>',
'<Service: object-store>', '<Service: object-store>',
'<Service: network>', '<Service: network>',
'<Service: ec2>']) '<Service: ec2>',
'<Service: orchestration>'])
quotas_tab = res.context['tab_group'].get_tab('quotas') quotas_tab = res.context['tab_group'].get_tab('quotas')
self.assertQuerysetEqual(quotas_tab._tables['quotas'].data, self.assertQuerysetEqual(quotas_tab._tables['quotas'].data,

10
openstack_dashboard/test/test_data/keystone_data.py
View File

@ -82,7 +82,15 @@ SERVICE_CATALOG = [
{"region": "RegionOne", {"region": "RegionOne",
"adminURL": "http://admin.nova.example.com:8773/services/Admin", "adminURL": "http://admin.nova.example.com:8773/services/Admin",
"publicURL": "http://public.nova.example.com:8773/services/Cloud", "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"}]}
] ]