From a5c772955f5f74c2244d298641be9e2a448c9b94 Mon Sep 17 00:00:00 2001 From: Thiago da Silva Date: Mon, 4 Nov 2013 17:08:22 -0500 Subject: make gluster volume name configurable changed code to look at configuration file for the metadata gluster volume name. The default is still gsmetadata Change-Id: I9bf74b9566ea1c9716c42f7ced0f999e02824868 Signed-off-by: Thiago da Silva Reviewed-on: http://review.gluster.org/6225 Reviewed-by: Luis Pabon Tested-by: Luis Pabon --- .../swift/common/middleware/gswauth/swauth/middleware.py | 5 ++++- test/functional_auth/gswauth/conf/proxy-server.conf | 1 + .../common/middleware/gswauth/swauth/test_middleware.py | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/gluster/swift/common/middleware/gswauth/swauth/middleware.py b/gluster/swift/common/middleware/gswauth/swauth/middleware.py index 77ff72c..f01182f 100644 --- a/gluster/swift/common/middleware/gswauth/swauth/middleware.py +++ b/gluster/swift/common/middleware/gswauth/swauth/middleware.py @@ -92,7 +92,10 @@ class Swauth(object): pass raise ValueError(msg) self.swauth_remote_timeout = int(conf.get('swauth_remote_timeout', 10)) - self.auth_account = '%sgsmetadata' % self.reseller_prefix + + self.metadata_volume = conf.get('metadata_volume', 'gsmetadata') + self.auth_account = '%s%s' % (self.reseller_prefix, + self.metadata_volume) self.default_swift_cluster = conf.get( 'default_swift_cluster', 'local#http://127.0.0.1:8080/v1') diff --git a/test/functional_auth/gswauth/conf/proxy-server.conf b/test/functional_auth/gswauth/conf/proxy-server.conf index ddb0290..90beb51 100644 --- a/test/functional_auth/gswauth/conf/proxy-server.conf +++ b/test/functional_auth/gswauth/conf/proxy-server.conf @@ -64,6 +64,7 @@ user_test_tester3 = testing3 use = egg:gluster_swift#swauth set log_name = swauth super_admin_key = swauthkey +metadata_volume = gsmetadata [filter:cache] use = egg:swift#memcache diff --git a/test/unit/common/middleware/gswauth/swauth/test_middleware.py b/test/unit/common/middleware/gswauth/swauth/test_middleware.py index 71c57ab..9ecd7d6 100644 --- a/test/unit/common/middleware/gswauth/swauth/test_middleware.py +++ b/test/unit/common/middleware/gswauth/swauth/test_middleware.py @@ -194,6 +194,20 @@ class TestAuth(unittest.TestCase): 'Invalid auth_type in config file: %s' % 'Nonexistant') + def test_default_metadata_volume_init(self): + app = FakeApp() + ath = auth.filter_factory({})(app) + self.assertEquals(ath.metadata_volume, 'gsmetadata') + + def test_conf_metadata_volume_init(self): + app = FakeApp() + ath = auth.filter_factory( + {'metadata_volume': 'meta_test'})(app) + self.assertEquals(ath.metadata_volume, 'meta_test') + ath = auth.filter_factory( + {'metadata_volume': 'new_meta_volume'})(app) + self.assertEquals(ath.metadata_volume, 'new_meta_volume') + def test_default_swift_cluster_init(self): app = FakeApp() self.assertRaises(Exception, auth.filter_factory({ -- cgit