diff --git a/etc/k2k-proxy.conf b/etc/k2k-proxy.conf index d88ee37..9919fcc 100644 --- a/etc/k2k-proxy.conf +++ b/etc/k2k-proxy.conf @@ -1,3 +1,12 @@ +[DEFAULT] +aggregation=True +token_caching=False +search_by_broadcast=True +service_providers=default, coffee-sp +caching=True +image_api_versions = v2.3, v2.2, v2.1, v2.0, v1.1, v1.0 +volume_api_versions = v3.0, v2.0, v1.0 + [database] connection="sqlite:////home/ubuntu/proxy.db" @@ -9,15 +18,6 @@ password="nomoresecrete" project_name="admin" project_domain_id="default" -[proxy] -aggregation=True -token_caching=False -search_by_broadcast=True -service_providers=default, coffee-sp -caching=True -image_api_versions = v2.3, v2.2, v2.1, v2.0, v1.1, v1.0 -volume_api_versions = v3.0, v2.0, v1.0 - [cache] enabled=True backend=dogpile.cache.memory diff --git a/mixmatch/config.py b/mixmatch/config.py index 5322b94..9b3148d 100644 --- a/mixmatch/config.py +++ b/mixmatch/config.py @@ -24,8 +24,6 @@ CONF = cfg.CONF # Proxy -proxy_group = cfg.OptGroup(name='proxy', - title='Proxy Config Group') proxy_opts = [ cfg.IntOpt('port', @@ -92,8 +90,7 @@ keystone_opts = [ ] -CONF.register_group(proxy_group) -CONF.register_opts(proxy_opts, proxy_group) +CONF.register_opts(proxy_opts) CONF.register_group(keystone_group) CONF.register_opts(keystone_opts, keystone_group) @@ -108,7 +105,7 @@ MEMOIZE_SESSION = None session_cache_region = cache.create_region() MEMOIZE_SESSION = cache.get_memoization_decorator( - CONF, session_cache_region, group="proxy") + CONF, session_cache_region, group=None) def load_config(): @@ -129,7 +126,7 @@ def more_config(): """ cache.configure_cache_region(CONF, session_cache_region) - for service_provider in CONF.proxy.service_providers: + for service_provider in CONF.service_providers: sp_group = cfg.OptGroup(name='sp_%s' % service_provider, title=service_provider) diff --git a/mixmatch/listener.py b/mixmatch/listener.py index ab272bd..dc24ab8 100644 --- a/mixmatch/listener.py +++ b/mixmatch/listener.py @@ -187,7 +187,7 @@ if __name__ == "__main__": model.create_tables() LOG.info("Now listening for changes") - for sp in CONF.proxy.service_providers: + for sp in CONF.service_providers: get_server_for_sp(sp).start() while True: eventlet.sleep(5) diff --git a/mixmatch/proxy.py b/mixmatch/proxy.py index 32ac3c2..eb2a80d 100644 --- a/mixmatch/proxy.py +++ b/mixmatch/proxy.py @@ -177,10 +177,10 @@ class RequestHandler(object): self._do_request_on(self.service_provider, self.project_id)) def _search_forward(self): - if not CONF.proxy.search_by_broadcast: + if not CONF.search_by_broadcast: return self._local_forward() - for sp in CONF.proxy.service_providers: + for sp in CONF.service_providers: if sp == 'default': response = self._do_request_on('default') if 200 <= response.status_code < 300: @@ -197,12 +197,12 @@ class RequestHandler(object): ) def _aggregate_forward(self): - if not CONF.proxy.aggregation: + if not CONF.aggregation: return self._local_forward() responses = {} - for sp in CONF.proxy.service_providers: + for sp in CONF.service_providers: if sp == 'default': responses['default'] = self._do_request_on('default') else: diff --git a/mixmatch/services.py b/mixmatch/services.py index 60777a0..6be4be0 100644 --- a/mixmatch/services.py +++ b/mixmatch/services.py @@ -112,7 +112,7 @@ def list_api_versions(service_type, url): api_versions = list() if service_type == 'image': - supported_versions = CONF.proxy.image_api_versions + supported_versions = CONF.image_api_versions for version in supported_versions: info = dict() @@ -128,7 +128,7 @@ def list_api_versions(service_type, url): return json.dumps({'versions': api_versions}) elif service_type == 'volume': - supported_versions = CONF.proxy.volume_api_versions + supported_versions = CONF.volume_api_versions for version in supported_versions: info = dict() diff --git a/mixmatch/tests/unit/test_mocked.py b/mixmatch/tests/unit/test_mocked.py index 9e4e88c..45ea05f 100644 --- a/mixmatch/tests/unit/test_mocked.py +++ b/mixmatch/tests/unit/test_mocked.py @@ -104,7 +104,6 @@ class TestMock(testcase.TestCase): # set config values self.config_fixture.load_raw_values( - group='proxy', service_providers='default, remote1', aggregation=True) self.config_fixture.load_raw_values( @@ -175,8 +174,7 @@ class TestMock(testcase.TestCase): self.assertEqual(response.status_code, 400) def test_get_image_search_local(self): - self.config_fixture.load_raw_values(group='proxy', - search_by_broadcast=True) + self.config_fixture.load_raw_values(search_by_broadcast=True) self.session_fixture.add_local_auth('wewef', 'my_project_id') IMAGE = 'Here is my image.' @@ -200,8 +198,7 @@ class TestMock(testcase.TestCase): def test_get_image_search_remote(self): REMOTE_PROJECT_ID = "319d8162b38342609f5fafe1404216b9" - self.config_fixture.load_raw_values(group='proxy', - search_by_broadcast=True) + self.config_fixture.load_raw_values(search_by_broadcast=True) self.session_fixture.add_local_auth('local-tok', 'my_project_id') self.session_fixture.add_sp_auth('remote1', 'local-tok', REMOTE_PROJECT_ID, 'remote-tok') @@ -233,8 +230,7 @@ class TestMock(testcase.TestCase): def test_get_image_search_nexists(self): REMOTE_PROJECT_ID = "319d8162b38342609f5fafe1404216b9" - self.config_fixture.load_raw_values(group='proxy', - search_by_broadcast=True) + self.config_fixture.load_raw_values(search_by_broadcast=True) self.session_fixture.add_local_auth('local-tok', 'my_project_id') self.session_fixture.add_sp_auth('remote1', 'local-tok', REMOTE_PROJECT_ID, 'remote-tok') diff --git a/mixmatch/tests/unit/test_services.py b/mixmatch/tests/unit/test_services.py index 166c874..014865e 100644 --- a/mixmatch/tests/unit/test_services.py +++ b/mixmatch/tests/unit/test_services.py @@ -250,8 +250,7 @@ class TestServices(testcase.TestCase): def test_list_api_versions(self): - self.config_fixture.load_raw_values(group='proxy', - image_api_versions=API_VERSIONS, + self.config_fixture.load_raw_values(image_api_versions=API_VERSIONS, volume_api_versions=API_VERSIONS) # List image api