From cc2b0b7ae5bfc4cf3d24eeaf92646363f693fc2c Mon Sep 17 00:00:00 2001 From: Thiago da Silva Date: Tue, 3 Dec 2013 18:42:23 -0500 Subject: renaming swauth tools to gswauth cli tools for account and user mgmt have been renamed from swauth-* to gswauth-* Updated other configuration and test files accordingly Change-Id: Iced3bb27fbd09da45754ddb264f8fb4528ab423c Signed-off-by: Thiago da Silva Reviewed-on: http://review.gluster.org/6417 Reviewed-by: pushpesh sharma Tested-by: pushpesh sharma Reviewed-by: Shilpa MJ Tested-by: Shilpa MJ Reviewed-by: Luis Pabon Reviewed-on: http://review.gluster.org/6466 Tested-by: Luis Pabon --- test/functional_auth/gswauth/test_gswauth_cli.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'test/functional_auth/gswauth') diff --git a/test/functional_auth/gswauth/test_gswauth_cli.py b/test/functional_auth/gswauth/test_gswauth_cli.py index f81f35e..13deb69 100644 --- a/test/functional_auth/gswauth/test_gswauth_cli.py +++ b/test/functional_auth/gswauth/test_gswauth_cli.py @@ -27,35 +27,35 @@ class Utils: @classmethod def addAccount(self,account_name,authurl='http://127.0.0.1:8080/auth/',user=config['admin_user'],key=config['admin_key']): - return commands.getstatusoutput('swauth-add-account %s -A %s -U %s -K %s' % (account_name,authurl, user, key)) + return commands.getstatusoutput('gswauth-add-account %s -A %s -U %s -K %s' % (account_name,authurl, user, key)) @classmethod def deleteAccount(self,account_name,authurl='http://127.0.0.1:8080/auth/',user=config['admin_user'],key=config['admin_key']): - return commands.getstatusoutput('swauth-delete-account %s -A %s -U %s -K %s' % (account_name,authurl, user, key)) + return commands.getstatusoutput('gswauth-delete-account %s -A %s -U %s -K %s' % (account_name,authurl, user, key)) @classmethod def listAccounts(self,authurl='http://127.0.0.1:8080/auth/',user=config['admin_user'],key=config['admin_key']): - return commands.getstatusoutput('swauth-list -A %s -U %s -K %s' % (authurl, user, key)) + return commands.getstatusoutput('gswauth-list -A %s -U %s -K %s' % (authurl, user, key)) @classmethod def swauthPrep(self,authurl='http://127.0.0.1:8080/auth/',user=config['admin_user'],key=config['admin_key']): - return commands.getstatusoutput('swauth-prep -A %s -U %s -K %s' % (authurl, user, key)) + return commands.getstatusoutput('gswauth-prep -A %s -U %s -K %s' % (authurl, user, key)) @classmethod def addAdminUser(self,account_name,username,password,authurl='http://127.0.0.1:8080/auth/',user=config['admin_user'],key=config['admin_key']): - return commands.getstatusoutput('swauth-add-user -a %s %s %s -A %s -U %s -K %s'% (account_name,username,password,authurl, user, key)) + return commands.getstatusoutput('gswauth-add-user -a %s %s %s -A %s -U %s -K %s'% (account_name,username,password,authurl, user, key)) @classmethod def addUser(self,account_name,username,password,authurl='http://127.0.0.1:8080/auth/',user=config['admin_user'],key=config['admin_key']): - return commands.getstatusoutput('swauth-add-user %s %s %s -A %s -U %s -K %s'% (account_name,username,password,authurl, user, key)) + return commands.getstatusoutput('gswauth-add-user %s %s %s -A %s -U %s -K %s'% (account_name,username,password,authurl, user, key)) @classmethod def addResellerAdminUser(self,account_name,username,password,authurl='http://127.0.0.1:8080/auth/',user=config['admin_user'],key=config['admin_key']): - return commands.getstatusoutput('swauth-add-user -r %s %s %s -A %s -U %s -K %s'% (account_name, username, password, authurl, user, key)) + return commands.getstatusoutput('gswauth-add-user -r %s %s %s -A %s -U %s -K %s'% (account_name, username, password, authurl, user, key)) @classmethod def deleteUser(self,account_name,username,authurl='http://127.0.0.1:8080/auth/',user=config['admin_user'],key=config['admin_key']): - return commands.getstatusoutput('swauth-delete-user %s %s -A %s -U %s -K %s'% (account_name, username, authurl, user, key)) + return commands.getstatusoutput('gswauth-delete-user %s %s -A %s -U %s -K %s'% (account_name, username, authurl, user, key)) @classmethod def cleanAll(self): @@ -74,7 +74,7 @@ class TestSwauthPrep(unittest.TestCase): def testSwauthPrep(self): (status,output)=Utils.swauthPrep() - self.assertEqual(status, 0, 'swuath prep failed with valid credentials'+output) + self.assertEqual(status, 0, 'swauth prep failed with valid credentials'+output) (status,output)=Utils.swauthPrep(key='') self.assertEqual('Usage' in output,True, 'Invalid swauth-prep request accepted(no key provided): '+output) -- cgit