sbcli-dev 4.0.29__zip → 4.0.31__zip

{sbcli_dev-4.0.29 → sbcli_dev-4.0.31}/PKG-INFO

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

{sbcli_dev-4.0.29 → sbcli_dev-4.0.31}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=4.0.29
+SIMPLY_BLOCK_VERSION=4.0.31
 
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main-dev

{sbcli_dev-4.0.29 → sbcli_dev-4.0.31}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-4.0.29 → sbcli_dev-4.0.31}/simplyblock_core/controllers/device_controller.py

@@ -765,29 +765,29 @@ def remove_jm_device(device_id, force=False):
 
     set_jm_device_state(snode.jm_device.get_id(), JMDevice.STATUS_UNAVAILABLE)
 
-    rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
-
-    # delete jm stack
-    if snode.enable_ha_jm:
-        ret = rpc_client.subsystem_delete(snode.jm_device.nvmf_nqn)
-        if not ret:
-            logger.error("device not found")
+    if snode.status == StorageNode.STATUS_ONLINE:
+        rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
+        # delete jm stack
+        if snode.enable_ha_jm:
+            ret = rpc_client.subsystem_delete(snode.jm_device.nvmf_nqn)
+            if not ret:
+                logger.error("device not found")
 
-    if snode.jm_device.pt_bdev:
-        ret = rpc_client.bdev_PT_NoExcl_delete(snode.jm_device.pt_bdev)
+        if snode.jm_device.pt_bdev:
+            ret = rpc_client.bdev_PT_NoExcl_delete(snode.jm_device.pt_bdev)
 
-    if snode.enable_ha_jm:
-        ret = rpc_client.bdev_jm_delete(snode.jm_device.jm_bdev, safe_removal=True)
-    else:
-        ret = rpc_client.bdev_jm_delete(snode.jm_device.jm_bdev, safe_removal=False)
+        if snode.enable_ha_jm:
+            ret = rpc_client.bdev_jm_delete(snode.jm_device.jm_bdev, safe_removal=True)
+        else:
+            ret = rpc_client.bdev_jm_delete(snode.jm_device.jm_bdev, safe_removal=False)
 
-    ret = rpc_client.bdev_alceml_delete(snode.jm_device.alceml_bdev)
+        ret = rpc_client.bdev_alceml_delete(snode.jm_device.alceml_bdev)
 
-    # if snode.jm_device.testing_bdev:
-    #     ret = rpc_client.bdev_passtest_delete(snode.jm_device.testing_bdev)
+        # if snode.jm_device.testing_bdev:
+        #     ret = rpc_client.bdev_passtest_delete(snode.jm_device.testing_bdev)
 
-    # if len(snode.jm_device.jm_nvme_bdev_list) == 2:
-    ret = rpc_client.bdev_raid_delete(snode.jm_device.raid_bdev)
+        # if len(snode.jm_device.jm_nvme_bdev_list) == 2:
+        ret = rpc_client.bdev_raid_delete(snode.jm_device.raid_bdev)
 
     set_jm_device_state(snode.jm_device.get_id(), JMDevice.STATUS_REMOVED)
     return True

{sbcli_dev-4.0.29 → sbcli_dev-4.0.31}/simplyblock_core/controllers/lvol_controller.py

@@ -1070,6 +1070,10 @@ def resize_lvol(id, new_size):
         logger.error(f"New size {new_size} must be smaller than the max size {lvol.max_size}")
         return False
 
+    if lvol.cloned_from_snap:
+        logger.error(f"Can not resize clone!")
+        return False
+
     logger.info(f"Resizing LVol: {lvol.id}, new size: {new_size}")
 
     snode = db_controller.get_storage_node_by_id(lvol.node_id)

{sbcli_dev-4.0.29 → sbcli_dev-4.0.31}/simplyblock_core/controllers/snapshot_controller.py

@@ -270,17 +270,17 @@ def clone(snapshot_id, clone_name, new_size=0):
         }
     ]
 
-    if new_size:
-        if snap.lvol.size >= new_size:
-            msg = f"New size {new_size} must be higher than the original size {snap.lvol.size}"
-            logger.error(msg)
-            return False, msg
-
-        if snap.lvol.max_size < new_size:
-            msg = f"New size {new_size} must be smaller than the max size {snap.lvol.max_size}"
-            logger.error(msg)
-            return False, msg
-        lvol.size = new_size
+    # if new_size:
+    #     if snap.lvol.size >= new_size:
+    #         msg = f"New size {new_size} must be higher than the original size {snap.lvol.size}"
+    #         logger.error(msg)
+    #         return False, msg
+    #
+    #     if snap.lvol.max_size < new_size:
+    #         msg = f"New size {new_size} must be smaller than the max size {snap.lvol.max_size}"
+    #         logger.error(msg)
+    #         return False, msg
+    #     lvol.size = new_size
 
     rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
     spdk_mem_info_before = rpc_client.ultra21_util_get_malloc_stats()
@@ -346,6 +346,6 @@ def clone(snapshot_id, clone_name, new_size=0):
 
     logger.info("Done")
     snapshot_events.snapshot_clone(snap, lvol)
-    if new_size:
-        lvol_controller.resize_lvol(lvol.get_id(), new_size)
+    # if new_size:
+    #     lvol_controller.resize_lvol(lvol.get_id(), new_size)
     return True, lvol.uuid

{sbcli_dev-4.0.29 → sbcli_dev-4.0.31}/simplyblock_core/storage_node_ops.py

@@ -1368,11 +1368,8 @@ def remove_storage_node(node_id, force_remove=False, force_migrate=False):
 
     if snode.nvme_devices:
         for dev in snode.nvme_devices:
-            if dev.status == NVMeDevice.STATUS_JM:
-                continue
             if dev.status == NVMeDevice.STATUS_ONLINE:
                 distr_controller.disconnect_device(dev)
-            device_controller.device_set_failed(dev.get_id())
 
     if snode.jm_device:
         logger.info("Removing JM")

{sbcli_dev-4.0.29 → sbcli_dev-4.0.31}/simplyblock_web/blueprints/web_api_cluster.py

@@ -62,7 +62,7 @@ def list_clusters(uuid):
 
     d = cluster.get_clean_dict()
     d['status_code'] = cluster.get_status_code()
-    return utils.get_response(d)
+    return utils.get_response([d])
 
 
 @bp.route('/cluster/capacity/<string:uuid>/history/<string:history>', methods=['GET'])