x/tuskar-ui
Code Issues Proposed changes

Merge remote branch '4p/master' into remove_admin_hack

Browse Source
This commit is contained in:
Anthony Young
2011-09-29 16:53:42 -07:00
parent 121d1c906e bd917f3541
commit 62be2fe824
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
django-openstack/django_openstack/api.py
View File

@@ -352,7 +352,7 @@ def account_api(request):
def glance_api(request): def glance_api(request):
o = urlparse(url_for(request, 'glance')) o = urlparse(url_for(request, 'image'))
LOG.debug('glance_api connection created for host "%s:%d"' % LOG.debug('glance_api connection created for host "%s:%d"' %
(o.hostname, o.port)) (o.hostname, o.port))
return glance.client.Client(o.hostname, o.port, auth_tok=request.user.token) return glance.client.Client(o.hostname, o.port, auth_tok=request.user.token)

2
django-openstack/django_openstack/test.py
View File

@@ -57,7 +57,7 @@ class TestCase(test.TestCase):
"internalURL": "http://glance/glanceapi/internal", "internalURL": "http://glance/glanceapi/internal",
"publicURL": "http://glance/glanceapi/piblic" "publicURL": "http://glance/glanceapi/piblic"
}], }],
"type": "glance", "type": "image",
"name": "glance" "name": "glance"
}, { }, {
"endpoints": [{ "endpoints": [{

8
django-openstack/django_openstack/tests/api_tests.py
View File

@@ -309,13 +309,13 @@ class ApiHelperTests(test.TestCase):
GLANCE_URL = 'http://glance/glanceapi/' GLANCE_URL = 'http://glance/glanceapi/'
NOVA_URL = 'http://nova/novapi/' NOVA_URL = 'http://nova/novapi/'
url = api.url_for(self.request, 'glance') url = api.url_for(self.request, 'image')
self.assertEqual(url, GLANCE_URL + 'internal') self.assertEqual(url, GLANCE_URL + 'internal')
url = api.url_for(self.request, 'glance', admin=False) url = api.url_for(self.request, 'image', admin=False)
self.assertEqual(url, GLANCE_URL + 'internal') self.assertEqual(url, GLANCE_URL + 'internal')
url = api.url_for(self.request, 'glance', admin=True) url = api.url_for(self.request, 'image', admin=True)
self.assertEqual(url, GLANCE_URL + 'admin') self.assertEqual(url, GLANCE_URL + 'admin')
url = api.url_for(self.request, 'compute') url = api.url_for(self.request, 'compute')
@@ -1225,7 +1225,7 @@ class GlanceApiTests(test.TestCase):
client_instance.auth_tok = TEST_TOKEN client_instance.auth_tok = TEST_TOKEN
self.mox.StubOutWithMock(api, 'url_for') self.mox.StubOutWithMock(api, 'url_for')
api.url_for(IsA(http.HttpRequest), 'glance').AndReturn(TEST_URL) api.url_for(IsA(http.HttpRequest), 'image').AndReturn(TEST_URL)
self.mox.ReplayAll() self.mox.ReplayAll()