sbcli-dev 10.2.8__tar.gz → 10.3.0__tar.gz

{sbcli_dev-10.2.8 → sbcli_dev-10.3.0}/PKG-INFO

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

{sbcli_dev-10.2.8 → sbcli_dev-10.3.0}/sbcli_dev.egg-info/PKG-INFO

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

{sbcli_dev-10.2.8 → sbcli_dev-10.3.0}/simplyblock_core/controllers/snapshot_controller.py

@@ -113,7 +113,7 @@ def add(lvol_id, snapshot_name):
             sec_rpc_client = RPCClient(sec_node.mgmt_ip, sec_node.rpc_port, sec_node.rpc_username, sec_node.rpc_password)
             sec_rpc_client.bdev_lvol_set_leader(False, lvs_name=lvol.lvs_name)
             ret = sec_rpc_client.bdev_lvol_snapshot_register(
-                f"{lvol.lvs_name}/{lvol.lvol_bdev}", snapshot_name, snap_uuid, blobid)
+                f"{lvol.lvs_name}/{snap_bdev_name}", snapshot_name, snap_uuid, blobid)
 
 
     snap = SnapShot()

{sbcli_dev-10.2.8 → sbcli_dev-10.3.0}/simplyblock_core/env_var

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

{sbcli_dev-10.2.8 → sbcli_dev-10.3.0}/simplyblock_web/blueprints/web_api_caching_node.py

@@ -169,12 +169,11 @@ def caching_node_list_lvols(uuid):
     return utils.get_response(data)
 
 
-@bp.route('/cachingnode/recreate/<string:hostname>', methods=['GET'])
-def recreate_caching_node(hostname):
-    cnode = db_controller.get_caching_node_by_hostname(hostname)
+@bp.route('/cachingnode/recreate/<string:uuid>', methods=['GET'])
+def recreate_caching_node(uuid):
+    cnode = db_controller.get_caching_node_by_id(uuid)
     if not cnode:
-        return utils.get_response_error(f"Caching node not found: {hostname}", 404)
+        return utils.get_response_error(f"Caching node not found: {uuid}", 404)
 
     data = caching_node_controller.recreate(cnode.get_id())
-
     return utils.get_response(data)

{sbcli_dev-10.2.8 → sbcli_dev-10.3.0}/simplyblock_web/blueprints/web_api_lvol.py

@@ -83,9 +83,21 @@ def lvol_capacity(uuid, history):
             return utils.get_response_error(f"Pool secret doesn't mach the value in the request header", 400)
 
     data = lvol_controller.get_capacity(uuid, history, parse_sizes=False)
+    out = []
+    if data:
+        for record in data:
+            out.append({
+                "date":record["date"],
+                "prov": record["size_prov"],
+                "used": record["size_used"],
+                "free": record["size_free"],
+                "util": record["size_util"],
+                "prov_util": record["size_prov_util"],
+            })
+
     ret = {
         "object_data": lvol.get_clean_dict(),
-        "stats": data or []
+        "stats": out or []
     }
     return utils.get_response(ret)
 

{sbcli_dev-10.2.8 → sbcli_dev-10.3.0}/simplyblock_web/blueprints/web_api_snapshot.py

@@ -45,14 +45,7 @@ def list_snapshots():
     for snap in snaps:
         if snap.cluster_id != cluster_id:
             continue
-        data.append({
-            "uuid": snap.uuid,
-            "name": snap.pool_name,
-            "size": str(snap.lvol.size),
-            "pool_id": snap.pool_uuid,
-            "source_uuid": snap.lvol.get_id(),
-            "created_at": str(snap.created_at),
-        })
+        data.append(snap.get_clean_dict())
     return utils.get_response(data)