sbcli-dev 10.3.0__tar.gz → 10.3.2__tar.gz

{sbcli_dev-10.3.0 → sbcli_dev-10.3.2}/PKG-INFO

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

{sbcli_dev-10.3.0 → sbcli_dev-10.3.2}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-10.3.0 → sbcli_dev-10.3.2}/simplyblock_core/controllers/lvol_controller.py

@@ -827,6 +827,28 @@ def delete_lvol(id_or_name, force_delete=False):
 
     logger.debug(lvol)
     snode = db_controller.get_storage_node_by_id(lvol.node_id)
+
+    if not snode:
+        logger.error(f"lvol node id not found: {lvol.node_id}")
+        if not force_delete:
+            return False
+        lvol_events.lvol_delete(lvol)
+        lvol.remove(db_controller.kv_store)
+
+        # if lvol is clone and snapshot is deleted, then delete snapshot
+        if lvol.cloned_from_snap:
+            snap = db_controller.get_snapshot_by_id(lvol.cloned_from_snap)
+            if snap and snap.deleted is True:
+                lvols_count = 0
+                for lvol in db_controller.get_lvols():  # pass
+                    if lvol.cloned_from_snap == snap.get_id():
+                        lvols_count += 1
+                if lvols_count == 0:
+                    snapshot_controller.delete(snap.get_id())
+
+        logger.info("Done")
+        return True
+
     # creating RPCClient instance
     rpc_client = RPCClient(
         snode.mgmt_ip,
@@ -1019,8 +1041,8 @@ def list_lvols(is_json, cluster_id, pool_id_or_name, all=False):
     data = []
     for lvol in lvols:
         logger.debug(lvol)
-        # if lvol.deleted is True and all is False:
-        #     continue
+        if lvol.deleted is True and all is False:
+            continue
         data.append({
             "Id": lvol.uuid,
             "Name": lvol.lvol_name,

{sbcli_dev-10.3.0 → sbcli_dev-10.3.2}/simplyblock_core/controllers/snapshot_controller.py

@@ -113,7 +113,7 @@ def add(lvol_id, snapshot_name):
             sec_rpc_client = RPCClient(sec_node.mgmt_ip, sec_node.rpc_port, sec_node.rpc_username, sec_node.rpc_password)
             sec_rpc_client.bdev_lvol_set_leader(False, lvs_name=lvol.lvs_name)
             ret = sec_rpc_client.bdev_lvol_snapshot_register(
-                f"{lvol.lvs_name}/{snap_bdev_name}", snapshot_name, snap_uuid, blobid)
+                f"{lvol.lvs_name}/{lvol.lvol_bdev}", snap_bdev_name, snap_uuid, blobid)
 
 
     snap = SnapShot()

{sbcli_dev-10.3.0 → sbcli_dev-10.3.2}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=10.3.0
+SIMPLY_BLOCK_VERSION=10.3.2
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main
 DOCKER_USER=hamdysimplyblock