rgw/test [squid]: add missing ceph and call_ceph shell functions

Add ceph() and call_ceph() helper functions to test-rgw-common.sh
that were missed during the backport of commit 94947c.

The test_multi.py ceph_admin() method calls test-rgw-call.sh with
'call_ceph' which requires these shell functions to exist.

Signed-off-by: Oguzhan Ozmen <oozmen@bloomberg.net>

diff --git a/src/test/rgw/test-rgw-common.sh b/src/test/rgw/test-rgw-common.sh
index 9129092898e6406df3c4d965446357cea0c4b052..42326dbb403360cc841d1d19ea9647bb24a42c6b 100644 (file)
--- a/src/test/rgw/test-rgw-common.sh
+++ b/src/test/rgw/test-rgw-common.sh
@@ -86,6 +86,11 @@ function rgw {
   echo "$mrgw $name $port $ssl_port $rgw_flags $@"
 }
 
+function ceph {
+  [ $# -lt 1 ] && echo "ceph() needs atleast 1 param" && exit 1
+  echo "$mrun $1 ceph"
+}
+
 function init_first_zone {
   [ $# -ne 7 ] && echo "init_first_zone() needs 7 params" && exit 1
 
@@ -161,6 +166,13 @@ function call_rgw_admin {
   x $(rgw_admin $cid) "$@"
 }
 
+function call_ceph {
+  cid=$1
+  shift 1
+  echo $@
+  x $(ceph $cid) "$@"
+}
+
 function get_mstart_parameters {
   [ $# -ne 1 ] && echo "get_mstart_parameters() needs 1 param" && exit 1
   # bash arrays start from zero