From c4b78ed6ca18f3d9ed40618ad208e43d73b026c3 Mon Sep 17 00:00:00 2001
From: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
Date: Wed, 2 Nov 2022 16:39:24 +0530
Subject: [PATCH] rbd: add namespace to get_detach_arguments

Signed-off-by: Prasanna Kumar Kalever <prasanna.kalever@redhat.com>
(cherry picked from commit 762c4e66c051a087f5c218e11aa5814ba74ef40d)
---
 src/test/cli/rbd/help.t        | 9 +++++----
 src/tools/rbd/action/Device.cc | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t
index 35f781b371acf..ddb72186c77bc 100644
--- a/src/test/cli/rbd/help.t
+++ b/src/test/cli/rbd/help.t
@@ -610,20 +610,21 @@
   
   rbd help device detach
   usage: rbd device detach [--device-type <device-type>] [--pool <pool>] 
-                           [--image <image>] [--snap <snap>] 
-                           [--options <options>] 
+                           [--namespace <namespace>] [--image <image>] 
+                           [--snap <snap>] [--options <options>] 
                            <image-or-snap-or-device-spec> 
   
   Detach image from device.
   
   Positional arguments
     <image-or-snap-or-device-spec>  image, snapshot, or device specification
-                                    [<pool-name>/]<image-name>[@<snap-name>] or
-                                    <device-path>
+                                    [<pool-name>/[<namespace>/]]<image-name>[@<sna
+                                    p-name>] or <device-path>
   
   Optional arguments
     -t [ --device-type ] arg        device type [ggate, krbd (default), nbd]
     -p [ --pool ] arg               pool name
+    --namespace arg                 namespace name
     --image arg                     image name
     --snap arg                      snapshot name
     -o [ --options ] arg            device specific options
diff --git a/src/tools/rbd/action/Device.cc b/src/tools/rbd/action/Device.cc
index 078f944cc6de1..022abef9011e9 100644
--- a/src/tools/rbd/action/Device.cc
+++ b/src/tools/rbd/action/Device.cc
@@ -236,8 +236,9 @@ void get_detach_arguments(po::options_description *positional,
   positional->add_options()
     ("image-or-snap-or-device-spec",
      "image, snapshot, or device specification\n"
-     "[<pool-name>/]<image-name>[@<snap-name>] or <device-path>");
+     "[<pool-name>/[<namespace>/]]<image-name>[@<snap-name>] or <device-path>");
   at::add_pool_option(options, at::ARGUMENT_MODIFIER_NONE);
+  at::add_namespace_option(options, at::ARGUMENT_MODIFIER_NONE);
   at::add_image_option(options, at::ARGUMENT_MODIFIER_NONE);
   at::add_snap_option(options, at::ARGUMENT_MODIFIER_NONE);
   add_device_specific_options(options);
-- 
2.39.5