x/swiftonhpss
Code Issues Proposed changes

renaming instances of swauth to gswauth

Browse Source 
changed code where appropriate to gswauth
instead of swauth

Change-Id: Iadcec4f379fae3f063379b4899797b375290cc7b
Signed-off-by: Thiago da Silva <thiago@redhat.com>
Reviewed-on: http://review.gluster.org/6226
Reviewed-by: Luis Pabon <lpabon@redhat.com>
Tested-by: Luis Pabon <lpabon@redhat.com>
This commit is contained in:
Thiago da Silva 2013-11-05 14:32:59 -05:00 committed by Luis Pabon
parent 810b399d24
commit 40553ff958
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gluster/swift/common/middleware/gswauth/swauth/middleware.py
View File

@ -59,7 +59,7 @@ class Swauth(object):
def __init__(self, app, conf): def __init__(self, app, conf):
self.app = app self.app = app
self.conf = conf self.conf = conf
self.logger = get_logger(conf, log_route='swauth') self.logger = get_logger(conf, log_route='gswauth')
self.log_headers = conf.get('log_headers', 'no').lower() in TRUE_VALUES self.log_headers = conf.get('log_headers', 'no').lower() in TRUE_VALUES
self.reseller_prefix = conf.get('reseller_prefix', 'AUTH').strip() self.reseller_prefix = conf.get('reseller_prefix', 'AUTH').strip()
if self.reseller_prefix and self.reseller_prefix[-1] != '_': if self.reseller_prefix and self.reseller_prefix[-1] != '_':
@ -148,7 +148,7 @@ class Swauth(object):
raise Exception( raise Exception(
'Invalid auth_type in config file: %s' 'Invalid auth_type in config file: %s'
% self.auth_type) % self.auth_type)
self.auth_encoder.salt = conf.get('auth_type_salt', 'swauthsalt') self.auth_encoder.salt = conf.get('auth_type_salt', 'gswauthsalt')
self.allow_overrides = \ self.allow_overrides = \
conf.get('allow_overrides', 't').lower() in TRUE_VALUES conf.get('allow_overrides', 't').lower() in TRUE_VALUES
self.agent = '%(orig)s Swauth' self.agent = '%(orig)s Swauth'

4
setup.py
View File

@ -67,8 +67,8 @@ setup(
'account=gluster.swift.account.server:app_factory', 'account=gluster.swift.account.server:app_factory',
], ],
'paste.filter_factory': [ 'paste.filter_factory': [
'swauth=gluster.swift.common.middleware.gswauth.swauth.middleware:' 'gswauth=gluster.swift.common.middleware.gswauth.swauth.'
'filter_factory', 'middleware:filter_factory',
], ],
}, },
) )

10
test/functional_auth/gswauth/conf/proxy-server.conf
View File

@ -5,7 +5,7 @@ user = root
workers = 1 workers = 1
[pipeline:main] [pipeline:main]
pipeline = catch_errors healthcheck proxy-logging cache swauth proxy-logging proxy-server pipeline = catch_errors healthcheck proxy-logging cache gswauth proxy-logging proxy-server
[app:proxy-server] [app:proxy-server]
use = egg:gluster_swift#proxy use = egg:gluster_swift#proxy
@ -60,10 +60,10 @@ user_test_tester = testing .admin
user_test2_tester2 = testing2 .admin user_test2_tester2 = testing2 .admin
user_test_tester3 = testing3 user_test_tester3 = testing3
[filter:swauth] [filter:gswauth]
use = egg:gluster_swift#swauth use = egg:gluster_swift#gswauth
set log_name = swauth set log_name = gswauth
super_admin_key = swauthkey super_admin_key = gswauthkey
metadata_volume = gsmetadata metadata_volume = gsmetadata
[filter:cache] [filter:cache]

2
test/functional_auth/gswauth/conf/test.conf
View File

@ -12,7 +12,7 @@ auth_prefix = /auth/
#auth_prefix = /v2.0/ #auth_prefix = /v2.0/
# GSWauth internal admin user configuration information # GSWauth internal admin user configuration information
admin_key = swauthkey admin_key = gswauthkey
admin_user = .super_admin admin_user = .super_admin
# Primary functional test account (needs admin access to the account) # Primary functional test account (needs admin access to the account)

10
tools/gswauth_functional_tests.sh
View File

@ -59,10 +59,10 @@ run_generic_tests()
gswauth_cleanup gswauth_cleanup
#swauth-prep #swauth-prep
sudo_env swauth-prep -K swauthkey || fail "Unable to prep gswauth" sudo_env swauth-prep -K gswauthkey || fail "Unable to prep gswauth"
sudo_env swauth-add-user -K swauthkey -a test tester testing || fail "Unable to add user test" sudo_env swauth-add-user -K gswauthkey -a test tester testing || fail "Unable to add user test"
sudo_env swauth-add-user -K swauthkey -a test2 tester2 testing2 || fail "Unable to add user test2" sudo_env swauth-add-user -K gswauthkey -a test2 tester2 testing2 || fail "Unable to add user test2"
sudo_env swauth-add-user -K swauthkey test tester3 testing3 || fail "Unable to add user test3" sudo_env swauth-add-user -K gswauthkey test tester3 testing3 || fail "Unable to add user test3"
nosetests -v --exe \ nosetests -v --exe \
--with-xunit \ --with-xunit \
@ -105,7 +105,7 @@ sudo service memcached start || fail "Unable to start memcached"
sudo_env swift-init main start || fail "Unable to start swift" sudo_env swift-init main start || fail "Unable to start swift"
#swauth-prep #swauth-prep
sudo_env swauth-prep -K swauthkey || fail "Unable to prep gswauth" sudo_env swauth-prep -K gswauthkey || fail "Unable to prep gswauth"
mkdir functional_tests > /dev/null 2>&1 mkdir functional_tests > /dev/null 2>&1
nosetests -v --exe \ nosetests -v --exe \