sbcli-hmdi 0.0.53__tar.gz → 0.0.55__tar.gz

{sbcli_hmdi-0.0.53 → sbcli_hmdi-0.0.55}/PKG-INFO

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

{sbcli_hmdi-0.0.53 → sbcli_hmdi-0.0.55}/sbcli_hmdi.egg-info/PKG-INFO

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

{sbcli_hmdi-0.0.53 → sbcli_hmdi-0.0.55}/simplyblock_core/env_var

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

{sbcli_hmdi-0.0.53 → sbcli_hmdi-0.0.55}/simplyblock_core/snode_client.py

@@ -16,7 +16,7 @@ class SNodeClientException(Exception):
 
 class SNodeClient:
 
-    def __init__(self, ip_address, timeout=120, retry=5):
+    def __init__(self, ip_address, timeout=300, retry=5):
         self.ip_address = ip_address
         self.url = 'http://%s/snode/' % self.ip_address
         self.timeout = timeout

{sbcli_hmdi-0.0.53 → sbcli_hmdi-0.0.55}/simplyblock_core/storage_node_ops.py

@@ -949,10 +949,7 @@ def add_node(cluster_id, node_ip, iface_name, data_nics_list,
         return False
 
     logger.info(f"Adding Storage node: {node_ip}")
-    timeout = 90
-    if spdk_image:
-        timeout = 5 * 60
-    snode_api = SNodeClient(node_ip, timeout=timeout, retry=10)
+    snode_api = SNodeClient(node_ip)
     node_info, _ = snode_api.info()
     if not node_info:
         logger.error("SNode API is not reachable")

{sbcli_hmdi-0.0.53 → sbcli_hmdi-0.0.55}/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",
-
+        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",
-
-        ]
+            "iptables -L -n -v",
+        ])
 
     out = ""
     for cmd in cmd_list:

{sbcli_hmdi-0.0.53 → sbcli_hmdi-0.0.55}/simplyblock_web/requirements.txt

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