openstack
/
murano
Code Issues Proposed changes

Merge "Remove enforce_type=True from oslo.config set_override"

This commit is contained in:
Jenkins 2017-05-22 12:20:16 +00:00 committed by Gerrit Code Review
parent fb593ab439 e340d5450f
commit ebd41ca322
8 changed files with 50 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
murano/tests/unit/api/cmd/test_test_runner.py
View File

@ -53,7 +53,7 @@ class TestCaseShell(testtools.TestCase):
CONF.clear()
def override_config(self, name, override, group=None):
CONF.set_override(name, override, group, enforce_type=True)
CONF.set_override(name, override, group)
CONF.set_override('use_stderr', True)
self.addCleanup(CONF.clear_override, name, group)

19
murano/tests/unit/api/v1/cloudfoundry/test_cfapi.py
View File

@ -527,28 +527,19 @@ class TestController(base.MuranoTestCase):
])
def _override_conf(self, without_urls=False):
override = api.CONF.set_override
clear_override = api.CONF.clear_override
if without_urls:
override('url', None, group='glare',
enforce_type=True)
override('url', None, group='murano',
enforce_type=True)
self.override_config('url', None, group='glare')
self.override_config('url', None, group='murano')
else:
override('url', 'foo_glare_url', group='glare',
enforce_type=True)
override('url', 'foo_murano_url', group='murano',
enforce_type=True)
self.addCleanup(clear_override, 'url', group='glare')
self.addCleanup(clear_override, 'url', group='murano')
self.override_config('url', 'foo_glare_url', group='glare')
self.override_config('url', 'foo_murano_url', group='murano')
for arg, group, override_val in (
('packages_service', 'engine', 'glare'),
('insecure', 'glare', True),
('key_file', 'glare', 'foo_key_file'),
('ca_file', 'glare', 'foo_ca_file'),
('cert_file', 'glare', 'foo_cert_file')):
override(arg, override_val, group=group, enforce_type=True)
self.addCleanup(clear_override, arg, group=group)
self.override_config(arg, override_val, group=group)
def test_resource(self):
self.assertIsInstance(api.create_resource(), wsgi.Resource)

2
murano/tests/unit/base.py
View File

@ -30,7 +30,7 @@ class MuranoTestCase(testtools.TestCase):
self.useFixture(fixtures.FakeLogger('murano'))
def override_config(self, name, override, group=None):
CONF.set_override(name, override, group, enforce_type=True)
CONF.set_override(name, override, group)
self.addCleanup(CONF.clear_override, name, group)

14
murano/tests/unit/common/test_app_loader.py
View File

@ -26,9 +26,9 @@ CONF = cfg.CONF
class AppLoaderTest(base.MuranoTestCase):
def setUp(self):
super(AppLoaderTest, self).setUp()
CONF.set_override('flavor', 'myflavor', 'paste_deploy')
CONF.set_override('config_file', 'path/to/myapp-paste.ini',
'paste_deploy')
self.override_config('flavor', 'myflavor', 'paste_deploy')
self.override_config('config_file', 'path/to/myapp-paste.ini',
'paste_deploy')
CONF.config_file = ['myapp.conf']
CONF.prog = 'myapp'
CONF.find_file = mock.MagicMock(return_value='path/to/myapp-paste.ini')
@ -52,23 +52,23 @@ class AppLoaderTest(base.MuranoTestCase):
self._test_load_paste_app(appname=None)
def test_load_paste_app_no_flavor(self):
CONF.set_override('flavor', None, 'paste_deploy')
self.override_config('flavor', None, 'paste_deploy')
self._test_load_paste_app(fullname='myapp')
def test_load_paste_app_no_pastedep_cfg_opt(self):
CONF.set_override('config_file', None, 'paste_deploy')
self.override_config('config_file', None, 'paste_deploy')
self._test_load_paste_app()
def test_load_paste_app_no_pastedep_cfg_opt_and_cfg_opt(self):
CONF.set_override('config_file', None, 'paste_deploy')
self.override_config('config_file', None, 'paste_deploy')
CONF.config_file = []
self._test_load_paste_app()
CONF.find_file.assert_called_with('myapp-paste.ini')
def test_load_paste_app_no_cfg_at_all(self):
CONF.set_override('config_file', None, 'paste_deploy')
self.override_config('config_file', None, 'paste_deploy')
CONF.find_file.return_value = None
self.assertRaises(RuntimeError, app_loader.load_paste_app, 'myapp')

6
murano/tests/unit/db/migration/test_migrations_base.py
View File

@ -56,8 +56,7 @@ class BaseWalkMigrationTestCase(object):
should use oslo.config and openstack.commom.db.sqlalchemy.session with
database functionality (reset default settings and session cleanup).
"""
CONF.set_override('connection', str(engine.url), group='database',
enforce_type=True)
CONF.set_override('connection', str(engine.url), group='database')
def _alembic_command(self, alembic_command, engine, *args, **kwargs):
"""Redefines alembic command data return setting
@ -66,8 +65,7 @@ class BaseWalkMigrationTestCase(object):
We should redefine this setting for getting info.
"""
self.ALEMBIC_CONFIG.stdout = buf = io.StringIO()
CONF.set_override('connection', str(engine.url), group='database',
enforce_type=True)
CONF.set_override('connection', str(engine.url), group='database')
getattr(command, alembic_command)(*args, **kwargs)
res = buf.getvalue().strip()
LOG.debug('Alembic command `{command}` returns: {result}'.format(

12
murano/tests/unit/engine/system/test_agent.py
View File

@ -20,7 +20,6 @@ import os
import tempfile
import mock
from oslo_config import cfg
from oslo_serialization import base64
import yaml as yamllib
@ -33,8 +32,6 @@ from murano.engine.system import agent
from murano.engine.system import resource_manager
from murano.tests.unit import base
CONF = cfg.CONF
class TestAgent(base.MuranoTestCase):
def setUp(self):
@ -44,8 +41,7 @@ class TestAgent(base.MuranoTestCase):
else:
self.yaml_loader = yamllib.SafeLoader
CONF.set_override('disable_murano_agent', False, group='engine',
enforce_type=True)
self.override_config('disable_murano_agent', False, group='engine')
mock_host = mock.MagicMock()
mock_host.id = '1234'
@ -93,8 +89,7 @@ class TestAgent(base.MuranoTestCase):
@mock.patch('murano.engine.system.agent.LOG')
def test_send_with_murano_agent_disabled(self, mock_log):
CONF.set_override('disable_murano_agent', True, group='engine',
enforce_type=True)
self.override_config('disable_murano_agent', True, group='engine')
self.assertRaises(exceptions.PolicyViolationException,
self.agent.send_raw, {})
@ -217,8 +212,7 @@ class TestAgent(base.MuranoTestCase):
@mock.patch('murano.engine.system.agent.eventlet.event.Event')
@mock.patch('murano.common.messaging.mqclient.kombu')
def test_call_except_timeout(self, mock_kombu, mock_event):
CONF.set_override('agent_timeout', 1, group='engine',
enforce_type=True)
self.override_config('agent_timeout', 1, group='engine')
mock_event().wait.side_effect = agent.eventlet.Timeout

35
murano/tests/unit/engine/test_package_loader.py
View File

@ -20,7 +20,6 @@ import shutil
import tempfile
import mock
from oslo_config import cfg
import semantic_version
import testtools
@ -31,8 +30,6 @@ from murano.packages import exceptions as pkg_exc
from murano.tests.unit import base
from murano_tempest_tests import utils
CONF = cfg.CONF
class TestPackageCache(base.MuranoTestCase):
@ -40,15 +37,13 @@ class TestPackageCache(base.MuranoTestCase):
super(TestPackageCache, self).setUp()
self.location = tempfile.mkdtemp()
CONF.set_override('enable_packages_cache', True, 'engine')
self.old_location = CONF.engine.packages_cache
CONF.set_override('packages_cache', self.location, 'engine')
self.override_config('enable_packages_cache', True, 'engine')
self.override_config('packages_cache', self.location, 'engine')
self._patch_loader_client()
self.loader = package_loader.ApiPackageLoader(None)
def tearDown(self):
CONF.set_override('packages_cache', self.old_location, 'engine')
shutil.rmtree(self.location, ignore_errors=True)
super(TestPackageCache, self).tearDown()
@ -71,8 +66,7 @@ class TestPackageCache(base.MuranoTestCase):
session.get_endpoint.return_value = 'test_endpoint/v3'
session_params.return_value = {'endpoint': 'test_endpoint/v3'}
CONF.set_override('packages_service', 'glance', group='engine',
enforce_type=True)
self.override_config('packages_service', 'glance', group='engine')
client = self.loader.client
@ -85,8 +79,8 @@ class TestPackageCache(base.MuranoTestCase):
self.assertIsNotNone(self.loader._glare_client)
# Test whether client is initialized using different CONF.
CONF.set_override('packages_service', 'test_service', group='engine',
enforce_type=True)
self.override_config('packages_service', 'test_service',
group='engine')
client = self.loader.client
@ -520,19 +514,18 @@ class TestPackageCache(base.MuranoTestCase):
class TestCombinedPackageLoader(base.MuranoTestCase):
def setUp(cls):
super(TestCombinedPackageLoader, cls).setUp()
def setUp(self):
super(TestCombinedPackageLoader, self).setUp()
location = os.path.dirname(__file__)
CONF.set_override('load_packages_from', [location], 'engine',
enforce_type=True)
cls.execution_session = mock.MagicMock()
cls.loader = package_loader.CombinedPackageLoader(
cls.execution_session)
cls._patch_api_loader()
self.override_config('load_packages_from', [location], 'engine')
self.execution_session = mock.MagicMock()
self.loader = package_loader.CombinedPackageLoader(
self.execution_session)
self._patch_api_loader()
cls.local_pkg_name = 'io.murano.test.MyTest'
cls.api_pkg_name = 'test.mpl.v1.app.Thing'
self.local_pkg_name = 'io.murano.test.MyTest'
self.api_pkg_name = 'test.mpl.v1.app.Thing'
def _patch_api_loader(self):
self.api_loader_patcher = mock.patch.object(

35
murano/tests/unit/test_heat_stack.py
View File

@ -30,8 +30,7 @@ class TestHeatStack(base.MuranoTestCase):
super(TestHeatStack, self).setUp()
self.heat_client_mock = mock.Mock()
self.heat_client_mock.stacks = mock.MagicMock(spec=stacks.StackManager)
CONF.set_override('stack_tags', ['test-murano'], 'heat',
enforce_type=True)
self.override_config('stack_tags', ['test-murano'], 'heat')
self.mock_tag = ','.join(CONF.heat.stack_tags)
self._patch_get_client()
@ -283,8 +282,8 @@ class TestHeatStack(base.MuranoTestCase):
status_get.return_value = 'NOT_FOUND'
wait_st.return_value = {}
CONF.set_override('stack_tags', ['test-murano', 'murano-tag'], 'heat',
enforce_type=True)
self.override_config('stack_tags', ['test-murano', 'murano-tag'],
'heat')
hs = heat_stack.HeatStack('test-stack', None)
hs._description = None
hs._template = {'resources': {'test': 1}}
@ -315,8 +314,8 @@ class TestHeatStack(base.MuranoTestCase):
def test_parameters(self, status_get, wait_st):
status_get.return_value = 'NOT_FOUND'
wait_st.return_value = {}
CONF.set_override('stack_tags', ['test-murano', 'murano-tag'], 'heat',
enforce_type=True)
self.override_config('stack_tags', ['test-murano', 'murano-tag'],
'heat')
hs = heat_stack.HeatStack('test-stack', None)
hs._description = None
hs._template = {'resources': {'test': 1}}
@ -348,8 +347,8 @@ class TestHeatStack(base.MuranoTestCase):
def test_reload(self, status_get, wait_st):
status_get.return_value = 'NOT_FOUND'
wait_st.return_value = {}
CONF.set_override('stack_tags', ['test-murano', 'murano-tag'], 'heat',
enforce_type=True)
self.override_config('stack_tags', ['test-murano', 'murano-tag'],
'heat')
hs = heat_stack.HeatStack('test-stack', None)
hs._description = None
hs._template = {'resources': {'test': 1}}
@ -386,8 +385,8 @@ class TestHeatStack(base.MuranoTestCase):
def test_delete(self, status_get, wait_st):
status_get.return_value = 'NOT_FOUND'
wait_st.return_value = {}
CONF.set_override('stack_tags', ['test-murano', 'murano-tag'], 'heat',
enforce_type=True)
self.override_config('stack_tags', ['test-murano', 'murano-tag'],
'heat')
hs = heat_stack.HeatStack('test-stack', None)
hs._description = None
hs._template = {'resources': {'test': 1}}
@ -471,8 +470,8 @@ class TestHeatStack(base.MuranoTestCase):
def test_set_template_and_params(self, status_get, wait_st):
status_get.return_value = 'NOT_FOUND'
wait_st.return_value = {}
CONF.set_override('stack_tags', ['test-murano', 'murano-tag'], 'heat',
enforce_type=True)
self.override_config('stack_tags', ['test-murano', 'murano-tag'],
'heat')
hs = heat_stack.HeatStack('test-stack', None)
hs._description = None
hs._template = {'resources': {'test': 1}}
@ -509,8 +508,8 @@ class TestHeatStack(base.MuranoTestCase):
def test_set_hot_env_and_files(self, status_get, wait_st):
status_get.return_value = 'NOT_FOUND'
wait_st.return_value = {}
CONF.set_override('stack_tags', ['test-murano', 'murano-tag'], 'heat',
enforce_type=True)
self.override_config('stack_tags', ['test-murano', 'murano-tag'],
'heat')
hs = heat_stack.HeatStack('test-stack', None)
hs._description = None
hs._template = {'resources': {'test': 1}}
@ -547,8 +546,8 @@ class TestHeatStack(base.MuranoTestCase):
def test_none_template(self, status_get, wait_st):
status_get.return_value = 'NOT_FOUND'
wait_st.return_value = {}
CONF.set_override('stack_tags', ['test-murano', 'murano-tag'], 'heat',
enforce_type=True)
self.override_config('stack_tags', ['test-murano', 'murano-tag'],
'heat')
hs = heat_stack.HeatStack('test-stack', None)
hs._description = None
hs._template = None
@ -562,8 +561,8 @@ class TestHeatStack(base.MuranoTestCase):
@mock.patch(CLS_NAME + '._wait_state')
def test_get_hot_status(self, wait_st):
wait_st.return_value = {}
CONF.set_override('stack_tags', ['test-murano', 'murano-tag'], 'heat',
enforce_type=True)
self.override_config('stack_tags', ['test-murano', 'murano-tag'],
'heat')
hs = heat_stack.HeatStack('test-stack', None)
hs._description = None
hs._template = {'resources': {'test': 1}}