sbcli-pre 1.1.9__zip → 1.2.1__zip

{sbcli_pre-1.1.9 → sbcli_pre-1.2.1}/PKG-INFO

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

{sbcli_pre-1.1.9 → sbcli_pre-1.2.1}/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-pre
-SIMPLY_BLOCK_VERSION=1.1.9
+SIMPLY_BLOCK_VERSION=1.2.1
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:pre-release
 

{sbcli_pre-1.1.9 → sbcli_pre-1.2.1}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli_pre-1.1.9 → sbcli_pre-1.2.1}/simplyblock_core/models/nvme_device.py

@@ -80,9 +80,10 @@ class JMDevice(BaseModel):
 
         "jm_nvme_bdev_list": {"type": List[str], 'default': []},
         "raid_bdev": {"type": str, 'default': ""},
+        "nvme_bdev": {"type": str, 'default': ""},
         "alceml_bdev": {"type": str, 'default': ""},
         "jm_bdev": {"type": str, 'default': ""},
-        "nvme_device": {"type": NVMeDevice, 'default': None},
+
 
         "health_check": {"type": bool, "default": True},
         "io_error": {"type": bool, 'default': False},

{sbcli_pre-1.1.9 → sbcli_pre-1.2.1}/simplyblock_core/storage_node_ops.py

@@ -286,12 +286,12 @@ def _create_jm_stack_on_device(rpc_client, nvme, snode, after_restart):
         return False
 
     return JMDevice({
-        'uuid': str(uuid.uuid4()),
+        'uuid': alceml_id,
         'device_name': jm_bdev,
-        'nvme_device': nvme,
         'size': nvme.size,
         'status': JMDevice.STATUS_ONLINE,
         'alceml_bdev': alceml_name,
+        'nvme_bdev': nvme.nvme_bdev,
         'jm_bdev': jm_bdev
     })
 
@@ -481,6 +481,7 @@ def _prepare_cluster_devices_jm_on_dev(snode, devices):
 
 
 def _prepare_cluster_devices_on_restart(snode):
+    db_controller = DBController()
 
     rpc_client = RPCClient(
         snode.mgmt_ip, snode.rpc_port,
@@ -501,11 +502,21 @@ def _prepare_cluster_devices_on_restart(snode):
     jm_device = snode.jm_device
     if jm_device.jm_nvme_bdev_list:
         ret = _create_jm_stack_on_raid(rpc_client, jm_device.jm_nvme_bdev_list, snode, after_restart=False)
+        if not ret:
+            logger.error(f"Failed to create JM device")
+            return False
     else:
-        ret = _create_jm_stack_on_device(rpc_client, jm_device.nvme_device, snode, after_restart=True)
-    if not ret:
-        logger.error(f"Failed to create JM device")
-        return False
+
+        ret = rpc_client.bdev_alceml_create(jm_device.alceml_bdev, jm_device.nvme_bdev, jm_device.get_id(), pba_init_mode=2)
+        if not ret:
+            logger.error(f"Failed to create alceml bdev: {jm_device.alceml_bdev}")
+            return False
+
+        jm_bdev = f"jm_{snode.get_id()}"
+        ret = rpc_client.bdev_jm_create(jm_bdev, jm_device.alceml_bdev)
+        if not ret:
+            logger.error(f"Failed to create {jm_bdev}")
+            return False
 
     return True