update sources to v12.1.2

[ceph.git] / ceph / qa / workunits / mon / auth_caps.sh

diff --git a/ceph/qa/workunits/mon/auth_caps.sh b/ceph/qa/workunits/mon/auth_caps.sh
index 74b22778c00876ceee9a70a997fc470a76075b8f..b8c10947424d7ddcecec8f97c053b32288a96c76 100755 (executable)
--- a/ceph/qa/workunits/mon/auth_caps.sh
+++ b/ceph/qa/workunits/mon/auth_caps.sh
@@ -13,8 +13,6 @@ for i in ${combinations}; do
 done
 
 # add special caps
-# force blank cap with '--force'
-keymap["blank"]=`ceph auth get-or-create-key client.blank mon 'allow' --force` || exit 1
 keymap["all"]=`ceph auth get-or-create-key client.all mon 'allow *'` || exit 1
 
 tmp=`mktemp`
@@ -70,7 +68,7 @@ read_ops() {
   expect $ret ceph auth get-key client.admin $args
   expect $ret ceph auth export $args
   expect $ret ceph auth export client.admin $args
-  expect $ret ceph auth list $args
+  expect $ret ceph auth ls $args
   expect $ret ceph auth print-key client.admin $args
   expect $ret ceph auth print_key client.admin $args
 }
@@ -80,7 +78,6 @@ write_ops() {
   local caps=$1
   local has_read=1 has_write=1 has_exec=1
   local ret
-  local err
   local args
 
   ( echo $caps | grep 'r' ) || has_read=0
@@ -103,17 +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
-  echo "wtf -- before: err=$err ret=$ret"
-  err=$ret
-  [[ $ret -eq 0 ]] && err=22 # EINVAL
-  expect $err "ceph auth get-or-create client.bar mon 'allow' $args"
-  echo "wtf -- after: err=$err ret=$ret"
-  expect $ret "ceph auth get-or-create client.bar mon 'allow' --force $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.bar $args
-  expect $ret ceph auth del 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
 }
 
@@ -133,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