sbcli-pre 1.1.4__zip → 1.1.5__zip

{sbcli_pre-1.1.4 → sbcli_pre-1.1.5}/PKG-INFO

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

{sbcli_pre-1.1.4 → sbcli_pre-1.1.5}/env_var

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

{sbcli_pre-1.1.4 → sbcli_pre-1.1.5}/sbcli_pre.egg-info/PKG-INFO

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

{sbcli_pre-1.1.4 → sbcli_pre-1.1.5}/simplyblock_cli/cli.py

@@ -630,9 +630,6 @@ class CLIWrapper:
             elif sub_command == "deploy-cleaner":
                 ret = storage_ops.deploy_cleaner()
 
-            elif sub_command == "add":
-                ret = self.storage_node_add(args)
-
             elif sub_command == "add-node":
                 cluster_id = args.cluster_id
                 node_ip = args.node_ip
@@ -1102,14 +1099,6 @@ class CLIWrapper:
         out = storage_ops.list_storage_nodes(self.db_store, args.json)
         return out
 
-    def storage_node_add(self, args):
-        cluster_id = args.cluster_id
-        ifname = args.ifname
-        data_nics = args.data_nics
-        # TODO: Validate the inputs
-        out = storage_ops.add_storage_node(cluster_id, ifname, data_nics)
-        return out
-
     def storage_node_list_devices(self, args):
         node_id = args.node_id
         sort = args.sort

{sbcli_pre-1.1.4 → sbcli_pre-1.1.5}/simplyblock_core/storage_node_ops.py

@@ -799,140 +799,6 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
     return "Success"
 
 
-# Deprecated
-def add_storage_node(cluster_id, iface_name, data_nics):
-    db_controller = DBController()
-    kv_store = db_controller.kv_store
-
-    cluster = db_controller.get_cluster_by_id(cluster_id)
-    if not cluster:
-        logger.error("Cluster not found: %s", cluster_id)
-        return False
-
-    logger.info("Add Storage node")
-
-    hostname = utils.get_hostname()
-    snode = db_controller.get_storage_node_by_hostname(hostname)
-    if snode:
-        logger.error("Node already exists, try remove it first.")
-        exit(1)
-    else:
-        snode = StorageNode()
-        snode.uuid = str(uuid.uuid4())
-
-    mgmt_ip = _get_if_ip_address(iface_name)
-    system_id = utils.get_system_id()
-
-    BASE_NQN = cluster.nqn.split(":")[0]
-    subsystem_nqn = f"{BASE_NQN}:{hostname}"
-
-    if data_nics:
-        data_nics = _get_data_nics(data_nics)
-    else:
-        data_nics = _get_data_nics([iface_name])
-
-    rpc_user, rpc_pass = utils.generate_rpc_user_and_pass()
-
-    # creating storage node object
-    snode.status = StorageNode.STATUS_IN_CREATION
-    snode.baseboard_sn = utils.get_baseboard_sn()
-    snode.system_uuid = system_id
-    snode.hostname = hostname
-    snode.host_nqn = subsystem_nqn
-    snode.subsystem = subsystem_nqn
-    snode.data_nics = data_nics
-    snode.mgmt_ip = mgmt_ip
-    snode.rpc_port = constants.RPC_HTTP_PROXY_PORT
-    snode.rpc_username = rpc_user
-    snode.rpc_password = rpc_pass
-    snode.cluster_id = cluster_id
-    snode.write_to_db(kv_store)
-
-    # creating RPCClient instance
-    rpc_client = RPCClient(
-        snode.mgmt_ip,
-        snode.rpc_port,
-        snode.rpc_username,
-        snode.rpc_password)
-
-    logger.info("Getting nvme devices")
-    devs = get_nvme_devices()
-    logger.debug(devs)
-    pcies = [d[0] for d in devs]
-    nvme_devs = addNvmeDevices(cluster, rpc_client, pcies, snode)
-    if not nvme_devs:
-        logger.error("No NVMe devices was found!")
-
-    logger.debug(nvme_devs)
-    snode.nvme_devices = nvme_devs
-
-    # Set device cluster order
-    dev_order = get_next_cluster_device_order(db_controller, cluster_id)
-    for index, nvme in enumerate(snode.nvme_devices):
-        nvme.cluster_device_order = dev_order
-        dev_order += 1
-    snode.write_to_db(db_controller.kv_store)
-
-    # prepare devices
-    # _prepare_cluster_devices(snode)
-
-    logger.info("Connecting to remote devices")
-    remote_devices = _connect_to_remote_devs(snode)
-    snode.remote_devices = remote_devices
-
-    logger.info("Setting node status to Active")
-    snode.status = StorageNode.STATUS_ONLINE
-    snode.write_to_db(kv_store)
-
-    # make other nodes connect to the new devices
-    logger.info("Make other nodes connect to the new devices")
-    snodes = db_controller.get_storage_nodes_by_cluster_id(cluster_id)
-    for node_index, node in enumerate(snodes):
-        if node.get_id() == snode.get_id():
-            continue
-        logger.info(f"Connecting to node: {node.get_id()}")
-        rpc_client = RPCClient(node.mgmt_ip, node.rpc_port, node.rpc_username, node.rpc_password)
-        count = 0
-        for dev in snode.nvme_devices:
-            name = f"remote_{dev.alceml_bdev}"
-            ret = rpc_client.bdev_nvme_attach_controller_tcp(name, dev.nvmf_nqn, dev.nvmf_ip, dev.nvmf_port)
-            if not ret:
-                logger.error(f"Failed to connect to device: {name}")
-                continue
-
-            dev.remote_bdev = f"{name}n1"
-            idx = -1
-            for i, d in enumerate(node.remote_devices):
-                if d.get_id() == dev.get_id():
-                    idx = i
-                    break
-            if idx >= 0:
-                node.remote_devices[idx] = dev
-            else:
-                node.remote_devices.append(dev)
-            count += 1
-        node.write_to_db(kv_store)
-        logger.info(f"connected to devices count: {count}")
-
-    logger.info("Sending cluster map")
-    ret = distr_controller.send_cluster_map_to_node(snode)
-    if not ret:
-        return False, "Failed to send cluster map"
-    ret = distr_controller.send_cluster_map_add_node(snode)
-    if not ret:
-        return False, "Failed to send cluster map add node"
-    time.sleep(3)
-
-    logger.info("Sending cluster event updates")
-    distr_controller.send_node_status_event(snode, StorageNode.STATUS_ONLINE)
-
-    for dev in snode.nvme_devices:
-        distr_controller.send_dev_status_event(dev, NVMeDevice.STATUS_ONLINE)
-
-    logger.info("Done")
-    return "Success"
-
-
 def delete_storage_node(node_id):
     db_controller = DBController()
     snode = db_controller.get_storage_node_by_id(node_id)