From: Nishtha Rai <nishtha3rai@gmail.com>
Date: Mon, 27 Jul 2015 12:58:40 +0000 (+0530)
Subject: test_auth_caps: remove grp mount
X-Git-Tag: v10.0.0~123^2~54
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=00d7480511c985cdb09f577609ea95f6f7cc212b;p=ceph.git

test_auth_caps: remove grp mount

Signed-off-by: Nishtha Rai <nishtha3rai@gmail.com>
---

diff --git a/qa/workunits/fs/test_auth_caps.sh b/qa/workunits/fs/test_auth_caps.sh
index 8e7d7e38cbca..3367350a9d5d 100644
--- a/qa/workunits/fs/test_auth_caps.sh
+++ b/qa/workunits/fs/test_auth_caps.sh
@@ -6,14 +6,13 @@ cleanup()
 	sudo rm -rf mnt.admin/foo1 mnt.admin/foo2 mnt.admin/foo3 mnt.admin/foo4 mnt.admin/foo5 mnt.admin/foo6
 	fusermount -u mnt.admin
 	fusermount -u mnt.foo
-	fusermount -u mnt.grp
-	rmdir mnt.admin mnt.foo mnt.grp
-	rm keyring.foo keyring.grp
+	rmdir mnt.admin mnt.foo
+	rm keyring.foo
 }
 trap cleanup INT TERM EXIT
 
 echo "*** Creating directories for mount"
-mkdir -p mnt.admin mnt.foo mnt.grp
+mkdir -p mnt.admin mnt.foo
 
 
 echo "*** Trying mount as admin"
@@ -23,24 +22,17 @@ echo "*** Trying mount as admin"
 echo "*** Trying mount as client.foo"
 UID="$(id -u)"
 OTH_UID=$((UID+1))
-AUTH_TEMPLATE='./ceph-authtool -C keyring.foo -n client.foo --cap osd "allow rw" --cap mon "allow rw" --cap mds "allow rw uid=UID" --gen-key'
-AUTH="$(echo $AUTH_TEMPLATE | sed -e 's/UID/'$UID'/g')"
-eval $AUTH
-./ceph auth import -i keyring.foo
-./ceph-fuse mnt.foo -n client.foo -k keyring.foo
-
-
-echo "*** Trying mount as client.grp"
 GID="$(id -g)"
-GRP_AUTH_TEMPLATE='./ceph-authtool -C keyring.grp -n client.grp --cap osd "allow rw" --cap mon "allow rw" --cap mds "allow rw uid=UID gids=GID" --gen-key'
+GRP_AUTH_TEMPLATE='./ceph-authtool -C keyring.foo -n client.foo --cap osd "allow rw" --cap mon "allow rw" --cap mds "allow rw uid=UID gids=GID" --gen-key'
 GRP_AUTH="$(echo $GRP_AUTH_TEMPLATE | sed -e 's/UID/'$UID'/g')"
 GRP_AUTH="$(echo $GRP_AUTH | sed -e 's/GID/'$GID'/g')"
 eval $GRP_AUTH
-./ceph auth import -i keyring.grp
-./ceph-fuse mnt.grp -n client.grp -k keyring.grp
+./ceph auth import -i keyring.foo
+./ceph-fuse mnt.foo -n client.foo -k keyring.foo
 
 
 echo "*** Creating directories for client.admin"
+
 sudo mkdir -m 777 mnt.admin/foo1
 sudo mkdir -m 700 mnt.admin/foo2
 sudo mkdir -m 755 mnt.admin/foo3
@@ -48,25 +40,37 @@ sudo mkdir -m 755 mnt.admin/foo4
 sudo mkdir -m 775 mnt.admin/foo5
 sudo mkdir -m 755 mnt.admin/foo6
 
+ls -lsv mnt.admin
+
 echo "*** Granting ownership of directories to other users"
+sudo chgrp $GID mnt.admin/foo1
 sudo chown $USER mnt.admin/foo1
+sudo chgrp $GID mnt.admin/foo2
 sudo chown $USER mnt.admin/foo2
+
+sudo chgrp $GID mnt.admin/foo3
 sudo chown $USER mnt.admin/foo3
+sudo chgrp $GID mnt.admin/foo4
 sudo chown $OTH_UID mnt.admin/foo4
+
 sudo chgrp $GID mnt.admin/foo5
 sudo chgrp $GID mnt.admin/foo6
 
+ls -lsv mnt.foo
+
 echo "*** Testing auth checks"
 expect_false()
 {
 	set -x
 	if "$@"; then return 1; else return 0; fi
 }
+
+
 mkdir mnt.foo/foo1/asdf
 expect_false mkdir mnt.foo/foo2/asdf
 mkdir mnt.foo/foo3/asdf
 expect_false mkdir mnt.foo/foo4/asdf
-mkdir mnt.grp/foo5/asdf
-expect_false mkdir mnt.grp/foo6/asdf
+mkdir mnt.foo/foo5/asdf
+expect_false mkdir mnt.foo/foo6/asdf