]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
qa/tasks/mgr/dashboard: rbd: use dashboard pool API for creating pools
authorRicardo Dias <rdias@suse.com>
Thu, 29 Mar 2018 15:01:08 +0000 (16:01 +0100)
committerRicardo Dias <rdias@suse.com>
Fri, 13 Apr 2018 14:58:48 +0000 (15:58 +0100)
Signed-off-by: Ricardo Dias <rdias@suse.com>
qa/tasks/mgr/dashboard/test_rbd.py

index e8608c0e50b5fe56bafe80523dd6f0683feb6c61..4f3b962520939ceaf3357972905fb096ed563ea0 100644 (file)
@@ -14,9 +14,15 @@ class RbdTest(DashboardTestCase):
 
     @classmethod
     def create_pool(cls, name, pg_num, pool_type, application='rbd'):
-        cls._post("/api/pool", {'pool': name, 'pg_num': pg_num,
-                                'pool_type': pool_type,
-                                'application_metadata': application})
+        data = {
+            'pool': name,
+            'pg_num': pg_num,
+            'pool_type': pool_type,
+            'application_metadata': application
+        }
+        if pool_type == 'erasure':
+            data['flags'] = ['ec_overwrites']
+        cls._post("/api/pool", data)
 
     @classmethod
     def create_image(cls, pool, name, size, **kwargs):
@@ -191,9 +197,7 @@ class RbdTest(DashboardTestCase):
         if not self.bluestore_support:
             self.skipTest('requires bluestore cluster')
 
-        self._ceph_cmd(['osd', 'pool', 'create', 'data_pool', '12', '12', 'erasure'])
-        self._ceph_cmd(['osd', 'pool', 'application', 'enable', 'data_pool', 'rbd'])
-        self._ceph_cmd(['osd', 'pool', 'set', 'data_pool', 'allow_ec_overwrites', 'true'])
+        self.create_pool('data_pool', 12, 'erasure')
 
         rbd_name = 'test_rbd_in_data_pool'
         res = self.create_image('rbd', rbd_name, 10240, data_pool='data_pool')