sbcli-hmdi 0.0.54__tar.gz → 0.0.56__tar.gz

{sbcli_hmdi-0.0.54 → sbcli_hmdi-0.0.56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sbcli-hmdi
-Version: 0.0.54
+Version: 0.0.56
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_hmdi-0.0.54 → sbcli_hmdi-0.0.56}/sbcli_hmdi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sbcli-hmdi
-Version: 0.0.54
+Version: 0.0.56
 Summary: CLI for managing SimplyBlock cluster
 Home-page: https://www.simplyblock.io/
 Author: Hamdy

{sbcli_hmdi-0.0.54 → sbcli_hmdi-0.0.56}/simplyblock_cli/cli.py

@@ -403,6 +403,8 @@ class CLIWrapper:
         # update cluster
         sub_command = self.add_sub_command(subparser, "update", 'Update cluster mgmt services')
         sub_command.add_argument("id", help='cluster UUID').completer = self._completer_get_cluster_list
+        sub_command.add_argument("--mgmt-only", help='Update mgmt services only', dest='mgmt_only', type=bool, default=False)
+        sub_command.add_argument("--restart", help='Update mgmt services only', dest='restart', type=bool, default=False)
 
         # graceful-shutdown storage nodes
         sub_command = self.add_sub_command(subparser, "graceful-shutdown", 'Graceful shutdown of storage nodes')
@@ -1022,7 +1024,7 @@ class CLIWrapper:
             elif sub_command == "get":
                 ret = cluster_ops.get_cluster(args.id)
             elif sub_command == "update":
-                ret = cluster_ops.update_cluster(args.id)
+                ret = cluster_ops.update_cluster(args.id, mgmt_only=args.mgmt_only, restart_cluster=args.restart)
 
             elif sub_command == "list-tasks":
                 ret = tasks_controller.list_tasks(args.cluster_id)

{sbcli_hmdi-0.0.54 → sbcli_hmdi-0.0.56}/simplyblock_core/cluster_ops.py

@@ -15,7 +15,7 @@ import docker
 import requests
 from jinja2 import Environment, FileSystemLoader
 
-from simplyblock_core import utils, scripts, constants, mgmt_node_ops, storage_node_ops, distr_controller
+from simplyblock_core import utils, scripts, constants, mgmt_node_ops, storage_node_ops, distr_controller, shell_utils
 from simplyblock_core.controllers import cluster_events, device_controller, storage_events, pool_controller, \
     lvol_controller
 from simplyblock_core.db_controller import DBController
@@ -991,19 +991,26 @@ def get_cluster(cl_id):
     return json.dumps(cluster.get_clean_dict(), indent=2, sort_keys=True)
 
 
-def update_cluster(cl_id):
+def update_cluster(cl_id, mgmt_only=False, restart_cluster=False):
     db_controller = DBController()
     cluster = db_controller.get_cluster_by_id(cl_id)
     if not cluster:
         logger.error(f"Cluster not found {cl_id}")
         return False
 
-    # try:
-    #     out, _, ret_code = shell_utils.run_command("pip install sbcli-dev --upgrade")
-    #     if ret_code == 0:
-    #         logger.info("sbcli-dev is upgraded")
-    # except Exception as e:
-    #     logger.error(e)
+    if cluster.status != Cluster.STATUS_ACTIVE:
+        logger.error(f"Cluster is not active")
+        return False
+
+    set_cluster_status(cl_id, Cluster.STATUS_SUSPENDED)
+
+    try:
+        sbcli=constants.SIMPLY_BLOCK_CLI_NAME
+        out, _, ret_code = shell_utils.run_command(f"pip install {sbcli} --upgrade")
+        if ret_code == 0:
+            logger.info(f"{sbcli} upgraded")
+    except Exception as e:
+        logger.error(e)
 
     try:
         logger.info("Updating mgmt cluster")
@@ -1015,15 +1022,24 @@ def update_cluster(cl_id):
             if image_without_tag in service.attrs['Spec']['Labels']['com.docker.stack.image']:
                 logger.info(f"Updating service {service.name}")
                 service.update(image=constants.SIMPLY_BLOCK_DOCKER_IMAGE, force_update=True)
-        logger.info("Done")
+        logger.info("Done updating mgmt cluster")
     except Exception as e:
         print(e)
 
-    for node in db_controller.get_storage_nodes_by_cluster_id(cl_id):
-        try:
-            storage_node_ops.start_storage_node_api_container(node.mgmt_ip)
-        except:
-            pass
+    if not mgmt_only:
+        logger.info("updating storage nodes")
+        for node in db_controller.get_storage_nodes_by_cluster_id(cl_id):
+            if node.status in [StorageNode.STATUS_ONLINE, StorageNode.STATUS_SUSPENDED]:
+                try:
+                    storage_node_ops.start_storage_node_api_container(node.mgmt_ip)
+                except Exception as e:
+                    logger.error(e)
+
+        if restart_cluster:
+            logger.info("Restarting cluster")
+            ret = cluster_grace_shutdown(cl_id)
+            if ret:
+                cluster_grace_startup(cl_id)
 
     logger.info("Done")
     return True
@@ -1059,13 +1075,12 @@ def cluster_grace_shutdown(cl_id):
 
     st = db_controller.get_storage_nodes_by_cluster_id(cl_id)
     for node in st:
-        logger.info(f"Suspending node: {node.get_id()}")
-        storage_node_ops.suspend_storage_node(node.get_id())
-        logger.info(f"Shutting down node: {node.get_id()}")
-        storage_node_ops.shutdown_storage_node(node.get_id())
+        if node.status == StorageNode.STATUS_ONLINE:
+            logger.info(f"Suspending node: {node.get_id()}")
+            storage_node_ops.suspend_storage_node(node.get_id())
+            logger.info(f"Shutting down node: {node.get_id()}")
+            storage_node_ops.shutdown_storage_node(node.get_id())
 
-    logger.info(f"Suspending cluster: {cl_id}")
-    suspend_cluster(cl_id)
     return True
 
 

{sbcli_hmdi-0.0.54 → sbcli_hmdi-0.0.56}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-hmdi
-SIMPLY_BLOCK_VERSION=0.0.54
+SIMPLY_BLOCK_VERSION=0.0.56
 
 SIMPLY_BLOCK_DOCKER_IMAGE=public.ecr.aws/simply-block/simplyblock:hmdi
 DOCKER_USER=hamdysimplyblock

{sbcli_hmdi-0.0.54 → sbcli_hmdi-0.0.56}/simplyblock_core/storage_node_ops.py

@@ -2577,18 +2577,21 @@ def deploy(ifname):
 
 def start_storage_node_api_container(node_ip):
     node_docker = docker.DockerClient(base_url=f"tcp://{node_ip}:2375", version="auto", timeout=60 * 5)
+
+
+
+    logger.info(f"Pulling image {constants.SIMPLY_BLOCK_DOCKER_IMAGE}")
     node_docker.images.pull(constants.SIMPLY_BLOCK_DOCKER_IMAGE)
 
+    logger.info("Recreating SNodeAPI container")
+
     # create the api container
     nodes = node_docker.containers.list(all=True)
     for node in nodes:
         if node.attrs["Name"] == "/SNodeAPI":
-            logger.info("SNodeAPI container found, removing...")
             node.stop(timeout=1)
             node.remove(force=True)
-            # time.sleep(1)
 
-    logger.info("Creating SNodeAPI container")
     container = node_docker.containers.run(
         constants.SIMPLY_BLOCK_DOCKER_IMAGE,
         "python simplyblock_web/node_webapp.py storage_node",
@@ -2609,9 +2612,9 @@ def start_storage_node_api_container(node_ip):
             f"DOCKER_IP={node_ip}"
         ]
     )
-    logger.info("Pulling SPDK images")
-    logger.debug(constants.SIMPLY_BLOCK_SPDK_ULTRA_IMAGE)
+    logger.info(f"Pulling image {constants.SIMPLY_BLOCK_SPDK_ULTRA_IMAGE}")
     node_docker.images.pull(constants.SIMPLY_BLOCK_SPDK_ULTRA_IMAGE)
+    return True
 
 
 def deploy_cleaner():

{sbcli_hmdi-0.0.54 → sbcli_hmdi-0.0.56}/simplyblock_web/node_utils.py

@@ -5,6 +5,8 @@ import logging
 import os
 import subprocess
 
+import jc
+
 from simplyblock_web import utils
 
 logger = logging.getLogger(__name__)
@@ -173,27 +175,31 @@ def get_host_arch():
 
 
 def firewall_port(port_id=9090, port_type="tcp", block=True):
+    cmd_list = []
+    try:
+        iptables_command_output = firewall_get()
+        result = jc.parse('iptables', iptables_command_output)
+        for chain in result:
+            if chain['chain'] in ["INPUT", "OUTPUT"]:
+                for rule in chain['rules']:
+                    if str(port_id) in rule['options']:
+                        cmd_list.append(f"iptables -D {chain['chain']} -p {port_type} --dport {port_id} -j {rule['target']}")
 
-    if block:
-        cmd_list=[
+    except Exception as e:
+        logger.error(e)
 
-            f"iptables -D INPUT -p {port_type} --dport {port_id} -j ACCEPT",
-            f"iptables -D OUTPUT -p {port_type} --dport {port_id} -j ACCEPT",
+    if block:
+        cmd_list.extend([
             f"iptables -A INPUT -p {port_type} --dport {port_id} -j DROP",
             f"iptables -A OUTPUT -p {port_type} --dport {port_id} -j DROP",
-            "iptables -L -n",
-        ]
+            "iptables -L -n -v",
+        ])
     else:
-        cmd_list=[
-
-            f"iptables -D INPUT -p {port_type} --dport {port_id} -j DROP",
-            f"iptables -D OUTPUT -p {port_type} --dport {port_id} -j DROP",
-
-            f"iptables -A INPUT -p {port_type} --dport {port_id} -j ACCEPT",
-            f"iptables -A OUTPUT -p {port_type} --dport {port_id} -j ACCEPT",
-            "iptables -L -n",
-
-        ]
+        cmd_list.extend([
+            # f"iptables -A INPUT -p {port_type} --dport {port_id} -j ACCEPT",
+            # f"iptables -A OUTPUT -p {port_type} --dport {port_id} -j ACCEPT",
+            "iptables -L -n -v",
+        ])
 
     out = ""
     for cmd in cmd_list:

{sbcli_hmdi-0.0.54 → sbcli_hmdi-0.0.56}/simplyblock_web/requirements.txt

@@ -3,4 +3,6 @@ py-cpuinfo
 kubernetes
 graypy
 ec2-metadata
-prometheus-client
+prometheus-client
+jc
+setuptools>70.0.0