From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 15 Mar 2016 18:11:13 +0000 (-0400)
Subject: test: update rbd cli tests to incorporate new mirror image commands
X-Git-Tag: v10.1.0~70^2~7
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7be402281d77cd0fd9b90941039dfdb2687b9f1f;p=ceph.git

test: update rbd cli tests to incorporate new mirror image commands

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/test/cli/rbd/help.t b/src/test/cli/rbd/help.t
index 78897386e4bf0..e68f186a7104d 100644
--- a/src/test/cli/rbd/help.t
+++ b/src/test/cli/rbd/help.t
@@ -42,8 +42,11 @@
       lock remove (lock rm)       Release a lock on an image.
       map                         Map image to a block device using the kernel.
       merge-diff                  Merge two diff exports together.
+      mirror image demote         Demote an image to secondary for RBD mirroring.
       mirror image disable        Disable RBD mirroring for an image.
       mirror image enable         Enable RBD mirroring for an image.
+      mirror image promote        Promote an image to primary for RBD mirroring.
+      mirror image resync         Force resync to primary image for RBD mirroring.
       mirror pool disable         Disable RBD mirroring by default within a pool.
       mirror pool enable          Enable RBD mirroring by default within a pool.
       mirror pool info            Show information about the pool mirroring
@@ -748,6 +751,20 @@
     --path arg           path to merged diff (or '-' for stdout)
     --no-progress        disable progress output
   
+  rbd help mirror image demote
+  usage: rbd mirror image demote [--pool <pool>] [--image <image>] 
+                                 <image-spec> 
+  
+  Demote an image to secondary for RBD mirroring.
+  
+  Positional arguments
+    <image-spec>         image specification
+                         (example: [<pool-name>/]<image-name>)
+  
+  Optional arguments
+    -p [ --pool ] arg    pool name
+    --image arg          image name
+  
   rbd help mirror image disable
   usage: rbd mirror image disable [--force] [--pool <pool>] [--image <image>] 
                                   <image-spec> 
@@ -769,6 +786,35 @@
   
   Enable RBD mirroring for an image.
   
+  Positional arguments
+    <image-spec>         image specification
+                         (example: [<pool-name>/]<image-name>)
+  
+  Optional arguments
+    -p [ --pool ] arg    pool name
+    --image arg          image name
+  
+  rbd help mirror image promote
+  usage: rbd mirror image promote [--force] [--pool <pool>] [--image <image>] 
+                                  <image-spec> 
+  
+  Promote an image to primary for RBD mirroring.
+  
+  Positional arguments
+    <image-spec>         image specification
+                         (example: [<pool-name>/]<image-name>)
+  
+  Optional arguments
+    --force              promote even if not cleanly demoted by remote cluster
+    -p [ --pool ] arg    pool name
+    --image arg          image name
+  
+  rbd help mirror image resync
+  usage: rbd mirror image resync [--pool <pool>] [--image <image>] 
+                                 <image-spec> 
+  
+  Force resync to primary image for RBD mirroring.
+  
   Positional arguments
     <image-spec>         image specification
                          (example: [<pool-name>/]<image-name>)
diff --git a/src/test/cli/rbd/not-enough-args.t b/src/test/cli/rbd/not-enough-args.t
index 20e1e9e2d5b30..72adf186a9736 100644
--- a/src/test/cli/rbd/not-enough-args.t
+++ b/src/test/cli/rbd/not-enough-args.t
@@ -199,4 +199,18 @@
   $ rbd mirror pool peer remove rbd
   rbd: must specify peer uuid
   [22]
-
+  $ rbd mirror image demote
+  rbd: image name was not specified
+  [22]
+  $ rbd mirror image disable
+  rbd: image name was not specified
+  [22]
+  $ rbd mirror image enable
+  rbd: image name was not specified
+  [22]
+  $ rbd mirror image promote
+  rbd: image name was not specified
+  [22]
+  $ rbd mirror image resync
+  rbd: image name was not specified
+  [22]