sbcli-dev 3.8.90__zip → 3.8.92__zip

{sbcli_dev-3.8.90 → sbcli_dev-3.8.92}/PKG-INFO

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

{sbcli_dev-3.8.90 → sbcli_dev-3.8.92}/env_var

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

{sbcli_dev-3.8.90 → sbcli_dev-3.8.92}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-3.8.90 → sbcli_dev-3.8.92}/simplyblock_cli/cli.py

@@ -244,6 +244,10 @@ class CLIWrapper:
         sub_command = self.add_sub_command(subparser, 'get-cluster-map', 'get cluster map')
         sub_command.add_argument("id", help='id')
 
+        sub_command = self.add_sub_command(subparser, 'make-primary',
+                                           'In case of HA SNode, make the current node as primary')
+        sub_command.add_argument("id", help='id')
+
         # check lvol
         #
         # ----------------- cluster -----------------
@@ -901,6 +905,9 @@ class CLIWrapper:
             elif sub_command == "get-cluster-map":
                 id = args.id
                 ret = storage_ops.get_cluster_map(id)
+            elif sub_command == "make-primary":
+                id = args.id
+                ret = storage_ops.make_sec_new_primary(id)
             else:
                 self.parser.print_help()
 

{sbcli_dev-3.8.90 → sbcli_dev-3.8.92}/simplyblock_core/models/storage_node.py

@@ -52,6 +52,7 @@ class StorageNode(BaseModel):
         "create_dt": {"type": str, 'default': str(datetime.now())},
         "remove_dt": {"type": str, 'default': str(datetime.now())},
         "mgmt_ip": {"type": str, 'default': ""},
+        "primary_ip": {"type": str, 'default': ""},
         "rpc_port": {"type": int, 'default': -1},
         "rpc_username": {"type": str, 'default': ""},
         "rpc_password": {"type": str, 'default': ""},

{sbcli_dev-3.8.90 → sbcli_dev-3.8.92}/simplyblock_core/storage_node_ops.py

@@ -1027,6 +1027,7 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
     snode.subsystem = subsystem_nqn
     snode.data_nics = data_nics
     snode.mgmt_ip = mgmt_ip
+    snode.primary_ip = mgmt_ip
     snode.rpc_port = constants.RPC_HTTP_PROXY_PORT
     snode.rpc_username = rpc_user
     snode.rpc_password = rpc_pass
@@ -1416,6 +1417,7 @@ def restart_storage_node(
                         'status': device['status'],
                         'net_type': device['net_type']}))
             snode.data_nics = data_nics
+            snode.hostname = node_info['hostname']
 
     logger.info("Setting node state to restarting")
     set_node_status(node_id, StorageNode.STATUS_RESTARTING)
@@ -2777,3 +2779,24 @@ def get_cluster_map(node_id):
         results, is_passed = distr_controller.parse_distr_cluster_map(ret)
         print(utils.print_table(results))
     return True
+
+
+def make_sec_new_primary(node_id):
+    db_controller = DBController()
+    snode = db_controller.get_storage_node_by_id(node_id)
+    if not snode:
+        logger.error(f"snode not found: {node_id}")
+        return False
+
+    for dev in snode.nvme_devices:
+        if dev.status == NVMeDevice.STATUS_REMOVED:
+            device_controller.device_set_failed(dev.get_id())
+
+    for dev in snode.nvme_devices:
+        if dev.status == NVMeDevice.STATUS_NEW:
+            device_controller.add_device(dev.get_id())
+
+    snode = db_controller.get_storage_node_by_id(node_id)
+    snode.primary_ip = snode.mgmt_ip
+    snode.write_to_db(db_controller.kv_store)
+    return True

{sbcli_dev-3.8.90 → sbcli_dev-3.8.92}/simplyblock_web/blueprints/web_api_storage_node.py

@@ -266,3 +266,13 @@ def storage_node_add():
         "namespace": namespace})
 
     return utils.get_response(True)
+
+
+@bp.route('/storagenode/make-sec-new-primary/<string:uuid>', methods=['GET'])
+def make_primary(uuid):
+    node = db_controller.get_storage_node_by_id(uuid)
+    if not node:
+        return utils.get_response_error(f"node not found: {uuid}", 404)
+
+    out = storage_node_ops.make_sec_new_primary(uuid)
+    return utils.get_response(out)