sbcli-dev 4.0.23__zip → 4.0.25__zip

{sbcli_dev-4.0.23 → sbcli_dev-4.0.25}/PKG-INFO

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

{sbcli_dev-4.0.23 → sbcli_dev-4.0.25}/env_var

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

{sbcli_dev-4.0.23 → sbcli_dev-4.0.25}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-4.0.23 → sbcli_dev-4.0.25}/simplyblock_core/controllers/lvol_controller.py

@@ -516,7 +516,8 @@ def add_lvol_ha(name, size, host_id_or_name, ha_type, pool_id_or_name, use_comp,
         })
         lvol.lvol_type += ',crypto'
         lvol.top_bdev = lvol.crypto_bdev
-
+        lvol.crypto_key1 = lvol.crypto_key1
+        lvol.crypto_key2 = lvol.crypto_key2
 
     if ha_type == 'single':
         ret, error = add_lvol_on_node(lvol, host_node)

{sbcli_dev-4.0.23 → sbcli_dev-4.0.25}/simplyblock_core/controllers/snapshot_controller.py

@@ -74,7 +74,7 @@ def add(lvol_id, snapshot_name):
     spdk_mem_info_before = rpc_client.ultra21_util_get_malloc_stats()
 
     logger.info("Creating Snapshot bdev")
-    ret = rpc_client.lvol_create_snapshot(lvol.top_bdev, snapshot_name)
+    ret = rpc_client.lvol_create_snapshot(lvol.lvol_bdev, snapshot_name)
     if not ret:
         return False, "Failed to create snapshot bdev"
 
@@ -252,7 +252,7 @@ def clone(snapshot_id, clone_name, new_size=0):
     lvol.nqn = snode.subsystem + ":lvol:" + lvol.uuid
     lvol.pool_uuid = pool.id
     lvol.ha_type = snap.lvol.ha_type
-
+    lvol.lvol_type = 'lvol'
     lvol.ndcs = snap.lvol.ndcs
     lvol.npcs = snap.lvol.npcs
     lvol.distr_bs = snap.lvol.distr_bs
@@ -262,7 +262,7 @@ def clone(snapshot_id, clone_name, new_size=0):
     lvol.vuid = snap.lvol.vuid
 
     lvol.status = LVol.STATUS_ONLINE
-    lvol.bdev_stack = snap.lvol.bdev_stack
+    # lvol.bdev_stack = snap.lvol.bdev_stack
     lvol.bdev_stack = [
         {
             "type": "bdev_lvol_clone",
@@ -290,6 +290,19 @@ def clone(snapshot_id, clone_name, new_size=0):
     if not ret:
         return False, "Failed to create clone lvol bdev"
 
+    if "crypto" in snap.lvol.lvol_type:
+        lvol.crypto_bdev = f"crypto_{lvol.lvol_name}"
+        lvol.crypto_key1 = snap.lvol.crypto_key1
+        lvol.crypto_key2 = snap.lvol.crypto_key2
+
+        ret = lvol_controller._create_crypto_lvol(
+            rpc_client, lvol.crypto_bdev, lvol.top_bdev, lvol.crypto_key1, lvol.crypto_key2)
+        if not ret:
+            return False, "Failed to create clone lvol bdev"
+
+        lvol.lvol_type += ',crypto'
+        lvol.top_bdev = lvol.crypto_bdev
+
     subsystem_nqn = lvol.nqn
     logger.info("creating subsystem %s", subsystem_nqn)
     ret = rpc_client.subsystem_create(subsystem_nqn, 'sbcli-cn', lvol.uuid)

{sbcli_dev-4.0.23 → sbcli_dev-4.0.25}/simplyblock_core/models/lvol_model.py

@@ -45,6 +45,8 @@ class LVol(BaseModel):
         "bdev_stack": {"type": List, 'default': []},
 
         "crypto_key_name": {"type": str, 'default': ""},
+        "crypto_key1": {"type": str, 'default': ""},
+        "crypto_key2": {"type": str, 'default': ""},
 
         "rw_ios_per_sec": {"type": int, 'default': 0},
         "rw_mbytes_per_sec": {"type": int, 'default': 0},

{sbcli_dev-4.0.23 → sbcli_dev-4.0.25}/simplyblock_core/storage_node_ops.py

@@ -16,7 +16,6 @@ from simplyblock_core import constants, scripts, distr_controller
 from simplyblock_core import utils
 from simplyblock_core.controllers import lvol_controller, storage_events, snapshot_controller, device_events, \
     device_controller, tasks_controller, health_controller
-from simplyblock_core.controllers.device_controller import set_jm_device_state
 from simplyblock_core.kv_store import DBController, KVStore
 from simplyblock_core import shell_utils
 from simplyblock_core.models.iface import IFace
@@ -744,7 +743,7 @@ def _prepare_cluster_devices_on_restart(snode):
                 logger.error(f"Failed to add: {pt_name} to the subsystem: {subsystem_nqn}")
                 return False
 
-        set_jm_device_state(snode.jm_device.get_id(), JMDevice.STATUS_ONLINE)
+        device_controller.set_jm_device_state(snode.jm_device.get_id(), JMDevice.STATUS_ONLINE)
         return True