Merge pull request #39 from r0h4n/master

Fix create/delete pool flows
Tendrl · Nov 16, 2016 · 1e3082b · 1e3082b
2 parents d0cce56 + b297735
commit 1e3082b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/tendrl/ceph_integration/manager/pool_request_factory.py b/tendrl/ceph_integration/manager/pool_request_factory.py
@@ -189,8 +189,8 @@ def update(self, pool_id, attributes):
             )
 
     def create(self, attributes):
-        commands = [('osd pool create', {'pool': attributes[
-                     'name'], 'pg_num': attributes['pg_num']})]
+        commands = [('osd pool create', {'pool': attributes['name'],
+                                         'pg_num': attributes['pg_num']})]
 
         # Calculate appropriate min_size, including default if none given
         req_size = attributes.get('size', 0)

diff --git a/tendrl/ceph_integration/manager/user_request.py b/tendrl/ceph_integration/manager/user_request.py
@@ -234,7 +234,7 @@ def _submit(self, commands=None):
 
         LOG.debug("%s._submit: %s/%s" %
                   (self.__class__.__name__, self._cluster_name, commands))
-        return ceph.rados_command(self.fsid, self._cluster_name, commands)
+        return ceph.rados_commands(self.fsid, self._cluster_name, commands)
 
 
 class OsdMapModifyingRequest(RadosRequest):

diff --git a/tendrl/ceph_integration/objects/pool/atoms/delete.py b/tendrl/ceph_integration/objects/pool/atoms/delete.py
@@ -1,4 +1,5 @@
 class Delete(object):
     def run(self, parameters):
-        parameters['crud'].delete(parameters['Pool.pool_id'])
+        parameters['crud'].delete(parameters['fsid'],
+                                  "pool", parameters['Pool.pool_id'])
         return True