From: songweibin <song.weibin@zte.com.cn>
Date: Mon, 3 Sep 2018 07:15:38 +0000 (+0800)
Subject: rbd: sort to display group image by name
X-Git-Tag: v14.0.1~297^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1c03ee1c1d119d298ff174c8fc1f54d42fc487fa;p=ceph.git

rbd: sort to display group image by name

Signed-off-by: songweibin <song.weibin@zte.com.cn>
---

diff --git a/src/tools/rbd/action/Group.cc b/src/tools/rbd/action/Group.cc
index 7cc9c299e8cd8..4a5b6a21ffdaa 100644
--- a/src/tools/rbd/action/Group.cc
+++ b/src/tools/rbd/action/Group.cc
@@ -428,6 +428,16 @@ int execute_list_images(const po::variables_map &vm,
   if (r < 0)
     return r;
 
+  std::sort(images.begin(), images.end(),
+    [](const librbd::group_image_info_t &lhs,
+       const librbd::group_image_info_t &rhs) {
+      if (lhs.pool != rhs.pool) {
+        return lhs.pool < rhs.pool;
+      }
+      return lhs.name < rhs.name;
+    }
+  );
+
   if (f)
     f->open_array_section("images");