sbcli-dev 11.1.2__tar.gz → 11.1.4__tar.gz

{sbcli_dev-11.1.2 → sbcli_dev-11.1.4}/PKG-INFO

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

{sbcli_dev-11.1.2 → sbcli_dev-11.1.4}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-11.1.2 → sbcli_dev-11.1.4}/simplyblock_core/constants.py

@@ -132,4 +132,4 @@ NVMF_MAX_SUBSYSTEMS=50000
 HA_JM_COUNT=3
 
 
-LVOL_PORT=4430
+LVOL_PORT=9090

{sbcli_dev-11.1.2 → sbcli_dev-11.1.4}/simplyblock_core/env_var

@@ -1,5 +1,5 @@
 SIMPLY_BLOCK_COMMAND_NAME=sbcli-dev
-SIMPLY_BLOCK_VERSION=11.1.2
+SIMPLY_BLOCK_VERSION=11.1.4
 
 SIMPLY_BLOCK_DOCKER_IMAGE=simplyblock/simplyblock:main
 DOCKER_USER=hamdysimplyblock

{sbcli_dev-11.1.2 → sbcli_dev-11.1.4}/simplyblock_core/rpc_client.py

@@ -178,7 +178,7 @@ class RPCClient:
                 "trtype": trtype,
                 "adrfam": "IPv4",
                 "traddr": traddr,
-                "trsvcid": trsvcid
+                "trsvcid": str(trsvcid)
             }
         }
         if ana_state:
@@ -896,7 +896,7 @@ class RPCClient:
                 "trtype": trtype,
                 "adrfam": "IPv4",
                 "traddr": traddr,
-                "trsvcid": trsvcid
+                "trsvcid": str(trsvcid)
             }
         }
         return self._request("nvmf_subsystem_remove_listener", params)

{sbcli_dev-11.1.2 → sbcli_dev-11.1.4}/simplyblock_core/snode_client.py

@@ -134,3 +134,12 @@ class SNodeClient:
 
     def get_file_content(self, file_name):
         return self._request("GET", f"get_file_content/{file_name}")
+
+
+    def firewall_set_port(self, port_id, port_type="tcp", action="block"):
+        params = {
+            "port_id": port_id,
+            "port_type": port_type,
+            "action": action,
+        }
+        return self._request("POST", "firewall_set_port", params)

{sbcli_dev-11.1.2 → sbcli_dev-11.1.4}/simplyblock_core/storage_node_ops.py

@@ -2880,12 +2880,15 @@ def recreate_lvstore(snode):
         elif sec_node.status == StorageNode.STATUS_ONLINE:
             sec_rpc_client = RPCClient(sec_node.mgmt_ip, sec_node.rpc_port, sec_node.rpc_username, sec_node.rpc_password)
 
-            for lvol in lvol_list:
-                if lvol.ha_type == "ha":
-                    for iface in sec_node.data_nics:
-                        if iface.ip4_address:
-                            ret = sec_rpc_client.nvmf_subsystem_listener_set_ana_state(
-                                lvol.nqn, iface.ip4_address, constants.LVOL_PORT, False, "inaccessible")
+            # for lvol in lvol_list:
+            #     if lvol.ha_type == "ha":
+            #         for iface in sec_node.data_nics:
+            #             if iface.ip4_address:
+            #                 ret = sec_rpc_client.nvmf_subsystem_listener_set_ana_state(
+            #                     lvol.nqn, iface.ip4_address, constants.LVOL_PORT, False, "inaccessible")
+
+            sec_node_api = SNodeClient(sec_node.api_endpoint)
+            sec_node_api.firewall_set_port(constants.LVOL_PORT, "tcp", "block")
 
             sec_rpc_client.bdev_lvol_set_leader(False, lvs_name=snode.lvstore, bs_nonleadership=True)
             sec_rpc_client.bdev_distrib_force_to_non_leader(snode.jm_vuid)
@@ -2963,13 +2966,16 @@ def recreate_lvstore(snode):
 
     if sec_node and sec_node.status == StorageNode.STATUS_ONLINE:
         time.sleep(10)
-        sec_rpc_client = RPCClient(sec_node.mgmt_ip, sec_node.rpc_port, sec_node.rpc_username, sec_node.rpc_password, timeout=3, retry=2)
-        for lvol in lvol_list:
-            if lvol.ha_type == "ha":
-                for iface in sec_node.data_nics:
-                    if iface.ip4_address:
-                        ret = sec_rpc_client.nvmf_subsystem_listener_set_ana_state(
-                            lvol.nqn, iface.ip4_address, constants.LVOL_PORT, False)
+        sec_node_api = SNodeClient(sec_node.api_endpoint)
+        sec_node_api.firewall_set_port(constants.LVOL_PORT, "tcp", "allow")
+
+        # sec_rpc_client = RPCClient(sec_node.mgmt_ip, sec_node.rpc_port, sec_node.rpc_username, sec_node.rpc_password, timeout=3, retry=2)
+        # for lvol in lvol_list:
+        #     if lvol.ha_type == "ha":
+        #         for iface in sec_node.data_nics:
+        #             if iface.ip4_address:
+        #                 ret = sec_rpc_client.nvmf_subsystem_listener_set_ana_state(
+        #                     lvol.nqn, iface.ip4_address, constants.LVOL_PORT, False)
     return True
 
 

{sbcli_dev-11.1.2 → sbcli_dev-11.1.4}/simplyblock_web/blueprints/snode_ops.py

@@ -483,3 +483,21 @@ def bind_device_to_spdk():
         time.sleep(1)
 
     return utils.get_response(True)
+
+
+@bp.route('/firewall_set_port', methods=['POST'])
+def firewall_set_port():
+    data = request.get_json()
+    if "port_id" not in data:
+        return utils.get_response(False, "Required parameter is missing: port_id")
+    if "port_type" not in data:
+        return utils.get_response(False, "Required parameter is missing: port_type")
+    if "action" not in data:
+        return utils.get_response(False, "Required parameter is missing: action")
+
+    port_id = data['port_id']
+    port_type = data['port_type']
+    action = data['action']
+
+    ret = node_utils.firewall_port(port_id, port_type, block=action=="block")
+    return utils.get_response(ret)

{sbcli_dev-11.1.2 → sbcli_dev-11.1.4}/simplyblock_web/node_utils.py

@@ -170,3 +170,51 @@ def get_memory_details():
 def get_host_arch():
     out, err, rc = run_command("uname -m")
     return out
+
+
+def firewall_port(port_id=9090, port_type="tcp", block=True):
+
+    if block:
+        cmd_list=[
+            "systemctl restart iptables",
+            "iptables -L -n",
+            "iptables -P INPUT ACCEPT",
+            "iptables -P FORWARD ACCEPT",
+            "iptables -P OUTPUT ACCEPT",
+            f"iptables -A INPUT -p {port_type} --dport {port_id} -j DROP",
+            f"iptables -A INPUT -p {port_type} --dport {port_id} -j REJECT",
+            f"iptables -A OUTPUT -p {port_type} --dport {port_id} -j DROP",
+            f"iptables -A OUTPUT -p {port_type} --dport {port_id} -j REJECT"
+        ]
+    else:
+        cmd_list=[
+            "systemctl restart iptables",
+            "iptables -L -n",
+            "iptables -P INPUT ACCEPT",
+            "iptables -P FORWARD ACCEPT",
+            "iptables -P OUTPUT ACCEPT",
+            # f"iptables -D INPUT -p {port_type} --dport {port_id} -j DROP",
+            # f"iptables -D INPUT -p {port_type} --dport {port_id} -j REJECT",
+            # f"iptables -D OUTPUT -p {port_type} --dport {port_id} -j DROP",
+            # f"iptables -D OUTPUT -p {port_type} --dport {port_id} -j REJECT"
+        ]
+# systemctl start iptables
+# iptables -L -n
+# sudo iptables -P INPUT ACCEPT
+# sudo iptables -P FORWARD ACCEPT
+# sudo iptables -P OUTPUT ACCEPT
+
+# iptables -A INPUT -p tcp --dport 9090 -j DROP
+# iptables -A INPUT -p tcp --dport 9090 -j REJECT
+# iptables -A OUTPUT -p tcp --dport 9090 -j DROP
+# iptables -A OUTPUT -p tcp --dport 9090 -j REJECT
+
+    out = ""
+    for cmd in cmd_list:
+        stream = os.popen(cmd)
+        ret = stream.read()
+        if ret != "":
+            out += ret + "\n"
+            logger.info(ret)
+
+    return out