sbcli-hmdi 0.0.49__tar.gz → 0.0.50__tar.gz

{sbcli_hmdi-0.0.49 → sbcli_hmdi-0.0.50}/PKG-INFO

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

{sbcli_hmdi-0.0.49 → sbcli_hmdi-0.0.50}/sbcli_hmdi.egg-info/PKG-INFO

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

{sbcli_hmdi-0.0.49 → sbcli_hmdi-0.0.50}/simplyblock_core/controllers/pool_controller.py

@@ -129,9 +129,10 @@ def delete_pool(uuid):
         logger.error(f"Pool is disabled")
         return False
 
-    # if pool.lvols:
-    #     logger.error(f"Pool is not empty {uuid}")
-    #     return False
+    lvols = db_controller.get_lvols_by_pool_id(uuid)
+    if lvols and len(lvols) > 0:
+        logger.error(f"Pool {uuid} is not empty, lvols found {len(lvols)}")
+        return False
 
     logger.info(f"Deleting pool {pool.get_id()}")
     pool_events.pool_remove(pool)

{sbcli_hmdi-0.0.49 → sbcli_hmdi-0.0.50}/simplyblock_core/env_var

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

{sbcli_hmdi-0.0.49 → sbcli_hmdi-0.0.50}/simplyblock_core/scripts/install_deps.sh

@@ -37,9 +37,3 @@ sudo chmod 777 /etc/simplyblock
 sudo sh -c 'echo 1 >  /proc/sys/vm/drop_caches'
 
 sudo sed -i 's/ProcessSizeMax=.*/ProcessSizeMax=5G/' /etc/systemd/coredump.conf
-
-sudo iptables -F
-sudo iptables -X
-sudo iptables -P INPUT ACCEPT
-sudo iptables -P FORWARD ACCEPT
-sudo iptables -P OUTPUT ACCEPT

{sbcli_hmdi-0.0.49 → sbcli_hmdi-0.0.50}/simplyblock_web/blueprints/snode_ops.py

@@ -155,7 +155,8 @@ def spdk_process_start():
     spdk_image = constants.SIMPLY_BLOCK_SPDK_ULTRA_IMAGE
     if 'spdk_image' in data and data['spdk_image']:
         spdk_image = data['spdk_image']
-        # node_docker.images.pull(spdk_image)
+
+    node_docker.images.pull(spdk_image)
 
     if "cluster_ip" in data and data['cluster_ip']:
         cluster_ip = data['cluster_ip']

{sbcli_hmdi-0.0.49 → sbcli_hmdi-0.0.50}/simplyblock_web/blueprints/web_api_pool.py

@@ -103,8 +103,11 @@ def delete_pool(uuid):
         if req_secret != pool.secret:
             return utils.get_response_error(f"Pool secret doesn't mach the value in the request header", 400)
 
-    # if pool.lvols:
-    #     return utils.get_response_error(f"Can not delete Pool with LVols", 400)
+    lvols = db_controller.get_lvols_by_pool_id(uuid)
+    if lvols and len(lvols) > 0:
+        msg = f"Pool {uuid} is not empty, lvols found {len(lvols)}"
+        logger.error(msg)
+        return utils.get_response_error(msg, 400)
 
     pool.remove(db_controller.kv_store)
     return utils.get_response("Done")