From bbfad340a17e681a09f6f935d299b6022ea70e1c Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Tue, 28 Dec 2021 21:08:04 -0500
Subject: [PATCH] Add PGs count to pool list

---
 api-daemon/pvcapid/flaskapi.py |  3 +++
 client-cli/pvc/cli_lib/ceph.py | 19 +++++++++++++++++--
 daemon-common/ceph.py          |  2 ++
 docs/manuals/swagger.json      |  4 ++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/api-daemon/pvcapid/flaskapi.py b/api-daemon/pvcapid/flaskapi.py
index 414ecc54..f04d58dd 100755
--- a/api-daemon/pvcapid/flaskapi.py
+++ b/api-daemon/pvcapid/flaskapi.py
@@ -4229,6 +4229,9 @@ class API_Storage_Ceph_Pool_Root(Resource):
                 tier:
                   type: string
                   description: The device class/tier of the pool
+                pgs:
+                  type: integer
+                  description: The number of PGs (placement groups) for the pool
                 stats:
                   type: object
                   properties:
diff --git a/client-cli/pvc/cli_lib/ceph.py b/client-cli/pvc/cli_lib/ceph.py
index 7fc4c3d1..060cc804 100644
--- a/client-cli/pvc/cli_lib/ceph.py
+++ b/client-cli/pvc/cli_lib/ceph.py
@@ -776,6 +776,7 @@ def format_list_pool(pool_list):
     pool_name_length = 5
     pool_id_length = 3
     pool_tier_length = 5
+    pool_pgs_length = 4
     pool_used_length = 5
     pool_usedpct_length = 6
     pool_free_length = 5
@@ -818,6 +819,11 @@ def format_list_pool(pool_list):
         if _pool_tier_length > pool_tier_length:
             pool_tier_length = _pool_tier_length
 
+        # Set the pgs and length
+        _pool_pgs_length = len(str(pool_information["pgs"])) + 1
+        if _pool_pgs_length > pool_pgs_length:
+            pool_pgs_length = _pool_pgs_length
+
         # Set the used and length
         _pool_used_length = len(str(pool_information["stats"]["used_bytes"])) + 1
         if _pool_used_length > pool_used_length:
@@ -886,10 +892,11 @@ def format_list_pool(pool_list):
             pool_header_length=pool_id_length
             + pool_name_length
             + pool_tier_length
+            + pool_pgs_length
             + pool_used_length
             + pool_usedpct_length
             + pool_free_length
-            + 5,
+            + 6,
             objects_header_length=pool_num_objects_length
             + pool_num_clones_length
             + pool_num_copies_length
@@ -905,10 +912,12 @@ def format_list_pool(pool_list):
                         6,
                         pool_id_length
                         + pool_name_length
+                        + pool_tier_length
+                        + pool_pgs_length
                         + pool_used_length
                         + pool_usedpct_length
                         + pool_free_length
-                        + 3,
+                        + 5,
                     )
                 ]
             ),
@@ -942,6 +951,7 @@ def format_list_pool(pool_list):
 {pool_id: <{pool_id_length}} \
 {pool_name: <{pool_name_length}} \
 {pool_tier: <{pool_tier_length}} \
+{pool_pgs: <{pool_pgs_length}} \
 {pool_used: <{pool_used_length}} \
 {pool_usedpct: <{pool_usedpct_length}} \
 {pool_free: <{pool_free_length}} \
@@ -959,6 +969,7 @@ def format_list_pool(pool_list):
             pool_id_length=pool_id_length,
             pool_name_length=pool_name_length,
             pool_tier_length=pool_tier_length,
+            pool_pgs_length=pool_pgs_length,
             pool_used_length=pool_used_length,
             pool_usedpct_length=pool_usedpct_length,
             pool_free_length=pool_free_length,
@@ -973,6 +984,7 @@ def format_list_pool(pool_list):
             pool_id="ID",
             pool_name="Name",
             pool_tier="Tier",
+            pool_pgs="PGs",
             pool_used="Used",
             pool_usedpct="Used%",
             pool_free="Free",
@@ -994,6 +1006,7 @@ def format_list_pool(pool_list):
 {pool_id: <{pool_id_length}} \
 {pool_name: <{pool_name_length}} \
 {pool_tier: <{pool_tier_length}} \
+{pool_pgs: <{pool_pgs_length}} \
 {pool_used: <{pool_used_length}} \
 {pool_usedpct: <{pool_usedpct_length}} \
 {pool_free: <{pool_free_length}} \
@@ -1011,6 +1024,7 @@ def format_list_pool(pool_list):
                 pool_id_length=pool_id_length,
                 pool_name_length=pool_name_length,
                 pool_tier_length=pool_tier_length,
+                pool_pgs_length=pool_pgs_length,
                 pool_used_length=pool_used_length,
                 pool_usedpct_length=pool_usedpct_length,
                 pool_free_length=pool_free_length,
@@ -1025,6 +1039,7 @@ def format_list_pool(pool_list):
                 pool_id=pool_information["stats"]["id"],
                 pool_name=pool_information["name"],
                 pool_tier=pool_information["tier"],
+                pool_pgs=pool_information["pgs"],
                 pool_used=pool_information["stats"]["used_bytes"],
                 pool_usedpct=pool_information["stats"]["used_percent"],
                 pool_free=pool_information["stats"]["free_bytes"],
diff --git a/daemon-common/ceph.py b/daemon-common/ceph.py
index f4adebd8..e481fbef 100644
--- a/daemon-common/ceph.py
+++ b/daemon-common/ceph.py
@@ -396,11 +396,13 @@ def getPoolInformation(zkhandler, pool):
     tier = zkhandler.read(("pool.tier", pool))
     if tier is None:
         tier = "default"
+    pgs = zkhandler.read(("pool.pgs", pool))
 
     pool_information = {
         "name": pool,
         "volume_count": volume_count,
         "tier": tier,
+        "pgs": pgs,
         "stats": pool_stats,
     }
     return pool_information
diff --git a/docs/manuals/swagger.json b/docs/manuals/swagger.json
index d9677c77..fd043ff8 100644
--- a/docs/manuals/swagger.json
+++ b/docs/manuals/swagger.json
@@ -664,6 +664,10 @@
                     "description": "The name of the pool",
                     "type": "string"
                 },
+                "pgs": {
+                    "description": "The number of PGs (placement groups) for the pool",
+                    "type": "integer"
+                },
                 "stats": {
                     "properties": {
                         "free_bytes": {