Implement Cyclades Block Storage rest client

Includes unit tests

kamaki/clients/cyclades/rest_api.py

@@ -32,6 +32,7 @@
 # or implied, of GRNET S.A.
 
 from kamaki.clients.compute import ComputeClient
+from kamaki.clients.blockstorage import BlockStorageClient
 from kamaki.clients.utils import path4url
 
 
@@ -51,3 +52,39 @@ class CycladesComputeRestClient(ComputeClient):
 
 #  Backwards compatibility
 CycladesRestClient = CycladesComputeRestClient
+
+
+class CycladesBlockStorageRestClient(BlockStorageClient):
+    """Synnefo Cyclades Block Storage REST API Client"""
+
+    def volumes_post(
+            self, size, server_id, display_name,
+            display_description=None,
+            snapshot_id=None,
+            imageRef=None,
+            volume_type=None,
+            metadata=None,
+            project=None,
+            success=202,
+            **kwargs):
+        path = path4url('volumes')
+        volume = dict(
+            size=int(size), server_id=server_id, display_name=display_name)
+        if display_description is not None:
+            volume['display_description'] = display_description
+        if snapshot_id is not None:
+            volume['snapshot_id'] = snapshot_id
+        if imageRef is not None:
+            volume['imageRef'] = imageRef
+        if volume_type is not None:
+            volume['volume_type'] = volume_type
+        if metadata is not None:
+            volume['metadata'] = metadata
+        if project is not None:
+            volume['project'] = project
+        return self.post(
+            path, json=dict(volume=volume), success=success, **kwargs)
+
+    def volumes_action_post(self, volume_id, json_data, success=200, **kwargs):
+        path = path4url('volumes', volume_id, 'action')
+        return self.post(path, json=json_data, success=success, **kwargs)

kamaki/clients/cyclades/test.py

-# Copyright 2013 GRNET S.A. All rights reserved.
+# Copyright 2013-2014 GRNET S.A. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or
 # without modification, are permitted provided that the following
@@ -236,6 +236,56 @@ class CycladesComputeClient(TestCase):
         self.assert_dicts_are_equal(r, cnsl['console'])
 
 
+clients_pkg = 'kamaki.clients.Client'
+
+
+class CycladesBlockStorageRestClient(TestCase):
+
+    def setUp(self):
+        self.url = 'http://volumes.example.com'
+        self.token = 'v01um3s70k3n'
+        self.client = cyclades.rest_api.CycladesBlockStorageRestClient(
+            self.url, self.token)
+
+    @patch('%s.post' % clients_pkg)
+    def test_volumes_post(self, post):
+        keys = (
+            'display_description', 'snapshot_id', 'imageRef',
+            'volume_type', 'metadata', 'project')
+        for args in product(
+                ('dd', None), ('sn', None), ('ir', None),
+                ('vt', None), ({'mk': 'mv'}, None), ('pid', None),
+                ({'k1': 'v1', 'k2': 'v2'}, {'success': 1000}, {})):
+            kwargs, server_id, display_name = args[-1], 'sid', 'dn'
+            args = args[:-1]
+            for err, size in ((TypeError, None), (ValueError, 'size')):
+                self.assertRaises(
+                    err, self.client.volumes_post,
+                    size, server_id, display_name, *args, **kwargs)
+            size = 42
+            self.client.volumes_post(
+                size, server_id, display_name, *args, **kwargs)
+            volume = dict(
+                size=int(size), server_id=server_id, display_name=display_name)
+            for k, v in zip(keys, args):
+                if v:
+                    volume[k] = v
+            success, jsondata = kwargs.pop('success', 202), dict(volume=volume)
+            self.assertEqual(
+                post.mock_calls[-1],
+                call('/volumes', json=jsondata, success=success, **kwargs))
+
+    @patch('%s.post' % clients_pkg)
+    def test_volumes_action_post(self, post):
+        for kwargs in ({'k1': 'v1', 'k2': 'v2'}, {'success': 1000}, {}):
+            volume_id, project_id = 'vid', 'pid'
+            self.client.volumes_action_post(volume_id, project_id, **kwargs)
+            success = kwargs.pop('success', 200)
+            self.assertEqual(post.mock_calls[-1], call(
+                '/volumes/%s/action' % volume_id,
+                json=project_id, success=success, **kwargs))
+
+
 if __name__ == '__main__':
     from sys import argv
     from kamaki.clients.test import runTestCase
@@ -249,5 +299,11 @@ if __name__ == '__main__':
     if not argv[1:] or argv[1] == 'CycladesComputeRestClient':
         not_found = False
         runTestCase(CycladesComputeRestClient, 'CycladesRest Client', argv[2:])
+    if not argv[1:] or argv[1] == 'CycladesBlockStorageRestClient':
+        not_found = False
+        runTestCase(
+            CycladesBlockStorageRestClient,
+            'Cyclades Block Storage Rest Client',
+            argv[2:])
     if not_found:
         print('TestCase %s not found' % argv[1])

kamaki/clients/test.py

@@ -44,8 +44,8 @@ from kamaki.clients.astakos.test import (
 from kamaki.clients.compute.test import ComputeClient, ComputeRestClient
 from kamaki.clients.network.test import (NetworkClient, NetworkRestClient)
 from kamaki.clients.cyclades.test import (
-    CycladesComputeClient, CycladesNetworkClient)
-from kamaki.clients.cyclades.test import CycladesComputeRestClient
+    CycladesComputeClient, CycladesNetworkClient,
+    CycladesComputeRestClient, CycladesBlockStorageRestClient)
 from kamaki.clients.image.test import ImageClient
 from kamaki.clients.storage.test import StorageClient
 from kamaki.clients.pithos.test import (