From: Kefu Chai <kchai@redhat.com>
Date: Mon, 19 Jun 2017 03:19:01 +0000 (+0800)
Subject: qa/workunits/mon/auth_caps.sh: remove tests for blank cap
X-Git-Tag: v12.1.1~191^2~1
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=03b4a83f14935174ca121961d64607d84230746e;p=ceph-ci.git

qa/workunits/mon/auth_caps.sh: remove tests for blank cap

* remove tests for blank cap: this feature is not supported/implemented by AuthMonitor.
* remove cap for client.baz after done with it. so we don't have error
  like: "entity client.baz exists but caps do not match" when trying to
  re-set the cap of it.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/qa/workunits/mon/auth_caps.sh b/qa/workunits/mon/auth_caps.sh
index 43d5747ce2d..6c282c4b762 100755
--- a/qa/workunits/mon/auth_caps.sh
+++ b/qa/workunits/mon/auth_caps.sh
@@ -13,7 +13,6 @@ for i in ${combinations}; do
 done
 
 # add special caps
-keymap["blank"]=`ceph auth get-or-create-key client.blank mon 'allow'` || exit 1
 keymap["all"]=`ceph auth get-or-create-key client.all mon 'allow *'` || exit 1
 
 tmp=`mktemp`
@@ -101,10 +100,10 @@ write_ops() {
   expect $ret ceph auth add client.foo $args
   expect $ret "ceph auth caps client.foo mon 'allow *' $args"
   expect $ret ceph auth get-or-create client.admin $args
-  expect $ret "ceph auth get-or-create client.bar mon 'allow' $args"
   expect $ret ceph auth get-or-create-key client.admin $args
   expect $ret ceph auth get-or-create-key client.baz $args
   expect $ret ceph auth del client.foo $args
+  expect $ret ceph auth del client.baz $args
   expect $ret ceph auth import -i $tmp $args
 }
 
@@ -124,7 +123,7 @@ for i in ${!keymap[@]}; do
 done
 
 # cleanup
-for i in ${combinations} blank all; do
+for i in ${combinations} all; do
   ceph auth del client.$i || exit 1
 done