Merge ~rgildein/juju-verify:ceph/fix-list-pools into ~canonical-solutions-engineering/juju-verify:master

[Robert Gildein]

fix parsing output of "list-pools" action

The "list-pools" action has been changed back to a use "message" instead
of "pools" in action output.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:fe7f30ed75228149619b0b2b724a1b6fe3ba84ca
https://jenkins.canonical.com/bootstack/job/lp-juju-verify-ci/2/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test/2/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/5/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-juju-verify-ci/2//rebuild

review: Needs Fixing (continuous-integration)

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

FAILED: Continuous integration, rev:fe7f30ed75228149619b0b2b724a1b6fe3ba84ca
https://jenkins.canonical.com/bootstack/job/lp-juju-verify-ci/7/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/bootstack/job/lp-charm-test/11/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/23/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-juju-verify-ci/7//rebuild

review: Needs Fixing (continuous-integration)

[Robert Gildein (rgildein)]

I tag it WIP, because of Billy's comment [1].

---
[1]: https://review.opendev.org/c/openstack/charm-ceph-mon/+/781714/6/actions.yaml#216

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:f181aa1aa186b956a7fe93123208eabd6efa6433
https://jenkins.canonical.com/bootstack/job/lp-juju-verify-ci/10/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-full/1/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/63/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-juju-verify-ci/10//rebuild

review: Approve (continuous-integration)

[Martin Kalcok (martin-kalcok)]

LGTM

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 226c21fb6908c70836094c3308aebc96e1b4a2eb

diff --git a/juju_verify/verifiers/ceph.py b/juju_verify/verifiers/ceph.py
index 7f43d84..f9fb0d2 100644
--- a/juju_verify/verifiers/ceph.py
+++ b/juju_verify/verifiers/ceph.py
@@ -71,8 +71,8 @@ class CephCommon(BaseVerifier):  # pylint: disable=W0223
         :raises json.decoder.JSONDecodeError: if json.loads failed
         """
         verify_charm_unit("ceph-mon", unit)
-        action_map = run_action_on_units([unit], "list-pools", detail=True)
-        action_output = data_from_action(action_map.get(unit.entity_id), "pools")
+        action_map = run_action_on_units([unit], "list-pools", format="json")
+        action_output = data_from_action(action_map.get(unit.entity_id), "message")
         logger.debug("parse information about pools: %s", action_output)
         pools: List[Dict[str, Any]] = json.loads(action_output)
 
diff --git a/tests/unit/verifiers/test_ceph.py b/tests/unit/verifiers/test_ceph.py
index 08de557..91c5c7e 100644
--- a/tests/unit/verifiers/test_ceph.py
+++ b/tests/unit/verifiers/test_ceph.py
@@ -86,7 +86,7 @@ def test_check_cluster_health_error(model):
 def test_get_replication_number(mock_run_action_on_units, model):
     """Test get minimum replication number from ceph-mon unit."""
     action = MagicMock()
-    action.data.get.side_effect = {"results": {"pools": json.dumps([
+    action.data.get.side_effect = {"results": {"message": json.dumps([
         {"pool": 1, "name": "test_1", "size": 5, "min_size": 2},
         {"pool": 2, "name": "test_2", "size": 5, "min_size": 2},
         {"pool": 3, "name": "test_3", "size": 3, "min_size": 2},
@@ -97,7 +97,7 @@ def test_get_replication_number(mock_run_action_on_units, model):
     assert CephCommon.get_replication_number(model.units["ceph-mon/0"]) == 1
 
     # test return None if list of pools is empty
-    action.data.get.side_effect = {"results": {"pools": json.dumps([])}}.get
+    action.data.get.side_effect = {"results": {"message": json.dumps([])}}.get
     assert CephCommon.get_replication_number(model.units["ceph-mon/0"]) is None