sbcli-dev 4.0.59__zip → 4.0.62__zip

{sbcli_dev-4.0.59 → sbcli_dev-4.0.62}/PKG-INFO

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

{sbcli_dev-4.0.59 → sbcli_dev-4.0.62}/env_var

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

{sbcli_dev-4.0.59 → sbcli_dev-4.0.62}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-4.0.59 → sbcli_dev-4.0.62}/simplyblock_cli/cli.py

@@ -533,6 +533,7 @@ class CLIWrapper:
         sub_command = self.add_sub_command(subparser, 'add', 'Add Management node to the cluster (local run)')
         sub_command.add_argument("cluster_ip", help='the cluster IP address')
         sub_command.add_argument("cluster_id", help='the cluster UUID')
+        sub_command.add_argument("cluster_secret", help='the cluster secret')
         sub_command.add_argument("ifname", help='Management interface name')
 
         sub_command = self.add_sub_command(subparser, "list", 'List Management nodes')
@@ -1077,8 +1078,9 @@ class CLIWrapper:
             if sub_command == "add":
                 cluster_id = args.cluster_id
                 cluster_ip = args.cluster_ip
+                cluster_secret = args.cluster_secret
                 ifname = args.ifname
-                ret = mgmt_ops.deploy_mgmt_node(cluster_ip, cluster_id, ifname)
+                ret = mgmt_ops.deploy_mgmt_node(cluster_ip, cluster_id, ifname, cluster_secret)
             elif sub_command == "list":
                 ret = mgmt_ops.list_mgmt_nodes(args.json)
             elif sub_command == "remove":

{sbcli_dev-4.0.59 → sbcli_dev-4.0.62}/simplyblock_core/mgmt_node_ops.py

@@ -16,13 +16,14 @@ from simplyblock_core.models.mgmt_node import MgmtNode
 logger = logging.getLogger()
 
 
-def deploy_mgmt_node(cluster_ip, cluster_id, ifname):
+def deploy_mgmt_node(cluster_ip, cluster_id, ifname, cluster_secret):
 
     try:
-        resp = requests.get(f"http://{cluster_ip}/cluster/{cluster_id}")
+        headers = {'Authorization': f'{cluster_id} {cluster_secret}'}
+        resp = requests.get(f"http://{cluster_ip}/cluster/{cluster_id}", headers=headers)
         resp_json = resp.json()
         cluster_data = resp_json['results'][0]
-        logger.info(f"Cluster found! NQN:{cluster_data['nqn']}")
+        logger.info(f"Cluster found, NQN:{cluster_data['nqn']}")
         logger.debug(cluster_data)
     except Exception as e:
         logger.error("Error getting cluster data!")

{sbcli_dev-4.0.59 → sbcli_dev-4.0.62}/simplyblock_core/storage_node_ops.py

@@ -2620,6 +2620,7 @@ def recreate_lvstore(snode):
     if snode.lvols:
         db_controller = DBController()
         for lvol_id in snode.lvols:
+            time.sleep(5)
             lvol = lvol_controller.recreate_lvol(lvol_id, snode)
             if not lvol:
                 logger.error(f"Failed to recreate LVol: {lvol_id}")
@@ -2887,28 +2888,29 @@ def make_sec_new_primary(node_id):
 
 
 def dump_lvstore(node_id):
-    db_controller = DBController()
-
-    snode = db_controller.get_storage_node_by_id(node_id)
-    if not snode:
-        logger.error(f"Can not find storage node: {node_id}")
-        return False
-
-    if not snode.lvstore:
-        logger.error("Storage node does not have lvstore")
-        return False
-
-    rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password, timeout=180)
-    logger.info(f"Dumping lvstore data on node: {snode.get_id()}")
-    file_name = f"LVS_dump_{snode.hostname}_{snode.lvstore}_{str(datetime.datetime.now().isoformat())}.txt"
-    file_path = f"/etc/simplyblock/{file_name}"
-    ret = rpc_client.bdev_lvs_dump(snode.lvstore, file_path)
-    if not ret:
-        logger.error("faild to dump lvstore data")
-        return False
-
-    logger.info(f"LVS dump file path: {file_name}")
-    snode_api = SNodeClient(f"{snode.mgmt_ip}:5000")
-    file_content, _ = snode_api.get_file_content(file_name)
-
-    return file_content
+    return False
+    # db_controller = DBController()
+    #
+    # snode = db_controller.get_storage_node_by_id(node_id)
+    # if not snode:
+    #     logger.error(f"Can not find storage node: {node_id}")
+    #     return False
+    #
+    # if not snode.lvstore:
+    #     logger.error("Storage node does not have lvstore")
+    #     return False
+    #
+    # rpc_client = RPCClient(snode.mgmt_ip, snode.rpc_port, snode.rpc_username, snode.rpc_password, timeout=180)
+    # logger.info(f"Dumping lvstore data on node: {snode.get_id()}")
+    # file_name = f"LVS_dump_{snode.hostname}_{snode.lvstore}_{str(datetime.datetime.now().isoformat())}.txt"
+    # file_path = f"/etc/simplyblock/{file_name}"
+    # ret = rpc_client.bdev_lvs_dump(snode.lvstore, file_path)
+    # if not ret:
+    #     logger.error("faild to dump lvstore data")
+    #     return False
+    #
+    # logger.info(f"LVS dump file path: {file_name}")
+    # snode_api = SNodeClient(f"{snode.mgmt_ip}:5000")
+    # file_content, _ = snode_api.get_file_content(file_name)
+    #
+    # return file_content