sbcli-dev 10.2.5__tar.gz → 10.2.7__tar.gz

{sbcli_dev-10.2.5 → sbcli_dev-10.2.7}/PKG-INFO

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

{sbcli_dev-10.2.5 → sbcli_dev-10.2.7}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-10.2.5 → sbcli_dev-10.2.7}/simplyblock_core/controllers/snapshot_controller.py

@@ -90,18 +90,19 @@ def add(lvol_id, snapshot_name):
 
 ##############################################################################
 
+    snap_bdev_name = f"SNAP_{utils.get_random_vuid()}"
     rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password)
 
     blobid = 0
     snap_uuid = ""
     rpc_client.bdev_lvol_set_leader(True, lvs_name=lvol.lvs_name)
     logger.info("Creating Snapshot bdev")
-    ret = rpc_client.lvol_create_snapshot(f"{lvol.lvs_name}/{lvol.lvol_bdev}", snapshot_name)
+    ret = rpc_client.lvol_create_snapshot(f"{lvol.lvs_name}/{lvol.lvol_bdev}", snap_bdev_name)
     if not ret:
         return False, "Failed to create snapshot bdev"
 
     size = lvol.size
-    snap_bdev = rpc_client.get_bdevs(f"{lvol.lvs_name}/{snapshot_name}")
+    snap_bdev = rpc_client.get_bdevs(f"{lvol.lvs_name}/{snap_bdev_name}")
     if snap_bdev:
         snap_uuid = snap_bdev[0]['uuid']
         blobid = snap_bdev[0]['driver_specific']['lvol']['blobid']
@@ -124,7 +125,7 @@ def add(lvol_id, snapshot_name):
     snap.pool_uuid = pool.get_id()
     snap.cluster_id = pool.cluster_id
     snap.snap_name = snapshot_name
-    snap.snap_bdev = f"{lvol.lvs_name}/{snapshot_name}"
+    snap.snap_bdev = f"{lvol.lvs_name}/{snap_bdev_name}"
     snap.created_at = int(time.time())
     snap.lvol = lvol
 
@@ -132,13 +133,14 @@ def add(lvol_id, snapshot_name):
 
     if lvol.cloned_from_snap:
         original_snap = db_controller.get_snapshot_by_id(lvol.cloned_from_snap)
-        if original_snap.snap_ref_id:
-            original_snap = db_controller.get_snapshot_by_id(original_snap.snap_ref_id)
+        if original_snap:
+            if original_snap.snap_ref_id:
+                original_snap = db_controller.get_snapshot_by_id(original_snap.snap_ref_id)
 
-        original_snap.ref_count += 1
-        original_snap.write_to_db(db_controller.kv_store)
-        snap.snap_ref_id = original_snap.get_id()
-        snap.write_to_db(db_controller.kv_store)
+            original_snap.ref_count += 1
+            original_snap.write_to_db(db_controller.kv_store)
+            snap.snap_ref_id = original_snap.get_id()
+            snap.write_to_db(db_controller.kv_store)
 
     logger.info("Done")
     snapshot_events.snapshot_create(snap)
@@ -180,7 +182,7 @@ def delete(snapshot_uuid, force_delete=False):
         if lvol.cloned_from_snap and lvol.cloned_from_snap == snapshot_uuid:
             clones.append(lvol)
 
-    if len(clones) > 1:
+    if len(clones) >= 1:
         logger.warning(f"Soft delete snapshot with clones")
         snap = db_controller.get_snapshot_by_id(snapshot_uuid)
         snap.deleted = True
@@ -320,7 +322,7 @@ def clone(snapshot_id, clone_name, new_size=0):
     lvol.size = snap.lvol.size
     lvol.max_size = snap.lvol.max_size
     lvol.base_bdev = snap.lvol.base_bdev
-    lvol.lvol_bdev = f"CLN_{clone_name}"
+    lvol.lvol_bdev = f"CLN_{utils.get_random_vuid()}"
     lvol.lvs_name = snap.lvol.lvs_name
     lvol.top_bdev = f"{lvol.lvs_name}/{lvol.lvol_bdev}"
     lvol.hostname = snode.hostname

{sbcli_dev-10.2.5 → sbcli_dev-10.2.7}/simplyblock_core/env_var

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

{sbcli_dev-10.2.5 → sbcli_dev-10.2.7}/simplyblock_web/blueprints/web_api_lvol.py

@@ -106,6 +106,10 @@ def add_lvol():
         | crypto_key1     | the hex value of key1 to be used for lvol encryption
         | crypto_key2     | the hex value of key2 to be used for lvol encryption
         | host_id         | the hostID on which the lvol is created
+        | lvol_priority_class | the LVol priority class (0, 1)
+        | namespace       | the LVol namespace for k8s
+        | uid             | use this UUID for this LVol
+        | pvc_name        | set PVC name for this LVol
     """""
 
     cl_data = request.get_json()