Merge "Reuse class Manager from common code"

tests/test_base.py

@@ -16,7 +16,7 @@
 
 import testtools
 
-from glanceclient.common import base
+from glanceclient.openstack.common.apiclient import base
 
 
 class TestBase(testtools.TestCase):

tests/utils.py

@@ -44,6 +44,32 @@ class FakeAPI(object):
         fixture = self._request(*args, **kwargs)
         return FakeResponse(fixture[0]), fixture[1]
 
+    def client_request(self, method, url, **kwargs):
+        if 'json' in kwargs and 'body' not in kwargs:
+            kwargs['body'] = kwargs.pop('json')
+        resp, body = self.json_request(method, url, **kwargs)
+        resp.json = lambda: body
+        resp.content = bool(body)
+        return resp
+
+    def head(self, url, **kwargs):
+        return self.client_request("HEAD", url, **kwargs)
+
+    def get(self, url, **kwargs):
+        return self.client_request("GET", url, **kwargs)
+
+    def post(self, url, **kwargs):
+        return self.client_request("POST", url, **kwargs)
+
+    def put(self, url, **kwargs):
+        return self.client_request("PUT", url, **kwargs)
+
+    def delete(self, url, **kwargs):
+        return self.raw_request("DELETE", url, **kwargs)
+
+    def patch(self, url, **kwargs):
+        return self.client_request("PATCH", url, **kwargs)
+
 
 class FakeResponse(object):
     def __init__(self, headers, body=None,

tests/v1/test_images.py

@@ -837,6 +837,7 @@ class ImageTest(testtools.TestCase):
         image = self.mgr.get('1')
         image.delete()
         expect = [
+            ('HEAD', '/v1/images/1', {}, None),
             ('HEAD', '/v1/images/1', {}, None),
             ('DELETE', '/v1/images/1', {}, None),
         ]
@@ -846,6 +847,7 @@ class ImageTest(testtools.TestCase):
         image = self.mgr.get('1')
         image.update(name='image-5')
         expect = [
+            ('HEAD', '/v1/images/1', {}, None),
             ('HEAD', '/v1/images/1', {}, None),
             ('PUT', '/v1/images/1', {'x-image-meta-name': 'image-5'}, None),
         ]
@@ -855,6 +857,7 @@ class ImageTest(testtools.TestCase):
         image = self.mgr.get('1')
         data = ''.join([b for b in image.data()])
         expect = [
+            ('HEAD', '/v1/images/1', {}, None),
             ('HEAD', '/v1/images/1', {}, None),
             ('GET', '/v1/images/1', {}, None),
         ]
@@ -870,6 +873,7 @@ class ImageTest(testtools.TestCase):
         image = self.mgr.get('2')
         data = ''.join([b for b in image.data(do_checksum=False)])
         expect = [
+            ('HEAD', '/v1/images/2', {}, None),
             ('HEAD', '/v1/images/2', {}, None),
             ('GET', '/v1/images/2', {}, None),
         ]
@@ -891,6 +895,7 @@ class ImageTest(testtools.TestCase):
         image = self.mgr.get('3')
         data = ''.join([b for b in image.data(do_checksum=False)])
         expect = [
+            ('HEAD', '/v1/images/3', {}, None),
             ('HEAD', '/v1/images/3', {}, None),
             ('GET', '/v1/images/3', {}, None),
         ]