From: Ilya Dryomov <idryomov@gmail.com>
Date: Thu, 20 Mar 2025 17:28:44 +0000 (+0100)
Subject: rbd: mirror_uuids -> mirror_uuid in remote mirror peer listing
X-Git-Tag: testing/wip-vshankar-testing-20250407.170244-debug~91^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8b1ab7e4d70098f4e1cd5e147c28f251ddd50fc6;p=ceph-ci.git

rbd: mirror_uuids -> mirror_uuid in remote mirror peer listing

... in "rbd mirror image status" and "rbd mirror pool status --verbose"
formatted outputs.  In unformatted outputs this value is shown in place
of a name in case a site name isn't available.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
---

diff --git a/src/tools/rbd/action/MirrorImage.cc b/src/tools/rbd/action/MirrorImage.cc
index 996d4c7ef4b..1a392ed9894 100644
--- a/src/tools/rbd/action/MirrorImage.cc
+++ b/src/tools/rbd/action/MirrorImage.cc
@@ -412,7 +412,7 @@ int execute_status(const po::variables_map &vm,
         auto name_it = peer_mirror_uuids_to_name.find(status.mirror_uuid);
         formatter->dump_string("site_name",
           (name_it != peer_mirror_uuids_to_name.end() ? name_it->second : ""));
-        formatter->dump_string("mirror_uuids", status.mirror_uuid);
+        formatter->dump_string("mirror_uuid", status.mirror_uuid);
 
         formatter->dump_string("state", utils::mirror_image_site_status_state(
           status));
diff --git a/src/tools/rbd/action/MirrorPool.cc b/src/tools/rbd/action/MirrorPool.cc
index bf52c1a0176..b0678a38d11 100644
--- a/src/tools/rbd/action/MirrorPool.cc
+++ b/src/tools/rbd/action/MirrorPool.cc
@@ -680,7 +680,7 @@ protected:
           m_formatter->dump_string("site_name",
             (name_it != m_peer_mirror_uuids_to_name.end() ?
                name_it->second : ""));
-          m_formatter->dump_string("mirror_uuids", status.mirror_uuid);
+          m_formatter->dump_string("mirror_uuid", status.mirror_uuid);
 
           m_formatter->dump_string(
             "state", utils::mirror_image_site_status_state(status));