diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-08-09 20:34:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-08-09 20:34:10 +0000 |
| commit | 0c2d2a982d322957116d9d1fae45e6d5efed6152 (patch) | |
| tree | b6a403ec4e60904942b8fc3b2517c3678cc8034b | |
| parent | eb47b55dbd078aea4eedcc70ad44d189510c6644 (diff) | |
| parent | f629692917b0411850f709998beedf7dcc36c4a1 (diff) | |
| download | python-glanceclient-0c2d2a982d322957116d9d1fae45e6d5efed6152.tar.gz | |
Merge "Cast image_id to string before calling urllib.quote"
| -rw-r--r-- | glanceclient/v1/images.py | 4 | ||||
| -rw-r--r-- | tests/v1/test_images.py | 11 |
2 files changed, 13 insertions, 2 deletions
diff --git a/glanceclient/v1/images.py b/glanceclient/v1/images.py index 8b2ce2a..46bd595 100644 --- a/glanceclient/v1/images.py +++ b/glanceclient/v1/images.py @@ -111,7 +111,7 @@ class ImageManager(base.Manager): image_id = base.getid(image) resp, body = self.api.raw_request('HEAD', '/v1/images/%s' - % urllib.quote(image_id)) + % urllib.quote(str(image_id))) meta = self._image_meta_from_headers(dict(resp.getheaders())) return Image(self, meta) @@ -124,7 +124,7 @@ class ImageManager(base.Manager): """ image_id = base.getid(image) resp, body = self.api.raw_request('GET', '/v1/images/%s' - % urllib.quote(image_id)) + % urllib.quote(str(image_id))) checksum = resp.getheader('x-image-meta-checksum', None) if do_checksum and checksum is not None: body.set_checksum(checksum) diff --git a/tests/v1/test_images.py b/tests/v1/test_images.py index 4c5c029..3d09fd8 100644 --- a/tests/v1/test_images.py +++ b/tests/v1/test_images.py @@ -437,6 +437,17 @@ class ImageManagerTest(testtools.TestCase): self.assertEqual(image.deleted, False) self.assertEqual(image.properties, {u'arch': u'x86_64'}) + def test_get_int(self): + image = self.mgr.get(1) + expect = [('HEAD', '/v1/images/1', {}, None)] + self.assertEqual(self.api.calls, expect) + self.assertEqual(image.id, '1') + self.assertEqual(image.name, 'image-1') + self.assertEqual(image.is_public, False) + self.assertEqual(image.protected, False) + self.assertEqual(image.deleted, False) + self.assertEqual(image.properties, {u'arch': u'x86_64'}) + def test_get_encoding(self): image = self.mgr.get('3') expect = [('HEAD', '/v1/images/3', {}, None)] |