openstack/glance
Code Issues Proposed changes

Merge "URLs to glance need to be absolute."

Browse Source
This commit is contained in:
Jenkins 2012-08-02 04:00:19 +00:00 committed by Gerrit Code Review
commit da8e3677f6
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/glance-replicator
View File

@ -89,7 +89,7 @@ class ImageService(object):
if self.auth_token: if self.auth_token:
headers.setdefault('x-auth-token', self.auth_token) headers.setdefault('x-auth-token', self.auth_token)
logging.debug(_('Request: %(method)s http://%(server)s:%(port)s/' logging.debug(_('Request: %(method)s http://%(server)s:%(port)s'
'%(url)s with headers %(headers)s') '%(url)s with headers %(headers)s')
% {'method': method, % {'method': method,
'server': self.conn.host, 'server': self.conn.host,
@ -129,7 +129,7 @@ class ImageService(object):
params = {'is_public': None} params = {'is_public': None}
while True: while True:
url = 'v1/images/detail' url = '/v1/images/detail'
query = urllib.urlencode(params) query = urllib.urlencode(params)
if query: if query:
url += '?%s' % query url += '?%s' % query
@ -150,7 +150,7 @@ class ImageService(object):
Returns: a httplib Response object where the body is the image. Returns: a httplib Response object where the body is the image.
""" """
url = 'v1/images/%s' % image_uuid url = '/v1/images/%s' % image_uuid
return self._http_request('GET', url, {}, '') return self._http_request('GET', url, {}, '')
@staticmethod @staticmethod
@ -178,7 +178,7 @@ class ImageService(object):
Returns: image metadata as a dictionary Returns: image metadata as a dictionary
""" """
url = 'v1/images/%s' % image_uuid url = '/v1/images/%s' % image_uuid
response = self._http_request('HEAD', url, {}, '', response = self._http_request('HEAD', url, {}, '',
ignore_result_body=True) ignore_result_body=True)
return self._header_list_to_dict(response.getheaders()) return self._header_list_to_dict(response.getheaders())
@ -210,7 +210,7 @@ class ImageService(object):
Returns: a tuple of (http response headers, http response body) Returns: a tuple of (http response headers, http response body)
""" """
url = 'v1/images' url = '/v1/images'
headers = self._dict_to_headers(image_meta) headers = self._dict_to_headers(image_meta)
headers['Content-Type'] = 'application/octet-stream' headers['Content-Type'] = 'application/octet-stream'
headers['Content-Length'] = int(image_meta['size']) headers['Content-Length'] = int(image_meta['size'])
@ -230,7 +230,7 @@ class ImageService(object):
Returns: a tuple of (http response headers, http response body) Returns: a tuple of (http response headers, http response body)
""" """
url = 'v1/images/%s' % image_meta['id'] url = '/v1/images/%s' % image_meta['id']
headers = self._dict_to_headers(image_meta) headers = self._dict_to_headers(image_meta)
headers['Content-Type'] = 'application/octet-stream' headers['Content-Type'] = 'application/octet-stream'

3
glance/tests/unit/test_glance_replicator.py
View File

@ -85,6 +85,9 @@ class FakeHTTPConnection(object):
def prime_request(self, method, url, in_body, in_headers, def prime_request(self, method, url, in_body, in_headers,
out_body, out_headers): out_body, out_headers):
if not url.startswith('/'):
url = '/' + url
hkeys = in_headers.keys() hkeys = in_headers.keys()
hkeys.sort() hkeys.sort()
hashable = (method, url, in_body, ' '.join(hkeys)) hashable = (method, url, in_body, ' '.join(hkeys))