sbcli-dev 10.2.0__tar.gz → 10.2.1__tar.gz

{sbcli_dev-10.2.0 → sbcli_dev-10.2.1}/PKG-INFO

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

{sbcli_dev-10.2.0 → sbcli_dev-10.2.1}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-10.2.0 → sbcli_dev-10.2.1}/simplyblock_core/controllers/lvol_controller.py

@@ -1023,13 +1023,13 @@ def list_lvols(is_json, cluster_id, pool_id_or_name, all=False):
                 for lv in db_controller.get_lvols_by_pool_id(pool.get_id()):
                     lvols.append(lv)
     else:
-        lvols = db_controller.get_lvols()
+        lvols = db_controller.get_all_lvols()
 
     data = []
     for lvol in lvols:
         logger.debug(lvol)
-        if lvol.deleted is True and all is False:
-            continue
+        # if lvol.deleted is True and all is False:
+        #     continue
         data.append({
             "Id": lvol.uuid,
             "Name": lvol.lvol_name,

{sbcli_dev-10.2.0 → sbcli_dev-10.2.1}/simplyblock_core/db_controller.py

@@ -133,14 +133,23 @@ class DBController(metaclass=Singleton):
                 return pool
 
     def get_lvols(self, cluster_id=None) -> List[LVol]:
-        lvols = []
-        if cluster_id:
-            for node in self.get_storage_nodes_by_cluster_id(cluster_id):
-                for lvol in self.get_lvols_by_node_id(node.get_id()):
-                    if lvol:
-                        lvols.append(lvol)
-        else:
-            lvols = LVol().read_from_db(self.kv_store)
+        lvols = self.get_all_lvols()
+        if not cluster_id:
+            return sorted(lvols, key=lambda x: x.create_dt)
+
+        node_ids=[]
+        cluster_lvols = []
+        for node in self.get_storage_nodes_by_cluster_id(cluster_id):
+            node_ids.append(node.get_id())
+
+        for lvol in lvols:
+            if lvol.node_id in node_ids:
+                cluster_lvols.append(lvol)
+
+        return sorted(cluster_lvols, key=lambda x: x.create_dt)
+
+    def get_all_lvols(self) -> List[LVol]:
+        lvols = LVol().read_from_db(self.kv_store)
         return sorted(lvols, key=lambda x: x.create_dt)
 
     def get_lvols_by_node_id(self, node_id) -> List[LVol]:

{sbcli_dev-10.2.0 → sbcli_dev-10.2.1}/simplyblock_core/env_var

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

{sbcli_dev-10.2.0 → sbcli_dev-10.2.1}/simplyblock_web/blueprints/web_api_cluster.py

@@ -90,7 +90,7 @@ def cluster_capacity(uuid, history):
         logger.error(f"Cluster not found {uuid}")
         return utils.get_response_error(f"Cluster not found: {uuid}", 404)
 
-    ret = cluster_ops.get_capacity(uuid, history, parse_sizes=False)
+    ret = cluster_ops.get_capacity(uuid, history, is_json=True)
     return utils.get_response(ret)
 
 

{sbcli_dev-10.2.0 → sbcli_dev-10.2.1}/simplyblock_web/blueprints/web_api_pool.py

@@ -128,23 +128,23 @@ def update_pool(uuid):
 
     pool.pool_name = pool_data.get('name') or pool.pool_name
 
-    if 'pool-max' in pool_data:
-        pool.pool_max_size = utils.parse_size(pool_data['pool-max'])
+    if 'pool_max' in pool_data:
+        pool.pool_max_size = utils.parse_size(pool_data['pool_max'])
 
-    if 'lvol-max' in pool_data:
-        pool.lvol_max_size = utils.parse_size(pool_data['lvol-max'])
+    if 'lvol_max' in pool_data:
+        pool.lvol_max_size = utils.parse_size(pool_data['lvol_max'])
 
-    if 'max-r-iops' in pool_data:
-        pool.max_r_iops = utils.parse_size(pool_data['max-r-iops'])
+    if 'max_r_iops' in pool_data:
+        pool.max_r_iops = utils.parse_size(pool_data['max_r_iops'])
 
-    if 'max-w-iops' in pool_data:
-        pool.max_w_iops = utils.parse_size(pool_data['max-w-iops'])
+    if 'max_w_iops' in pool_data:
+        pool.max_w_iops = utils.parse_size(pool_data['max_w_iops'])
 
-    if 'max-r-mbytes' in pool_data:
-        pool.max_r_mbytes_per_sec = utils.parse_size(pool_data['max-r-mbytes'])
+    if 'max_r_mbytes' in pool_data:
+        pool.max_r_mbytes_per_sec = utils.parse_size(pool_data['max_r_mbytes'])
 
-    if 'max-w-mbytes' in pool_data:
-        pool.max_w_mbytes_per_sec = utils.parse_size(pool_data['max-w-mbytes'])
+    if 'max_w_mbytes' in pool_data:
+        pool.max_w_mbytes_per_sec = utils.parse_size(pool_data['max_w_mbytes'])
 
     pool.write_to_db(db_controller.kv_store)
     return utils.get_response(pool.to_dict())