sbcli-pre 1.0.5__zip → 1.0.7__zip

{sbcli_pre-1.0.5 → sbcli_pre-1.0.7}/PKG-INFO

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

{sbcli_pre-1.0.5 → sbcli_pre-1.0.7}/env_var

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

{sbcli_pre-1.0.5 → sbcli_pre-1.0.7}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli_pre-1.0.5 → sbcli_pre-1.0.7}/simplyblock_core/controllers/device_controller.py

@@ -36,7 +36,7 @@ def device_set_state(device_id, state):
 
     old_status = dev.status
     device.status = state
-    distr_controller.send_dev_status_event(device.cluster_device_order, device.status)
+    distr_controller.send_dev_status_event(device, device.status)
     snode.write_to_db(db_controller.kv_store)
     device_events.device_status_change(device, device.status, old_status)
     return True
@@ -144,7 +144,7 @@ def _def_create_device_stack(device_obj, snode):
     logger.info(f"Adding {pt_name} to the subsystem")
     ret = rpc_client.nvmf_subsystem_add_ns(subsystem_nqn, pt_name)
 
-    if device_obj.jm_bdev:
+    if hasattr(device_obj, 'jm_bdev') and device_obj.jm_bdev:
         ret = rpc_client.bdev_jm_create(device_obj.jm_bdev, device_obj.alceml_bdev)
         if not ret:
             logger.error(f"Failed to create jm bdev: {device_obj.jm_bdev}")
@@ -190,11 +190,6 @@ def restart_device(device_id, force=False):
         logger.error("Failed to create device stack")
         return False
 
-    logger.info("Setting device io_error to False")
-    device_set_io_error(device_id, False)
-    logger.info("Setting device online")
-    device_set_online(device_id)
-
     logger.info("Make other nodes connect to the device")
     snodes = db_controller.get_storage_nodes()
     for node_index, node in enumerate(snodes):
@@ -224,6 +219,10 @@ def restart_device(device_id, force=False):
         node.write_to_db(db_controller.kv_store)
         time.sleep(3)
 
+    logger.info("Setting device io_error to False")
+    device_set_io_error(device_id, False)
+    logger.info("Setting device online")
+    device_set_online(device_id)
     device_events.device_restarted(device_obj)
     return "Done"
 
@@ -268,7 +267,7 @@ def device_remove(device_id, force=True):
             break
 
     logger.info("Sending device event")
-    distr_controller.send_dev_status_event(device.cluster_device_order, "removed")
+    distr_controller.send_dev_status_event(device, NVMeDevice.STATUS_REMOVED)
 
     logger.info("Disconnecting device from all nodes")
     distr_controller.disconnect_device(device)

{sbcli_pre-1.0.5 → sbcli_pre-1.0.7}/simplyblock_core/controllers/tasks_controller.py

@@ -34,7 +34,7 @@ def _add_task(function_name, cluster_id, node_id, device_id):
     task_obj.node_id = node_id
     task_obj.device_id = device_id
     task_obj.date = int(time.time())
-    task_obj.function_name = JobSchedule.FN_DEV_MIG
+    task_obj.function_name = function_name
     task_obj.status = JobSchedule.STATUS_NEW
     task_obj.write_to_db(db_controller.kv_store)
     tasks_events.task_create(task_obj)

{sbcli_pre-1.0.5 → sbcli_pre-1.0.7}/simplyblock_core/mgmt_node_ops.py

@@ -45,16 +45,20 @@ def deploy_mgmt_node(cluster_ip, cluster_id, ifname):
     ret = scripts.configure_docker(DEV_IP)
 
     db_connection = cluster_data['db_connection']
-    ret = scripts.set_db_config(db_connection)
-
-
-    logger.info("Joining docker swarm...")
+    scripts.set_db_config(db_connection)
+    time.sleep(1)
+    hostname = utils.get_hostname()
     db_controller = DBController()
     nodes = db_controller.get_mgmt_nodes(cluster_id=cluster_id)
     if not nodes:
         logger.error("No mgmt nodes was found in the cluster!")
-        exit(1)
+        return False
+    for node in nodes:
+        if node.hostname == hostname:
+            logger.error("Node already exists in the cluster")
+            return False
 
+    logger.info("Joining docker swarm...")
     try:
         cluster_docker = utils.get_docker_client(cluster_id)
         docker_ip = cluster_docker.info()["Swarm"]["NodeAddr"]
@@ -85,7 +89,7 @@ def deploy_mgmt_node(cluster_ip, cluster_id, ifname):
         raise e
 
     logger.info("Adding management node object")
-    add_mgmt_node(DEV_IP, cluster_id)
+    node_id = add_mgmt_node(DEV_IP, cluster_id)
 
     # check if ha setting is required
     nodes = db_controller.get_mgmt_nodes(cluster_id=cluster_id)
@@ -131,7 +135,7 @@ def deploy_mgmt_node(cluster_ip, cluster_id, ifname):
             cl.write_to_db(db_controller.kv_store)
 
     logger.info("Node joined the cluster")
-    return True
+    return node_id
 
 
 def add_mgmt_node(mgmt_ip, cluster_id=None):
@@ -153,7 +157,7 @@ def add_mgmt_node(mgmt_ip, cluster_id=None):
 
     mgmt_events.mgmt_add(node)
     logger.info("Done")
-    return True
+    return node.uuid
 
 
 def list_mgmt_nodes(is_json):

{sbcli_pre-1.0.5 → sbcli_pre-1.0.7}/simplyblock_core/storage_node_ops.py

@@ -1112,7 +1112,7 @@ def restart_storage_node(
         else:
             logger.info(f"Device not found: {db_dev.get_id()}")
             db_dev.status = NVMeDevice.STATUS_REMOVED
-            distr_controller.send_dev_status_event(db_dev.cluster_device_order, db_dev.status)
+            distr_controller.send_dev_status_event(db_dev, db_dev.status)
 
     # todo: handle new devices
     # for dev in nvme_devs:

{sbcli_pre-1.0.5 → sbcli_pre-1.0.7}/simplyblock_web/blueprints/web_api_lvol.py

@@ -32,7 +32,8 @@ def list_lvols(uuid, cluster_id):
     elif cluster_id:
         lvols = db_controller.get_lvols(cluster_id)
     else:
-        lvols = db_controller.get_lvols()  # pass
+        cluster_id = utils.get_cluster_id(request)
+        lvols = db_controller.get_lvols(cluster_id)
     data = []
     for lvol in lvols:
         data.append(lvol.get_clean_dict())

{sbcli_pre-1.0.5 → sbcli_pre-1.0.7}/simplyblock_web/blueprints/web_api_pool.py

@@ -30,7 +30,8 @@ def list_pools(uuid, cluster_id):
     elif cluster_id:
         pools = db_controller.get_pools(cluster_id)
     else:
-        pools = db_controller.get_pools()
+        cluster_id = utils.get_cluster_id(request)
+        pools = db_controller.get_pools(cluster_id)
     data = []
     for pool in pools:
         data.append(pool.get_clean_dict())
@@ -42,6 +43,7 @@ def add_pool():
     """
         Params:
         | name (required) | LVol name or id
+        | cluster_id (required) | Cluster uuid
         | pool_max        | Pool maximum size: 10M, 10G, 10(bytes)
         | lvol_max        | LVol maximum size: 10M, 10G, 10(bytes)
         | no_secret       | pool is created with a secret