sbcli-dev 17.2.2__tar.gz → 17.2.3__tar.gz

{sbcli_dev-17.2.2 → sbcli_dev-17.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sbcli-dev
-Version: 17.2.2
+Version: 17.2.3
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_dev-17.2.2 → sbcli_dev-17.2.3}/sbcli_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sbcli-dev
-Version: 17.2.2
+Version: 17.2.3
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_dev-17.2.2 → sbcli_dev-17.2.3}/simplyblock_cli/clibase.py

@@ -508,7 +508,7 @@ class CLIWrapperBase:
             pool_max = utils.parse_size(args.pool_max)
         if args.lvol_max:
             lvol_max = utils.parse_size(args.lvol_max)
-        return pool_controller.set_pool(
+        ret, err = pool_controller.set_pool(
             args.pool_id,
             pool_max,
             lvol_max,
@@ -516,6 +516,7 @@ class CLIWrapperBase:
             args.max_rw_mbytes,
             args.max_r_mbytes,
             args.max_w_mbytes)
+        return ret
 
     def storage_pool__list(self, sub_command, args):
         return pool_controller.list_pools(args.json, args.cluster_id)

{sbcli_dev-17.2.2 → sbcli_dev-17.2.3}/simplyblock_core/controllers/pool_controller.py

@@ -75,48 +75,65 @@ def set_pool_value_if_above(pool, key, value):
     current_value = getattr(pool, key)
     if value > current_value:
         setattr(pool, key, value)
-        return True
+        return True, None
     else:
-        logger.error(f"{key}: {value} can't be less than current value: {current_value}")
-        return False
+        msg = f"{key}: {value} can't be less than current value: {current_value}"
+        logger.error(msg)
+        return False, msg
 
 
-def set_pool(uuid, pool_max, lvol_max, max_rw_iops,
-             max_rw_mbytes, max_r_mbytes, max_w_mbytes):
+def set_pool(uuid, pool_max=0, lvol_max=0, max_rw_iops=0,
+             max_rw_mbytes=0, max_r_mbytes=0, max_w_mbytes=0, name=""):
     db_controller = DBController()
     pool = db_controller.get_pool_by_id(uuid)
     if not pool:
-        logger.error(f"Pool not found {uuid}")
-        return False
+        msg = f"Pool not found: {uuid}"
+        logger.error(msg)
+        return False, msg
 
     if pool.status == Pool.STATUS_INACTIVE:
-        logger.error("Pool is disabled")
-        return False
+        msg = "Pool is disabled"
+        logger.error(msg)
+        return False, msg
+
+
+    values = []
+
+    if name:
+        for p in db_controller.get_pools():
+            if p.pool_name == name:
+                msg = f"Pool found with the same name: {name}"
+                logger.error(msg)
+                return False, msg
+        values.append(("name", name))
 
     if pool_max:
-        if not set_pool_value_if_above(pool, "pool_max_size", pool_max):
-            return False
+        values.append(("pool_max_size", pool_max))
+
     if lvol_max:
-        if not set_pool_value_if_above(pool, "lvol_max_size", lvol_max):
-            return False
+        values.append(("lvol_max_size", lvol_max))
 
     if max_rw_iops:
-        if not set_pool_value_if_above(pool, "max_rw_ios_per_sec", max_rw_iops):
-            return False
+        values.append(("max_rw_ios_per_sec", max_rw_iops))
+
     if max_rw_mbytes:
-        if not set_pool_value_if_above(pool, "max_rw_mbytes_per_sec", max_rw_mbytes):
-            return False
+        values.append(("max_rw_mbytes_per_sec", max_rw_mbytes))
+
     if max_r_mbytes:
-        if not set_pool_value_if_above(pool, "max_r_mbytes_per_sec", max_r_mbytes):
-            return False
+        values.append(("max_r_mbytes_per_sec", max_r_mbytes))
+
     if max_w_mbytes:
-        if not set_pool_value_if_above(pool, "max_w_mbytes_per_sec", max_w_mbytes):
-            return False
+        values.append(("max_w_mbytes_per_sec", max_w_mbytes))
+
+    for k, v in values:
+        ret, err = set_pool_value_if_above(pool, k, v)
+        if err:
+            return False, err
 
     pool.write_to_db(db_controller.kv_store)
     pool_events.pool_updated(pool)
     logger.info("Done")
-    return True
+    return True, None
 
 
 def delete_pool(uuid):

{sbcli_dev-17.2.2 → sbcli_dev-17.2.3}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=17.2.2
+SIMPLY_BLOCK_VERSION=17.2.3
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:main
 SIMPLY_BLOCK_SPDK_ULTRA_IMAGE=public.ecr.aws/simply-block/ultra:main-latest

{sbcli_dev-17.2.2 → sbcli_dev-17.2.3}/simplyblock_web/blueprints/web_api_pool.py

@@ -129,28 +129,34 @@ def update_pool(uuid):
 
     pool_data = request.get_json()
 
-    pool.pool_name = pool_data.get('name') or pool.pool_name
+    fn_params = {"uuid": uuid}
+
+    if 'name' in pool_data:
+        nm = pool_data['name']
+        if nm:
+            fn_params['name'] = nm
 
     if 'pool_max' in pool_data:
-        pool.pool_max_size = core_utils.parse_size(pool_data['pool_max'])
+        fn_params['pool_max'] = core_utils.parse_size(pool_data['pool_max'])
 
     if 'lvol_max' in pool_data:
-        pool.lvol_max_size = core_utils.parse_size(pool_data['lvol_max'])
+        fn_params['lvol_max'] = core_utils.parse_size(pool_data['lvol_max'])
 
-    if 'max_r_iops' in pool_data:
-        pool.max_r_iops = core_utils.parse_size(pool_data['max_r_iops'])
+    if 'max_rw_iops' in pool_data:
+        fn_params['max_rw_iops'] = core_utils.parse_size(pool_data['max_rw_iops'])
 
-    if 'max_w_iops' in pool_data:
-        pool.max_w_iops = core_utils.parse_size(pool_data['max_w_iops'])
+    if 'max_rw_mbytes' in pool_data:
+        fn_params['max_rw_mbytes'] = core_utils.parse_size(pool_data['max_rw_mbytes'])
 
     if 'max_r_mbytes' in pool_data:
-        pool.max_r_mbytes_per_sec = core_utils.parse_size(pool_data['max_r_mbytes'])
+        fn_params['max_r_mbytes'] = core_utils.parse_size(pool_data['max_r_mbytes'])
 
     if 'max_w_mbytes' in pool_data:
-        pool.max_w_mbytes_per_sec = core_utils.parse_size(pool_data['max_w_mbytes'])
+        fn_params['max_w_mbytes'] = core_utils.parse_size(pool_data['max_w_mbytes'])
+
+    ret, err = pool_controller.set_pool(**fn_params)
 
-    pool.write_to_db(db_controller.kv_store)
-    return utils.get_response(pool.to_dict())
+    return utils.get_response(ret, err)
 
 
 @bp.route('/pool/capacity/<string:uuid>', methods=['GET'])