From 381a84a4e8e3a57ac26c3796cb51ba502be351bf Mon Sep 17 00:00:00 2001 From: "ChangBo Guo(gcb)" Date: Mon, 8 May 2017 17:55:32 +0800 Subject: [PATCH] Remove usage of parameter enforce_type Oslo.config deprecated parameter enforce_type and change its default value to True in Ifa552de0a994e40388cbc9f7dbaa55700ca276b0. Remove the usage of it to avoid DeprecationWarning: "Using the 'enforce_type' argument is deprecated in version '4.0' and will be removed in version '5.0': The argument enforce_type has changed its default value to True and then will be removed completely." Change-Id: I91b0f0a52b5ce8654702510eed76d5dea8cc8fe4 Related--Bug: #1517839 --- .../tests/test_client.py | 8 ++-- .../tests/test_rackspace_cloud_server.py | 3 +- doc/source/conf.py | 6 +-- heat/engine/service.py | 2 +- heat/tests/api/aws/test_api_ec2token.py | 2 +- heat/tests/api/openstack_v1/test_stacks.py | 4 +- heat/tests/api/test_wsgi.py | 2 +- heat/tests/aws/test_instance.py | 3 +- heat/tests/aws/test_loadbalancer.py | 3 +- heat/tests/aws/test_s3.py | 2 +- heat/tests/aws/test_volume.py | 6 +-- heat/tests/clients/test_clients.py | 14 +++---- heat/tests/clients/test_heat_client.py | 41 +++++++------------ heat/tests/clients/test_nova_client.py | 18 ++++---- heat/tests/common.py | 2 +- heat/tests/db/test_sqlalchemy_api.py | 12 ++---- heat/tests/engine/service/test_stack_adopt.py | 26 ++++++------ .../tests/engine/service/test_stack_create.py | 10 ++--- .../tests/engine/service/test_stack_update.py | 7 ++-- heat/tests/openstack/cinder/test_volume.py | 3 +- .../tests/openstack/heat/test_remote_stack.py | 2 +- heat/tests/openstack/magnum/test_bay.py | 2 +- heat/tests/openstack/magnum/test_cluster.py | 2 +- .../neutron/test_neutron_firewall.py | 2 +- .../neutron/test_neutron_loadbalancer.py | 2 +- heat/tests/openstack/nova/test_server.py | 3 +- heat/tests/openstack/sahara/test_cluster.py | 2 +- heat/tests/openstack/senlin/test_cluster.py | 2 +- heat/tests/openstack/senlin/test_node.py | 2 +- heat/tests/openstack/senlin/test_policy.py | 2 +- heat/tests/openstack/trove/test_instance.py | 2 +- heat/tests/test_common_context.py | 6 +-- heat/tests/test_convg_stack.py | 4 +- heat/tests/test_crypt.py | 3 +- heat/tests/test_engine_service.py | 14 +++---- heat/tests/test_environment.py | 18 +++----- heat/tests/test_event.py | 15 ++++--- heat/tests/test_fault_middleware.py | 6 +-- heat/tests/test_resource.py | 25 +++++------ heat/tests/test_resource_properties_data.py | 6 +-- heat/tests/test_stack.py | 24 ++++------- heat/tests/test_stack_resource.py | 3 +- heat/tests/test_template_format.py | 3 +- heat/tests/test_urlfetch.py | 4 +- 44 files changed, 137 insertions(+), 191 deletions(-) diff --git a/contrib/rackspace/heat_keystoneclient_v2/tests/test_client.py b/contrib/rackspace/heat_keystoneclient_v2/tests/test_client.py index 1b680ce402..f66438ec1d 100644 --- a/contrib/rackspace/heat_keystoneclient_v2/tests/test_client.py +++ b/contrib/rackspace/heat_keystoneclient_v2/tests/test_client.py @@ -36,13 +36,13 @@ class KeystoneClientTest(common.HeatTestCase): dummy_url = 'http://server.test:5000/v2.0' cfg.CONF.set_override('auth_uri', dummy_url, - group='keystone_authtoken', enforce_type=True) + group='keystone_authtoken') cfg.CONF.set_override('admin_user', 'heat', - group='keystone_authtoken', enforce_type=True) + group='keystone_authtoken') cfg.CONF.set_override('admin_password', 'verybadpass', - group='keystone_authtoken', enforce_type=True) + group='keystone_authtoken') cfg.CONF.set_override('admin_tenant_name', 'service', - group='keystone_authtoken', enforce_type=True) + group='keystone_authtoken') self.addCleanup(self.m.VerifyAll) def _stubs_v2(self, method='token', auth_ok=True, trust_scoped=True, diff --git a/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py b/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py index 941b1f6f0d..96877f3d59 100644 --- a/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py +++ b/contrib/rackspace/rackspace/tests/test_rackspace_cloud_server.py @@ -64,8 +64,7 @@ cfg.CONF.import_opt('region_name_for_services', 'heat.common.config') class CloudServersTest(common.HeatTestCase): def setUp(self): super(CloudServersTest, self).setUp() - cfg.CONF.set_override('region_name_for_services', 'RegionOne', - enforce_type=True) + cfg.CONF.set_override('region_name_for_services', 'RegionOne') self.ctx = utils.dummy_context() self.fc = fakes.FakeClient() diff --git a/doc/source/conf.py b/doc/source/conf.py index 5e33300a24..504e9ab8e5 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -50,12 +50,10 @@ sys.path.insert(0, ROOT) sys.path.insert(0, BASE_DIR) cfg.CONF.import_opt('plugin_dirs', 'heat.common.config') -cfg.CONF.set_override(name='plugin_dirs', override=PLUGIN_DIRS, - enforce_type=True) +cfg.CONF.set_override(name='plugin_dirs', override=PLUGIN_DIRS) cfg.CONF.import_opt('environment_dir', 'heat.common.config') -cfg.CONF.set_override(name='environment_dir', override=TEMP_ENV_DIR, - enforce_type=True) +cfg.CONF.set_override(name='environment_dir', override=TEMP_ENV_DIR) # This is required for ReadTheDocs.org, but isn't a bad idea anyway. os.environ['DJANGO_SETTINGS_MODULE'] = 'openstack_dashboard.settings' diff --git a/heat/engine/service.py b/heat/engine/service.py index bc2e7d6457..57f039cd9c 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -415,7 +415,7 @@ class EngineService(service.ServiceBase): if ((cfg.CONF.database.max_overflow is None) or (cfg.CONF.database.max_overflow < worker_pool_size)): cfg.CONF.set_override('max_overflow', worker_pool_size, - group='database', enforce_type=True) + group='database') def _stop_rpc_server(self): # Stop rpc connection at first for preventing new requests diff --git a/heat/tests/api/aws/test_api_ec2token.py b/heat/tests/api/aws/test_api_ec2token.py index ee964241fc..111e225a56 100644 --- a/heat/tests/api/aws/test_api_ec2token.py +++ b/heat/tests/api/aws/test_api_ec2token.py @@ -544,7 +544,7 @@ class Ec2TokenTest(common.HeatTestCase): importutils.import_module('keystonemiddleware.auth_token') dummy_url = 'http://123:5000/v2.0' cfg.CONF.set_override('auth_uri', dummy_url, - group='keystone_authtoken', enforce_type=True) + group='keystone_authtoken') ec2 = ec2token.EC2Token(app='woot', conf={}) params = {'AWSAccessKeyId': 'foo', 'Signature': 'xyz'} req_env = {'SERVER_NAME': 'heat', diff --git a/heat/tests/api/openstack_v1/test_stacks.py b/heat/tests/api/openstack_v1/test_stacks.py index 29bff90b9b..688d79f5cd 100644 --- a/heat/tests/api/openstack_v1/test_stacks.py +++ b/heat/tests/api/openstack_v1/test_stacks.py @@ -139,7 +139,7 @@ blarg: wibble self.assertRaises(webob.exc.HTTPBadRequest, data.template) def test_template_exceeds_max_template_size(self): - cfg.CONF.set_override('max_template_size', 10, enforce_type=True) + cfg.CONF.set_override('max_template_size', 10) template = json.dumps(['a'] * cfg.CONF.max_template_size) body = {'template': template} data = stacks.InstantiationData(body) @@ -1170,7 +1170,7 @@ class StackControllerTest(tools.ControllerTest, common.HeatTestCase): self.m.VerifyAll() def test_create_err_stack_bad_reqest(self, mock_enforce): - cfg.CONF.set_override('debug', True, enforce_type=True) + cfg.CONF.set_override('debug', True) template = {u'Foo': u'bar'} parameters = {u'InstanceType': u'm1.xlarge'} body = {'template': template, diff --git a/heat/tests/api/test_wsgi.py b/heat/tests/api/test_wsgi.py index 1eb33d3cfb..4780d8fbe5 100644 --- a/heat/tests/api/test_wsgi.py +++ b/heat/tests/api/test_wsgi.py @@ -378,7 +378,7 @@ class JSONRequestDeserializerTest(common.HeatTestCase): self.assertEqual(expected, actual) def test_from_json_exceeds_max_json_mb(self): - cfg.CONF.set_override('max_json_body_size', 10, enforce_type=True) + cfg.CONF.set_override('max_json_body_size', 10) body = json.dumps(['a'] * cfg.CONF.max_json_body_size) self.assertGreater(len(body), cfg.CONF.max_json_body_size) error = self.assertRaises(exception.RequestLimitExceeded, diff --git a/heat/tests/aws/test_instance.py b/heat/tests/aws/test_instance.py index a2c4adb2a6..f422aa5812 100644 --- a/heat/tests/aws/test_instance.py +++ b/heat/tests/aws/test_instance.py @@ -600,8 +600,7 @@ class InstancesTest(common.HeatTestCase): def test_instance_create_with_stack_scheduler_hints(self): return_server = self.fc.servers.list()[1] - sh.cfg.CONF.set_override('stack_scheduler_hints', True, - enforce_type=True) + sh.cfg.CONF.set_override('stack_scheduler_hints', True) # Unroll _create_test_instance, to enable check # for addition of heat ids (stack id, resource name) stack_name = 'test_instance_create_with_stack_scheduler_hints' diff --git a/heat/tests/aws/test_loadbalancer.py b/heat/tests/aws/test_loadbalancer.py index d6c9162cc1..6a2c336dcd 100644 --- a/heat/tests/aws/test_loadbalancer.py +++ b/heat/tests/aws/test_loadbalancer.py @@ -153,8 +153,7 @@ class LoadBalancerTest(common.HeatTestCase): rsrc.validate()) def test_loadbalancer_validate_badtemplate(self): - cfg.CONF.set_override('loadbalancer_template', '/a/noexist/x.y', - enforce_type=True) + cfg.CONF.set_override('loadbalancer_template', '/a/noexist/x.y') rsrc = self.setup_loadbalancer() self.assertRaises(exception.StackValidationFailed, rsrc.validate) diff --git a/heat/tests/aws/test_s3.py b/heat/tests/aws/test_s3.py index ae603db9c4..671b4a3ce2 100644 --- a/heat/tests/aws/test_s3.py +++ b/heat/tests/aws/test_s3.py @@ -274,7 +274,7 @@ class s3Test(common.HeatTestCase): self.m.VerifyAll() def test_delete_conflict_empty(self): - cfg.CONF.set_override('action_retry_limit', 0, enforce_type=True) + cfg.CONF.set_override('action_retry_limit', 0) t = template_format.parse(swift_template) stack = utils.parse_stack(t) diff --git a/heat/tests/aws/test_volume.py b/heat/tests/aws/test_volume.py index 251286976e..04f1e1a7a6 100644 --- a/heat/tests/aws/test_volume.py +++ b/heat/tests/aws/test_volume.py @@ -181,7 +181,7 @@ class VolumeTest(vt_base.BaseVolumeTest): def test_volume_create_error(self): fv = vt_base.FakeVolume('creating') stack_name = 'test_volume_create_error_stack' - cfg.CONF.set_override('action_retry_limit', 0, enforce_type=True) + cfg.CONF.set_override('action_retry_limit', 0) self._mock_create_volume(fv, stack_name, final_status='error') @@ -610,7 +610,7 @@ class VolumeTest(vt_base.BaseVolumeTest): def test_snapshot_no_volume(self): """Test that backup does not start for failed resource.""" stack_name = 'test_volume_snapshot_novol_stack' - cfg.CONF.set_override('action_retry_limit', 0, enforce_type=True) + cfg.CONF.set_override('action_retry_limit', 0) fv = self._mock_create_volume(vt_base.FakeVolume('creating'), stack_name, final_status='error') @@ -666,7 +666,7 @@ class VolumeTest(vt_base.BaseVolumeTest): def test_create_from_snapshot_error(self): stack_name = 'test_volume_create_from_snap_err_stack' - cfg.CONF.set_override('action_retry_limit', 0, enforce_type=True) + cfg.CONF.set_override('action_retry_limit', 0) fv = vt_base.FakeVolume('restoring-backup') fvbr = vt_base.FakeBackupRestore('vol-123') diff --git a/heat/tests/clients/test_clients.py b/heat/tests/clients/test_clients.py index 22248a34f4..8a6c0c936f 100644 --- a/heat/tests/clients/test_clients.py +++ b/heat/tests/clients/test_clients.py @@ -44,14 +44,12 @@ class ClientsTest(common.HeatTestCase): def test_bad_cloud_backend(self): con = mock.Mock() - cfg.CONF.set_override('cloud_backend', 'some.weird.object', - enforce_type=True) + cfg.CONF.set_override('cloud_backend', 'some.weird.object') exc = self.assertRaises(exception.Invalid, clients.Clients, con) self.assertIn('Invalid cloud_backend setting in heat.conf detected', six.text_type(exc)) - cfg.CONF.set_override('cloud_backend', 'heat.engine.clients.Clients', - enforce_type=True) + cfg.CONF.set_override('cloud_backend', 'heat.engine.clients.Clients') exc = self.assertRaises(exception.Invalid, clients.Clients, con) self.assertIn('Invalid cloud_backend setting in heat.conf detected', six.text_type(exc)) @@ -102,7 +100,7 @@ class ClientsTest(common.HeatTestCase): def test_clients_get_heat_cfn_metadata_url_conf(self): cfg.CONF.set_override('heat_metadata_server_url', - 'http://server.test:123', enforce_type=True) + 'http://server.test:123') obj = self._client_cfn_url() self.assertEqual("http://server.test:123/v1/", obj.get_cfn_metadata_server_url()) @@ -182,11 +180,11 @@ class ClientPluginTest(common.HeatTestCase): plugin = FooClientsPlugin(con) cfg.CONF.set_override('ca_file', '/tmp/bar', - group='clients_heat', enforce_type=True) + group='clients_heat') cfg.CONF.set_override('ca_file', '/tmp/foo', - group='clients', enforce_type=True) + group='clients') cfg.CONF.set_override('endpoint_type', 'internalURL', - group='clients', enforce_type=True) + group='clients') # check heat group self.assertEqual('/tmp/bar', diff --git a/heat/tests/clients/test_heat_client.py b/heat/tests/clients/test_heat_client.py index 2fb3d53d13..ae3ffbce9e 100644 --- a/heat/tests/clients/test_heat_client.py +++ b/heat/tests/clients/test_heat_client.py @@ -55,13 +55,10 @@ class KeystoneClientTest(common.HeatTestCase): self.m.StubOutWithMock(ks_loading, 'load_auth_from_conf_options') cfg.CONF.set_override('auth_uri', 'http://server.test:5000/v2.0', - group='keystone_authtoken', enforce_type=True) - cfg.CONF.set_override('stack_user_domain_id', 'adomain123', - enforce_type=True) - cfg.CONF.set_override('stack_domain_admin', 'adminuser123', - enforce_type=True) - cfg.CONF.set_override('stack_domain_admin_password', 'adminsecret', - enforce_type=True) + group='keystone_authtoken') + cfg.CONF.set_override('stack_user_domain_id', 'adomain123') + cfg.CONF.set_override('stack_domain_admin', 'adminuser123') + cfg.CONF.set_override('stack_domain_admin_password', 'adminsecret') self.addCleanup(self.m.VerifyAll) @@ -498,8 +495,7 @@ class KeystoneClientTest(common.HeatTestCase): """Test create_trust_context with existing trust_id.""" self._stubs_auth(method='trust') - cfg.CONF.set_override('deferred_auth_method', 'trusts', - enforce_type=True) + cfg.CONF.set_override('deferred_auth_method', 'trusts') self.m.ReplayAll() ctx = utils.dummy_context() @@ -529,11 +525,9 @@ class KeystoneClientTest(common.HeatTestCase): project_id='42', stub_trust_context=True) - cfg.CONF.set_override('deferred_auth_method', 'trusts', - enforce_type=True) + cfg.CONF.set_override('deferred_auth_method', 'trusts') if delegate_roles: - cfg.CONF.set_override('trusts_delegated_roles', delegate_roles, - enforce_type=True) + cfg.CONF.set_override('trusts_delegated_roles', delegate_roles) trustor_roles = ['heat_stack_owner', 'admin', '__member__'] trustee_roles = delegate_roles or trustor_roles @@ -570,10 +564,8 @@ class KeystoneClientTest(common.HeatTestCase): project_id='42', stub_trust_context=True) - cfg.CONF.set_override('deferred_auth_method', 'trusts', - enforce_type=True) - cfg.CONF.set_override('trusts_delegated_roles', ['heat_stack_owner'], - enforce_type=True) + cfg.CONF.set_override('deferred_auth_method', 'trusts') + cfg.CONF.set_override('trusts_delegated_roles', ['heat_stack_owner']) self.mock_ks_v3_client.trusts = self.m.CreateMockAnything() self.mock_ks_v3_client.trusts.create( @@ -627,8 +619,7 @@ class KeystoneClientTest(common.HeatTestCase): """Test consuming a trust when initializing.""" self._stubs_auth(method='trust') - cfg.CONF.set_override('deferred_auth_method', 'trusts', - enforce_type=True) + cfg.CONF.set_override('deferred_auth_method', 'trusts') self.m.ReplayAll() ctx = utils.dummy_context() @@ -646,8 +637,7 @@ class KeystoneClientTest(common.HeatTestCase): """Test consuming a trust when initializing, error scoping.""" self._stubs_auth(method='trust', trust_scoped=False) - cfg.CONF.set_override('deferred_auth_method', 'trusts', - enforce_type=True) + cfg.CONF.set_override('deferred_auth_method', 'trusts') self.m.ReplayAll() ctx = utils.dummy_context() @@ -664,8 +654,7 @@ class KeystoneClientTest(common.HeatTestCase): """Test consuming a trust when initializing, impersonation error.""" self._stubs_auth(method='trust', user_id='wrong_user_id') - cfg.CONF.set_override('deferred_auth_method', 'trusts', - enforce_type=True) + cfg.CONF.set_override('deferred_auth_method', 'trusts') self.m.ReplayAll() ctx = utils.dummy_context() @@ -708,8 +697,7 @@ class KeystoneClientTest(common.HeatTestCase): def _test_delete_trust(self, raise_ext=None): self._stubs_auth() - cfg.CONF.set_override('deferred_auth_method', 'trusts', - enforce_type=True) + cfg.CONF.set_override('deferred_auth_method', 'trusts') self.mock_ks_v3_client.trusts = self.m.CreateMockAnything() if raise_ext is None: self.mock_ks_v3_client.trusts.delete('atrust123').AndReturn(None) @@ -1423,8 +1411,7 @@ class KeystoneClientTest(common.HeatTestCase): class KeystoneClientTestDomainName(KeystoneClientTest): def setUp(self): - cfg.CONF.set_override('stack_user_domain_name', 'fake_domain_name', - enforce_type=True) + cfg.CONF.set_override('stack_user_domain_name', 'fake_domain_name') super(KeystoneClientTestDomainName, self).setUp() cfg.CONF.clear_override('stack_user_domain_id') diff --git a/heat/tests/clients/test_nova_client.py b/heat/tests/clients/test_nova_client.py index 12d0ee6dbd..ba647a0778 100644 --- a/heat/tests/clients/test_nova_client.py +++ b/heat/tests/clients/test_nova_client.py @@ -414,14 +414,12 @@ class NovaClientPluginUserdataTest(NovaClientPluginTestCase): def test_build_userdata(self): """Tests the build_userdata function.""" cfg.CONF.set_override('heat_metadata_server_url', - 'http://server.test:123', enforce_type=True) + 'http://server.test:123') cfg.CONF.set_override('heat_watch_server_url', - 'http://server.test:345', enforce_type=True) - cfg.CONF.set_override('instance_connection_is_secure', - False, enforce_type=True) + 'http://server.test:345') + cfg.CONF.set_override('instance_connection_is_secure', False) cfg.CONF.set_override( - 'instance_connection_https_validate_certificates', False, - enforce_type=True) + 'instance_connection_https_validate_certificates', False) data = self.nova_plugin.build_userdata({}) self.assertIn("Content-Type: text/cloud-config;", data) self.assertIn("Content-Type: text/cloud-boothook;", data) @@ -435,9 +433,9 @@ class NovaClientPluginUserdataTest(NovaClientPluginTestCase): def test_build_userdata_without_instance_user(self): """Don't add a custom instance user when not requested.""" cfg.CONF.set_override('heat_metadata_server_url', - 'http://server.test:123', enforce_type=True) + 'http://server.test:123') cfg.CONF.set_override('heat_watch_server_url', - 'http://server.test:345', enforce_type=True) + 'http://server.test:345') data = self.nova_plugin.build_userdata({}, instance_user=None) self.assertNotIn('user: ', data) self.assertNotIn('useradd', data) @@ -446,9 +444,9 @@ class NovaClientPluginUserdataTest(NovaClientPluginTestCase): def test_build_userdata_with_instance_user(self): """Add a custom instance user.""" cfg.CONF.set_override('heat_metadata_server_url', - 'http://server.test:123', enforce_type=True) + 'http://server.test:123') cfg.CONF.set_override('heat_watch_server_url', - 'http://server.test:345', enforce_type=True) + 'http://server.test:345') data = self.nova_plugin.build_userdata({}, instance_user='ec2-user') self.assertIn('user: ', data) self.assertIn('useradd', data) diff --git a/heat/tests/common.py b/heat/tests/common.py index 23679e0815..e26720f419 100644 --- a/heat/tests/common.py +++ b/heat/tests/common.py @@ -106,7 +106,7 @@ class HeatTestCase(testscenarios.WithScenarios, 'templates') cfg.CONF.set_default('environment_dir', env_dir) - cfg.CONF.set_override('error_wait_time', None, enforce_type=True) + cfg.CONF.set_override('error_wait_time', None) cfg.CONF.set_default('template_dir', template_dir) self.addCleanup(cfg.CONF.reset) diff --git a/heat/tests/db/test_sqlalchemy_api.py b/heat/tests/db/test_sqlalchemy_api.py index 972398e486..6e3b3acafe 100644 --- a/heat/tests/db/test_sqlalchemy_api.py +++ b/heat/tests/db/test_sqlalchemy_api.py @@ -581,8 +581,7 @@ class SqlAlchemyTest(common.HeatTestCase): self.assertEqual(['id'], sort_keys) def test_stack_get_all_hidden_tags(self): - cfg.CONF.set_override('hidden_stack_tags', ['hidden'], - enforce_type=True) + cfg.CONF.set_override('hidden_stack_tags', ['hidden']) stacks = [self._setup_test_stack('stack', x)[1] for x in UUIDs] stacks[0].tags = ['hidden'] @@ -692,8 +691,7 @@ class SqlAlchemyTest(common.HeatTestCase): self.assertEqual(stacks[0].id, st_db[0].id) def test_stack_get_all_by_tag_with_show_hidden(self): - cfg.CONF.set_override('hidden_stack_tags', ['hidden'], - enforce_type=True) + cfg.CONF.set_override('hidden_stack_tags', ['hidden']) stacks = [self._setup_test_stack('stack', x)[1] for x in UUIDs] stacks[0].tags = ['tag1'] @@ -730,8 +728,7 @@ class SqlAlchemyTest(common.HeatTestCase): self.assertEqual(3, st_db) def test_count_all_hidden_tags(self): - cfg.CONF.set_override('hidden_stack_tags', ['hidden'], - enforce_type=True) + cfg.CONF.set_override('hidden_stack_tags', ['hidden']) stacks = [self._setup_test_stack('stack', x)[1] for x in UUIDs] stacks[0].tags = ['hidden'] @@ -761,8 +758,7 @@ class SqlAlchemyTest(common.HeatTestCase): self.assertEqual(2, st_db) def test_count_all_by_tag_with_show_hidden(self): - cfg.CONF.set_override('hidden_stack_tags', ['hidden'], - enforce_type=True) + cfg.CONF.set_override('hidden_stack_tags', ['hidden']) stacks = [self._setup_test_stack('stack', x)[1] for x in UUIDs] stacks[0].tags = ['tag1'] diff --git a/heat/tests/engine/service/test_stack_adopt.py b/heat/tests/engine/service/test_stack_adopt.py index 08e519af10..15b095db92 100644 --- a/heat/tests/engine/service/test_stack_adopt.py +++ b/heat/tests/engine/service/test_stack_adopt.py @@ -56,8 +56,8 @@ class StackServiceAdoptTest(common.HeatTestCase): return template, adopt_data def test_stack_adopt_with_params(self): - cfg.CONF.set_override('enable_stack_adopt', True, enforce_type=True) - cfg.CONF.set_override('convergence_engine', False, enforce_type=True) + cfg.CONF.set_override('enable_stack_adopt', True) + cfg.CONF.set_override('convergence_engine', False) env = {'parameters': {"app_dbx": "test"}} template, adopt_data = self._get_adopt_data_and_template(env) result = self.man.create_stack(self.ctx, "test_adopt_with_params", @@ -74,8 +74,8 @@ class StackServiceAdoptTest(common.HeatTestCase): def test_convergence_stack_adopt_with_params(self, mock_converge, mock_send_notif): - cfg.CONF.set_override('enable_stack_adopt', True, enforce_type=True) - cfg.CONF.set_override('convergence_engine', True, enforce_type=True) + cfg.CONF.set_override('enable_stack_adopt', True) + cfg.CONF.set_override('convergence_engine', True) env = {'parameters': {"app_dbx": "test"}} template, adopt_data = self._get_adopt_data_and_template(env) result = self.man.create_stack(self.ctx, "test_adopt_with_params", @@ -89,8 +89,8 @@ class StackServiceAdoptTest(common.HeatTestCase): self.assertTrue(mock_converge.called) def test_stack_adopt_saves_input_params(self): - cfg.CONF.set_override('enable_stack_adopt', True, enforce_type=True) - cfg.CONF.set_override('convergence_engine', False, enforce_type=True) + cfg.CONF.set_override('enable_stack_adopt', True) + cfg.CONF.set_override('convergence_engine', False) env = {'parameters': {"app_dbx": "foo"}} input_params = { "parameters": {"app_dbx": "bar"} @@ -109,8 +109,8 @@ class StackServiceAdoptTest(common.HeatTestCase): @mock.patch.object(parser.Stack, '_send_notification_and_add_event') def test_convergence_stack_adopt_saves_input_params( self, mock_converge, mock_send_notif): - cfg.CONF.set_override('enable_stack_adopt', True, enforce_type=True) - cfg.CONF.set_override('convergence_engine', True, enforce_type=True) + cfg.CONF.set_override('enable_stack_adopt', True) + cfg.CONF.set_override('convergence_engine', True) env = {'parameters': {"app_dbx": "foo"}} input_params = { "parameters": {"app_dbx": "bar"} @@ -127,8 +127,8 @@ class StackServiceAdoptTest(common.HeatTestCase): self.assertTrue(mock_converge.called) def test_stack_adopt_stack_state(self): - cfg.CONF.set_override('enable_stack_adopt', True, enforce_type=True) - cfg.CONF.set_override('convergence_engine', False, enforce_type=True) + cfg.CONF.set_override('enable_stack_adopt', True) + cfg.CONF.set_override('convergence_engine', False) env = {'parameters': {"app_dbx": "test"}} template, adopt_data = self._get_adopt_data_and_template(env) result = self.man.create_stack(self.ctx, "test_adopt_stack_state", @@ -143,8 +143,8 @@ class StackServiceAdoptTest(common.HeatTestCase): @mock.patch.object(parser.Stack, '_send_notification_and_add_event') def test_convergence_stack_adopt_stack_state(self, mock_converge, mock_send_notif): - cfg.CONF.set_override('enable_stack_adopt', True, enforce_type=True) - cfg.CONF.set_override('convergence_engine', True, enforce_type=True) + cfg.CONF.set_override('enable_stack_adopt', True) + cfg.CONF.set_override('convergence_engine', True) env = {'parameters': {"app_dbx": "test"}} template, adopt_data = self._get_adopt_data_and_template(env) result = self.man.create_stack(self.ctx, "test_adopt_stack_state", @@ -158,7 +158,7 @@ class StackServiceAdoptTest(common.HeatTestCase): def test_stack_adopt_disabled(self): # to test disable stack adopt - cfg.CONF.set_override('enable_stack_adopt', False, enforce_type=True) + cfg.CONF.set_override('enable_stack_adopt', False) env = {'parameters': {"app_dbx": "test"}} template, adopt_data = self._get_adopt_data_and_template(env) ex = self.assertRaises( diff --git a/heat/tests/engine/service/test_stack_create.py b/heat/tests/engine/service/test_stack_create.py index a8e6b6c1e1..7a968fd83b 100644 --- a/heat/tests/engine/service/test_stack_create.py +++ b/heat/tests/engine/service/test_stack_create.py @@ -86,12 +86,12 @@ class StackCreateTest(common.HeatTestCase): environment_files=environment_files) def test_stack_create_equals_max_per_tenant(self): - cfg.CONF.set_override('max_stacks_per_tenant', 1, enforce_type=True) + cfg.CONF.set_override('max_stacks_per_tenant', 1) stack_name = 'service_create_test_stack_equals_max' self._test_stack_create(stack_name) def test_stack_create_exceeds_max_per_tenant(self): - cfg.CONF.set_override('max_stacks_per_tenant', 0, enforce_type=True) + cfg.CONF.set_override('max_stacks_per_tenant', 0) stack_name = 'service_create_test_stack_exceeds_max' ex = self.assertRaises(dispatcher.ExpectedException, self._test_stack_create, stack_name) @@ -234,7 +234,7 @@ class StackCreateTest(common.HeatTestCase): return_value=stk.env) mock_stack = self.patchobject(stack, 'Stack', return_value=stk) - cfg.CONF.set_override('max_resources_per_stack', 3, enforce_type=True) + cfg.CONF.set_override('max_resources_per_stack', 3) result = self.man.create_stack(self.ctx, stack_name, template, params, None, {}) @@ -264,7 +264,7 @@ class StackCreateTest(common.HeatTestCase): } } - cfg.CONF.set_override('max_resources_per_stack', 2, enforce_type=True) + cfg.CONF.set_override('max_resources_per_stack', 2) ex = self.assertRaises(dispatcher.ExpectedException, self.man.create_stack, self.ctx, stack_name, tpl, params, None, {}) @@ -380,6 +380,6 @@ class StackCreateTest(common.HeatTestCase): def test_stack_create_max_unlimited(self, total_res_mock, validate_mock): total_res_mock.return_value = 9999 validate_mock.return_value = None - cfg.CONF.set_override('max_resources_per_stack', -1, enforce_type=True) + cfg.CONF.set_override('max_resources_per_stack', -1) stack_name = 'service_create_test_max_unlimited' self._test_stack_create(stack_name) diff --git a/heat/tests/engine/service/test_stack_update.py b/heat/tests/engine/service/test_stack_update.py index ff63b48b83..36f19add43 100644 --- a/heat/tests/engine/service/test_stack_update.py +++ b/heat/tests/engine/service/test_stack_update.py @@ -238,8 +238,7 @@ resources: a_resource: type: GenericResourceType ''' - cfg.CONF.set_override('encrypt_parameters_and_properties', True, - enforce_type=True) + cfg.CONF.set_override('encrypt_parameters_and_properties', True) stack_name = 'service_update_test_stack_encrypted_parameters' t = template_format.parse(hidden_param_template) @@ -583,7 +582,7 @@ resources: mock_validate = self.patchobject(stk, 'validate', return_value=None) # do update - cfg.CONF.set_override('max_resources_per_stack', 3, enforce_type=True) + cfg.CONF.set_override('max_resources_per_stack', 3) api_args = {'timeout_mins': 60} result = self.man.update_stack(self.ctx, old_stack.identifier(), @@ -671,7 +670,7 @@ resources: sid = old_stack.store() self.assertIsNotNone(sid) - cfg.CONF.set_override('max_resources_per_stack', 2, enforce_type=True) + cfg.CONF.set_override('max_resources_per_stack', 2) ex = self.assertRaises(dispatcher.ExpectedException, self.man.update_stack, self.ctx, diff --git a/heat/tests/openstack/cinder/test_volume.py b/heat/tests/openstack/cinder/test_volume.py index 7ff6a8952f..a457985531 100644 --- a/heat/tests/openstack/cinder/test_volume.py +++ b/heat/tests/openstack/cinder/test_volume.py @@ -1039,8 +1039,7 @@ class CinderVolumeTest(vt_base.BaseVolumeTest): def test_cinder_create_with_stack_scheduler_hints(self): fv = vt_base.FakeVolume('creating') - sh.cfg.CONF.set_override('stack_scheduler_hints', True, - enforce_type=True) + sh.cfg.CONF.set_override('stack_scheduler_hints', True) stack_name = 'test_cvolume_stack_scheduler_hints_stack' t = template_format.parse(single_cinder_volume_template) diff --git a/heat/tests/openstack/heat/test_remote_stack.py b/heat/tests/openstack/heat/test_remote_stack.py index f8a5530881..8f3bdf1ff8 100644 --- a/heat/tests/openstack/heat/test_remote_stack.py +++ b/heat/tests/openstack/heat/test_remote_stack.py @@ -131,7 +131,7 @@ class RemoteStackTest(tests_common.HeatTestCase): self.that_region = 'RegionTwo' self.bad_region = 'RegionNone' - cfg.CONF.set_override('action_retry_limit', 0, enforce_type=True) + cfg.CONF.set_override('action_retry_limit', 0) self.parent = None self.heat = None self.client_plugin = None diff --git a/heat/tests/openstack/magnum/test_bay.py b/heat/tests/openstack/magnum/test_bay.py index 8d3b8f0600..68f766d049 100644 --- a/heat/tests/openstack/magnum/test_bay.py +++ b/heat/tests/openstack/magnum/test_bay.py @@ -72,7 +72,7 @@ class TestMagnumBay(common.HeatTestCase): self.assertEqual((b.CREATE, b.COMPLETE), b.state) def test_bay_create_failed(self): - cfg.CONF.set_override('action_retry_limit', 0, enforce_type=True) + cfg.CONF.set_override('action_retry_limit', 0) b = self._create_resource('bay', self.rsrc_defn, self.stack, stat='CREATE_FAILED') exc = self.assertRaises( diff --git a/heat/tests/openstack/magnum/test_cluster.py b/heat/tests/openstack/magnum/test_cluster.py index caa78d7b24..c9160bd3cd 100644 --- a/heat/tests/openstack/magnum/test_cluster.py +++ b/heat/tests/openstack/magnum/test_cluster.py @@ -194,7 +194,7 @@ class TestMagnumCluster(common.HeatTestCase): create_timeout=60) def test_cluster_create_failed(self): - cfg.CONF.set_override('action_retry_limit', 0, enforce_type=True) + cfg.CONF.set_override('action_retry_limit', 0) b = self._create_resource('cluster', self.rsrc_defn, self.stack, stat='CREATE_FAILED') exc = self.assertRaises( diff --git a/heat/tests/openstack/neutron/test_neutron_firewall.py b/heat/tests/openstack/neutron/test_neutron_firewall.py index 4bc6c2c324..f365bc946c 100644 --- a/heat/tests/openstack/neutron/test_neutron_firewall.py +++ b/heat/tests/openstack/neutron/test_neutron_firewall.py @@ -118,7 +118,7 @@ class FirewallTest(common.HeatTestCase): self.m.VerifyAll() def test_create_failed_error_status(self): - cfg.CONF.set_override('action_retry_limit', 0, enforce_type=True) + cfg.CONF.set_override('action_retry_limit', 0) rsrc = self.create_firewall() neutronclient.Client.show_firewall('5678').AndReturn( {'firewall': {'status': 'PENDING_CREATE'}}) diff --git a/heat/tests/openstack/neutron/test_neutron_loadbalancer.py b/heat/tests/openstack/neutron/test_neutron_loadbalancer.py index 53e72deb4c..0e31ab93f9 100644 --- a/heat/tests/openstack/neutron/test_neutron_loadbalancer.py +++ b/heat/tests/openstack/neutron/test_neutron_loadbalancer.py @@ -429,7 +429,7 @@ class PoolTest(common.HeatTestCase): self.m.VerifyAll() def test_create_failed_error_status(self): - cfg.CONF.set_override('action_retry_limit', 0, enforce_type=True) + cfg.CONF.set_override('action_retry_limit', 0) snippet = template_format.parse(pool_template) self.stack = utils.parse_stack(snippet) diff --git a/heat/tests/openstack/nova/test_server.py b/heat/tests/openstack/nova/test_server.py index 992925f50a..fa8976f4df 100644 --- a/heat/tests/openstack/nova/test_server.py +++ b/heat/tests/openstack/nova/test_server.py @@ -1057,8 +1057,7 @@ class ServersTest(common.HeatTestCase): return_value=self.fc) return_server = self.fc.servers.list()[1] return_server.id = '5678' - sh.cfg.CONF.set_override('stack_scheduler_hints', True, - enforce_type=True) + sh.cfg.CONF.set_override('stack_scheduler_hints', True) # Unroll _create_test_server, to enable check # for addition of heat ids (stack id, resource name) stack_name = 'test_server_w_stack_sched_hints_s' diff --git a/heat/tests/openstack/sahara/test_cluster.py b/heat/tests/openstack/sahara/test_cluster.py index 0248045818..dd4e58c5a6 100644 --- a/heat/tests/openstack/sahara/test_cluster.py +++ b/heat/tests/openstack/sahara/test_cluster.py @@ -111,7 +111,7 @@ class SaharaClusterTest(common.HeatTestCase): self.cl_mgr.get.assert_called_once_with(self.fake_cl.id) def test_cluster_create_fails(self): - cfg.CONF.set_override('action_retry_limit', 0, enforce_type=True) + cfg.CONF.set_override('action_retry_limit', 0) cluster = self._init_cluster(self.t) self.cl_mgr.create.return_value = self.fake_cl self.cl_mgr.get.return_value = FakeCluster(status='Error') diff --git a/heat/tests/openstack/senlin/test_cluster.py b/heat/tests/openstack/senlin/test_cluster.py index c24ce8ef47..9f3467cb58 100644 --- a/heat/tests/openstack/senlin/test_cluster.py +++ b/heat/tests/openstack/senlin/test_cluster.py @@ -146,7 +146,7 @@ class SenlinClusterTest(common.HeatTestCase): **attach_policy_kwargs) def test_cluster_create_error(self): - cfg.CONF.set_override('action_retry_limit', 0, enforce_type=True) + cfg.CONF.set_override('action_retry_limit', 0) cluster = self._init_cluster(self.t) self.senlin_mock.create_cluster.return_value = self.fake_cl mock_action = mock.MagicMock() diff --git a/heat/tests/openstack/senlin/test_node.py b/heat/tests/openstack/senlin/test_node.py index 606d4ad3ca..7638a04929 100644 --- a/heat/tests/openstack/senlin/test_node.py +++ b/heat/tests/openstack/senlin/test_node.py @@ -112,7 +112,7 @@ class SenlinNodeTest(common.HeatTestCase): **expect_kwargs) def test_node_create_error(self): - cfg.CONF.set_override('action_retry_limit', 0, enforce_type=True) + cfg.CONF.set_override('action_retry_limit', 0) self.senlin_mock.create_node.return_value = self.fake_node mock_action = mock.MagicMock() mock_action.status = 'FAILED' diff --git a/heat/tests/openstack/senlin/test_policy.py b/heat/tests/openstack/senlin/test_policy.py index 747b950abd..f2f8ad7688 100644 --- a/heat/tests/openstack/senlin/test_policy.py +++ b/heat/tests/openstack/senlin/test_policy.py @@ -112,7 +112,7 @@ class SenlinPolicyTest(common.HeatTestCase): **expect_kwargs) def test_policy_create_fail(self): - cfg.CONF.set_override('action_retry_limit', 0, enforce_type=True) + cfg.CONF.set_override('action_retry_limit', 0) policy = self._init_policy(self.t) self.senlin_mock.create_policy.return_value = self.fake_p self.senlin_mock.cluster_attach_policy.return_value = { diff --git a/heat/tests/openstack/trove/test_instance.py b/heat/tests/openstack/trove/test_instance.py index 06c8299d59..280a645194 100644 --- a/heat/tests/openstack/trove/test_instance.py +++ b/heat/tests/openstack/trove/test_instance.py @@ -265,7 +265,7 @@ class InstanceTest(common.HeatTestCase): self.assertEqual((instance.CREATE, instance.COMPLETE), instance.state) def test_instance_create_fails(self): - cfg.CONF.set_override('action_retry_limit', 0, enforce_type=True) + cfg.CONF.set_override('action_retry_limit', 0) t = template_format.parse(db_template) instance = self._setup_test_instance('dbinstance_create', t) self.fake_instance.status = 'ERROR' diff --git a/heat/tests/test_common_context.py b/heat/tests/test_common_context.py index a08a10b3a6..75b1f4c709 100644 --- a/heat/tests/test_common_context.py +++ b/heat/tests/test_common_context.py @@ -128,7 +128,7 @@ class TestRequestContext(common.HeatTestCase): def test_keystone_v3_endpoint_in_context(self): """Ensure that the context is the preferred source for the auth_uri.""" cfg.CONF.set_override('auth_uri', 'http://xyz', - group='clients_keystone', enforce_type=True) + group='clients_keystone') policy_check = 'heat.common.policy.Enforcer.check_is_admin' with mock.patch(policy_check) as pc: pc.return_value = False @@ -144,7 +144,7 @@ class TestRequestContext(common.HeatTestCase): the preferred source when the context does not have the auth_uri. """ cfg.CONF.set_override('auth_uri', 'http://xyz', - group='clients_keystone', enforce_type=True) + group='clients_keystone') policy_check = 'heat.common.policy.Enforcer.check_is_admin' with mock.patch(policy_check) as pc: pc.return_value = False @@ -166,7 +166,7 @@ class TestRequestContext(common.HeatTestCase): """ importutils.import_module('keystonemiddleware.auth_token') cfg.CONF.set_override('auth_uri', 'http://abc/v2.0', - group='keystone_authtoken', enforce_type=True) + group='keystone_authtoken') policy_check = 'heat.common.policy.Enforcer.check_is_admin' with mock.patch(policy_check) as pc: pc.return_value = False diff --git a/heat/tests/test_convg_stack.py b/heat/tests/test_convg_stack.py index 003e8950bd..12621dd66b 100644 --- a/heat/tests/test_convg_stack.py +++ b/heat/tests/test_convg_stack.py @@ -34,7 +34,7 @@ from heat.tests import utils class StackConvergenceCreateUpdateDeleteTest(common.HeatTestCase): def setUp(self): super(StackConvergenceCreateUpdateDeleteTest, self).setUp() - cfg.CONF.set_override('convergence_engine', True, enforce_type=True) + cfg.CONF.set_override('convergence_engine', True) self.stack = None @mock.patch.object(parser.Stack, 'mark_complete') @@ -589,7 +589,7 @@ class StackConvergenceCreateUpdateDeleteTest(common.HeatTestCase): class TestConvgStackStateSet(common.HeatTestCase): def setUp(self): super(TestConvgStackStateSet, self).setUp() - cfg.CONF.set_override('convergence_engine', True, enforce_type=True) + cfg.CONF.set_override('convergence_engine', True) self.stack = tools.get_stack( 'test_stack', utils.dummy_context(), template=tools.wp_template, convergence=True) diff --git a/heat/tests/test_crypt.py b/heat/tests/test_crypt.py index b0097e2971..ad1af2e236 100644 --- a/heat/tests/test_crypt.py +++ b/heat/tests/test_crypt.py @@ -30,8 +30,7 @@ class CryptTest(common.HeatTestCase): def test_init_auth_encryption_key_length(self): """Test for length of the auth_encryption_length in config file""" - cfg.CONF.set_override('auth_encryption_key', 'abcdefghijklma', - enforce_type=True) + cfg.CONF.set_override('auth_encryption_key', 'abcdefghijklma') err = self.assertRaises(exception.Error, config.startup_sanity_check) exp_msg = ('heat.conf misconfigured, auth_encryption_key ' diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py index a160b45387..0be4edb7bc 100644 --- a/heat/tests/test_engine_service.py +++ b/heat/tests/test_engine_service.py @@ -208,7 +208,7 @@ class StackConvergenceServiceCreateUpdateTest(common.HeatTestCase): def setUp(self): super(StackConvergenceServiceCreateUpdateTest, self).setUp() - cfg.CONF.set_override('convergence_engine', True, enforce_type=True) + cfg.CONF.set_override('convergence_engine', True) self.ctx = utils.dummy_context() self.man = service.EngineService('a-host', 'a-topic') self.man.thread_group_mgr = tools.DummyThreadGroupManager() @@ -710,7 +710,7 @@ class StackServiceTest(common.HeatTestCase): @tools.stack_context('service_export_stack') def test_export_stack(self): - cfg.CONF.set_override('enable_stack_abandon', True, enforce_type=True) + cfg.CONF.set_override('enable_stack_abandon', True) self.m.StubOutWithMock(parser.Stack, 'load') parser.Stack.load(self.ctx, stack=mox.IgnoreArg()).AndReturn(self.stack) @@ -743,7 +743,7 @@ class StackServiceTest(common.HeatTestCase): @tools.stack_context('service_abandon_stack') def test_abandon_stack(self): - cfg.CONF.set_override('enable_stack_abandon', True, enforce_type=True) + cfg.CONF.set_override('enable_stack_abandon', True) self.m.StubOutWithMock(parser.Stack, 'load') parser.Stack.load(self.ctx, stack=mox.IgnoreArg()).AndReturn(self.stack) @@ -1213,7 +1213,7 @@ class StackServiceTest(common.HeatTestCase): @mock.patch.object(stack_object.Stack, 'count_all') def test_validate_new_stack_checks_stack_limit(self, mock_db_count): - cfg.CONF.set_override('max_stacks_per_tenant', 99, enforce_type=True) + cfg.CONF.set_override('max_stacks_per_tenant', 99) mock_db_count.return_value = 99 template = templatem.Template( {'HeatTemplateFormatVersion': '2012-12-12'}) @@ -1248,7 +1248,7 @@ class StackServiceTest(common.HeatTestCase): self.assertEqual(msg, six.text_type(ex)) def test_validate_new_stack_checks_resource_limit(self): - cfg.CONF.set_override('max_resources_per_stack', 5, enforce_type=True) + cfg.CONF.set_override('max_resources_per_stack', 5) template = {'HeatTemplateFormatVersion': '2012-12-12', 'Resources': { 'Res1': {'Type': 'GenericResource1'}, @@ -1347,7 +1347,7 @@ class StackServiceTest(common.HeatTestCase): ) def test_parse_adopt_stack_data_without_parameters(self): - cfg.CONF.set_override('enable_stack_adopt', True, enforce_type=True) + cfg.CONF.set_override('enable_stack_adopt', True) template = {"heat_template_version": "2015-04-30", "resources": { "myres": { @@ -1372,7 +1372,7 @@ class StackServiceTest(common.HeatTestCase): self.ctx, 'stack_name', template, {}, {}, None, args) def test_parse_adopt_stack_data_with_parameters(self): - cfg.CONF.set_override('enable_stack_adopt', True, enforce_type=True) + cfg.CONF.set_override('enable_stack_adopt', True) template = {"heat_template_version": "2015-04-30", "parameters": { "volsize": {"type": "number"} diff --git a/heat/tests/test_environment.py b/heat/tests/test_environment.py index 31b6401181..46efdbe948 100644 --- a/heat/tests/test_environment.py +++ b/heat/tests/test_environment.py @@ -185,8 +185,7 @@ def constraint_mapping(): with open(plugin_file, 'w+') as ef: ef.write(constraint_content) self.addCleanup(sys.modules.pop, "heat.engine.plugins.test") - cfg.CONF.set_override('plugin_dirs', plugin_dir.path, - enforce_type=True) + cfg.CONF.set_override('plugin_dirs', plugin_dir.path) env = environment.Environment({}) resources._load_global_environment(env) @@ -205,8 +204,7 @@ def constraint_mapping(): with open(plugin_file, 'w+') as ef: ef.write(constraint_content) self.addCleanup(sys.modules.pop, "heat.engine.plugins.test") - cfg.CONF.set_override('plugin_dirs', plugin_dir.path, - enforce_type=True) + cfg.CONF.set_override('plugin_dirs', plugin_dir.path) env = environment.Environment({}) error = self.assertRaises(ValueError, @@ -399,8 +397,7 @@ class GlobalEnvLoadingTest(common.HeatTestCase): envfile = os.path.join(envdir.path, 'test.yaml') with open(envfile, 'w+') as ef: ef.write(g_env_content) - cfg.CONF.set_override('environment_dir', envdir.path, - enforce_type=True) + cfg.CONF.set_override('environment_dir', envdir.path) # 2. load global env g_env = environment.Environment({}, user_env=False) @@ -422,8 +419,7 @@ class GlobalEnvLoadingTest(common.HeatTestCase): envfile = os.path.join(envdir.path, 'test.yaml') with open(envfile, 'w+') as ef: ef.write(g_env_content) - cfg.CONF.set_override('environment_dir', envdir.path, - enforce_type=True) + cfg.CONF.set_override('environment_dir', envdir.path) # 2. load global env g_env = environment.Environment({}, user_env=False) @@ -449,8 +445,7 @@ class GlobalEnvLoadingTest(common.HeatTestCase): envfile = os.path.join(envdir.path, 'test.yaml') with open(envfile, 'w+') as ef: ef.write(g_env_content) - cfg.CONF.set_override('environment_dir', envdir.path, - enforce_type=True) + cfg.CONF.set_override('environment_dir', envdir.path) # 2. load global env g_env = environment.Environment({}, user_env=False) @@ -492,8 +487,7 @@ class GlobalEnvLoadingTest(common.HeatTestCase): ef.write(g_env_content) with open(os.path.join(envdir.path, 'b.yaml'), 'w+') as ef: ef.write(g_env_content) - cfg.CONF.set_override('environment_dir', envdir.path, - enforce_type=True) + cfg.CONF.set_override('environment_dir', envdir.path) # 2. load global env g_env = environment.Environment({}, user_env=False) diff --git a/heat/tests/test_event.py b/heat/tests/test_event.py index c97019b8c4..341ae2b988 100644 --- a/heat/tests/test_event.py +++ b/heat/tests/test_event.py @@ -80,8 +80,8 @@ class EventTest(EventCommon): self._setup_stack(tmpl) def test_store_caps_events(self): - cfg.CONF.set_override('event_purge_batch_size', 1, enforce_type=True) - cfg.CONF.set_override('max_events_per_stack', 1, enforce_type=True) + cfg.CONF.set_override('event_purge_batch_size', 1) + cfg.CONF.set_override('max_events_per_stack', 1) self.resource.resource_id_set('resource_physical_id') e = event.Event(self.ctx, self.stack, 'TEST', 'IN_PROGRESS', 'Testing', @@ -100,8 +100,8 @@ class EventTest(EventCommon): self.assertEqual('arizona', events[0].physical_resource_id) def test_store_caps_events_random_purge(self): - cfg.CONF.set_override('event_purge_batch_size', 100, enforce_type=True) - cfg.CONF.set_override('max_events_per_stack', 1, enforce_type=True) + cfg.CONF.set_override('event_purge_batch_size', 100) + cfg.CONF.set_override('max_events_per_stack', 1) self.resource.resource_id_set('resource_physical_id') e = event.Event(self.ctx, self.stack, 'TEST', 'IN_PROGRESS', 'Testing', @@ -133,8 +133,8 @@ class EventTest(EventCommon): self.assertEqual(2, len(events)) def test_store_caps_resource_props_data(self): - cfg.CONF.set_override('event_purge_batch_size', 2, enforce_type=True) - cfg.CONF.set_override('max_events_per_stack', 3, enforce_type=True) + cfg.CONF.set_override('event_purge_batch_size', 2) + cfg.CONF.set_override('max_events_per_stack', 3) self.resource.resource_id_set('resource_physical_id') e = event.Event(self.ctx, self.stack, 'TEST', 'IN_PROGRESS', 'Testing', @@ -249,8 +249,7 @@ class EventTest(EventCommon): self.assertEqual({'Time': 'not enough'}, ev.resource_properties) def test_event_object_resource_properties_data(self): - cfg.CONF.set_override('encrypt_parameters_and_properties', True, - enforce_type=True) + cfg.CONF.set_override('encrypt_parameters_and_properties', True) data = {'p1': 'hello', 'p2': 'too soon?'} rpd_obj = rpd_object.ResourcePropertiesData().create(self.ctx, data) diff --git a/heat/tests/test_fault_middleware.py b/heat/tests/test_fault_middleware.py index d2d6a887c7..01efb17e9e 100644 --- a/heat/tests/test_fault_middleware.py +++ b/heat/tests/test_fault_middleware.py @@ -95,7 +95,7 @@ class FaultMiddlewareTest(common.HeatTestCase): def test_exception_with_non_ascii_chars(self): # We set debug to true to test the code path for serializing traces too - cfg.CONF.set_override('debug', True, enforce_type=True) + cfg.CONF.set_override('debug', True) msg = u'Error with non-ascii chars \x80' class TestException(heat_exc.HeatException): @@ -115,7 +115,7 @@ class FaultMiddlewareTest(common.HeatTestCase): def test_remote_exception(self): # We want tracebacks - cfg.CONF.set_override('debug', True, enforce_type=True) + cfg.CONF.set_override('debug', True) error = heat_exc.EntityNotFound(entity='Stack', name='a') exc_info = (type(error), error, None) serialized = rpc_common.serialize_remote_exception(exc_info) @@ -222,7 +222,7 @@ class FaultMiddlewareTest(common.HeatTestCase): def test_should_not_ignore_parent_classes_even_for_remote_ones(self): # We want tracebacks - cfg.CONF.set_override('debug', True, enforce_type=True) + cfg.CONF.set_override('debug', True) error = StackNotFoundChild(entity='Stack', name='a') exc_info = (type(error), error, None) diff --git a/heat/tests/test_resource.py b/heat/tests/test_resource.py index f6bd3a866b..501215a364 100644 --- a/heat/tests/test_resource.py +++ b/heat/tests/test_resource.py @@ -531,7 +531,7 @@ class ResourceTest(common.HeatTestCase): res, utmpl = self._setup_resource_for_update( res_name='test_update_rsrc_in_progress_raises_exception') - cfg.CONF.set_override('convergence_engine', False, enforce_type=True) + cfg.CONF.set_override('convergence_engine', False) res.action = res.UPDATE res.status = res.IN_PROGRESS @@ -539,7 +539,7 @@ class ResourceTest(common.HeatTestCase): exception.ResourceFailure, scheduler.TaskRunner(res.update, utmpl)) def test_update_replace_rollback(self): - cfg.CONF.set_override('convergence_engine', False, enforce_type=True) + cfg.CONF.set_override('convergence_engine', False) res, utmpl = self._setup_resource_for_update( res_name='test_update_replace_rollback') res.restore_prev_rsrc = mock.Mock() @@ -550,7 +550,7 @@ class ResourceTest(common.HeatTestCase): self.assertTrue(res.restore_prev_rsrc.called) def test_update_replace_rollback_restore_prev_rsrc_error(self): - cfg.CONF.set_override('convergence_engine', False, enforce_type=True) + cfg.CONF.set_override('convergence_engine', False) res, utmpl = self._setup_resource_for_update( res_name='restore_prev_rsrc_error') res.restore_prev_rsrc = mock.Mock(side_effect=Exception) @@ -597,8 +597,7 @@ class ResourceTest(common.HeatTestCase): self.assertIsNotNone(res.updated_time) def test_resource_object_resource_properties_data(self): - cfg.CONF.set_override('encrypt_parameters_and_properties', True, - enforce_type=True) + cfg.CONF.set_override('encrypt_parameters_and_properties', True) data = {'p1': 'i see', 'p2': 'good times, good times'} rpd_obj = rpd_object.ResourcePropertiesData().create( @@ -992,7 +991,7 @@ class ResourceTest(common.HeatTestCase): self.m.VerifyAll() def test_create_fail_retry_disabled(self): - cfg.CONF.set_override('action_retry_limit', 0, enforce_type=True) + cfg.CONF.set_override('action_retry_limit', 0) tmpl = rsrc_defn.ResourceDefinition('test_resource', 'Foo', {'Foo': 'abc'}) res = generic_rsrc.ResourceWithProps('test_resource', tmpl, self.stack) @@ -1919,8 +1918,7 @@ class ResourceTest(common.HeatTestCase): self.assertEqual({'foo': 'res', 'Foo': 'res'}, res.FnGetAtts()) def test_properties_data_stored_encrypted_decrypted_on_load(self): - cfg.CONF.set_override('encrypt_parameters_and_properties', True, - enforce_type=True) + cfg.CONF.set_override('encrypt_parameters_and_properties', True) tmpl = rsrc_defn.ResourceDefinition('test_resource', 'Foo') stored_properties_data = {'prop1': 'string', @@ -1965,8 +1963,7 @@ class ResourceTest(common.HeatTestCase): self.assertEqual('string', res_obj.rsrc_prop_data.data['prop1']) def test_properties_data_no_encryption(self): - cfg.CONF.set_override('encrypt_parameters_and_properties', False, - enforce_type=True) + cfg.CONF.set_override('encrypt_parameters_and_properties', False) tmpl = rsrc_defn.ResourceDefinition('test_resource', 'Foo') stored_properties_data = {'prop1': 'string', @@ -2677,8 +2674,7 @@ class ResourceDeleteRetryTest(common.HeatTestCase): env=self.env), stack_id=str(uuid.uuid4())) self.num_retries = 2 - cfg.CONF.set_override('action_retry_limit', self.num_retries, - enforce_type=True) + cfg.CONF.set_override('action_retry_limit', self.num_retries) def test_delete_retry_conflict(self): tmpl = rsrc_defn.ResourceDefinition('test_resource', @@ -2716,8 +2712,7 @@ class ResourceDeleteRetryTest(common.HeatTestCase): 'test_resource', tmpl, self.stack) res.state_set(res.CREATE, res.COMPLETE, 'wobble') - cfg.CONF.set_override('action_retry_limit', self.num_retries, - enforce_type=True) + cfg.CONF.set_override('action_retry_limit', self.num_retries) self.m.StubOutWithMock(timeutils, 'retry_backoff_delay') self.m.StubOutWithMock(generic_rsrc.GenericResource, 'handle_delete') @@ -4147,7 +4142,7 @@ class TestLiveStateUpdate(common.HeatTestCase): res = self._prepare_resource_live_state() res.resource_id = self.resource_id - cfg.CONF.set_override('observe_on_update', True, enforce_type=True) + cfg.CONF.set_override('observe_on_update', True) utmpl = rsrc_defn.ResourceDefinition('test_resource', 'ResourceWithPropsType', diff --git a/heat/tests/test_resource_properties_data.py b/heat/tests/test_resource_properties_data.py index 4c716179cc..a0e37c7324 100644 --- a/heat/tests/test_resource_properties_data.py +++ b/heat/tests/test_resource_properties_data.py @@ -39,8 +39,7 @@ class ResourcePropertiesDataTest(common.HeatTestCase): return rpd_obj, db_obj def test_rsrc_prop_data_encrypt(self): - cfg.CONF.set_override('encrypt_parameters_and_properties', True, - enforce_type=True) + cfg.CONF.set_override('encrypt_parameters_and_properties', True) rpd_obj, db_obj = self._get_rpd_and_db_obj() # verify data is encrypted in the db @@ -59,8 +58,7 @@ class ResourcePropertiesDataTest(common.HeatTestCase): self.assertEqual(self.data, rpd_obj['data']) def test_rsrc_prop_data_no_encrypt(self): - cfg.CONF.set_override('encrypt_parameters_and_properties', False, - enforce_type=True) + cfg.CONF.set_override('encrypt_parameters_and_properties', False) rpd_obj, db_obj = self._get_rpd_and_db_obj() # verify data is unencrypted in the db diff --git a/heat/tests/test_stack.py b/heat/tests/test_stack.py index 2e8a36ffee..a8ac04ee63 100644 --- a/heat/tests/test_stack.py +++ b/heat/tests/test_stack.py @@ -99,8 +99,7 @@ class StackTest(common.HeatTestCase): self.assertEqual('', self.stack.status_reason) def test_timeout_secs_default(self): - cfg.CONF.set_override('stack_action_timeout', 1000, - enforce_type=True) + cfg.CONF.set_override('stack_action_timeout', 1000) self.stack = stack.Stack(self.ctx, 'test_stack', self.tmpl) self.assertIsNone(self.stack.timeout_mins) self.assertEqual(1000, self.stack.timeout_secs()) @@ -1468,8 +1467,7 @@ class StackTest(common.HeatTestCase): def test_store_saves_creds_trust(self): """A user_creds entry is created on first stack store.""" - cfg.CONF.set_override('deferred_auth_method', 'trusts', - enforce_type=True) + cfg.CONF.set_override('deferred_auth_method', 'trusts') self.m.StubOutWithMock(keystone.KeystoneClientPlugin, '_create') keystone.KeystoneClientPlugin._create().AndReturn( @@ -2438,8 +2436,7 @@ class StackTest(common.HeatTestCase): env1 = environment.Environment({'param1': 'foo', 'param2': 'bar'}) self.stack = stack.Stack(self.ctx, 'test', template.Template(tmpl, env=env1)) - cfg.CONF.set_override('encrypt_parameters_and_properties', False, - enforce_type=True) + cfg.CONF.set_override('encrypt_parameters_and_properties', False) # Verify that hidden parameters stored in plain text self.stack.store() @@ -2467,8 +2464,7 @@ class StackTest(common.HeatTestCase): env1 = environment.Environment({'param1': 'foo', 'param2': 'bar'}) self.stack = stack.Stack(self.ctx, 'test', template.Template(tmpl, env=env1)) - cfg.CONF.set_override('encrypt_parameters_and_properties', True, - enforce_type=True) + cfg.CONF.set_override('encrypt_parameters_and_properties', True) # Verify that hidden parameters are stored encrypted self.stack.store() @@ -2523,16 +2519,14 @@ class StackTest(common.HeatTestCase): ''') # Create the stack with encryption enabled - cfg.CONF.set_override('encrypt_parameters_and_properties', True, - enforce_type=True) + cfg.CONF.set_override('encrypt_parameters_and_properties', True) env1 = environment.Environment({'param1': 'foo', 'param2': 'bar'}) self.stack = stack.Stack(self.ctx, 'test', template.Template(tmpl, env=env1)) self.stack.store() # Update the stack with encryption disabled - cfg.CONF.set_override('encrypt_parameters_and_properties', False, - enforce_type=True) + cfg.CONF.set_override('encrypt_parameters_and_properties', False) loaded_stack = stack.Stack.load(self.ctx, stack_id=self.stack.id) loaded_stack.state_set(self.stack.CREATE, self.stack.COMPLETE, 'for_update') @@ -2568,8 +2562,7 @@ class StackTest(common.HeatTestCase): format="%(levelname)8s [%(name)s] " "%(message)s")) - cfg.CONF.set_override('encrypt_parameters_and_properties', False, - enforce_type=True) + cfg.CONF.set_override('encrypt_parameters_and_properties', False) env1 = environment.Environment({'param1': 'foo', 'param2': 'bar'}) self.stack = stack.Stack(self.ctx, 'test', @@ -2609,8 +2602,7 @@ class StackTest(common.HeatTestCase): env1 = environment.Environment({'param1': 'foo', 'param2': 'bar'}) self.stack = stack.Stack(self.ctx, 'test', template.Template(tmpl, env=env1)) - cfg.CONF.set_override('encrypt_parameters_and_properties', False, - enforce_type=True) + cfg.CONF.set_override('encrypt_parameters_and_properties', False) # Verify that hidden parameters are stored decrypted self.stack.store() diff --git a/heat/tests/test_stack_resource.py b/heat/tests/test_stack_resource.py index c4e026481d..7fb63bd2ab 100644 --- a/heat/tests/test_stack_resource.py +++ b/heat/tests/test_stack_resource.py @@ -473,8 +473,7 @@ class StackResourceTest(StackResourceBaseTest): self.assertEqual(4, rsrc.FnGetAtt(rsrc.CURRENT_SIZE)) def test__validate_nested_resources_checks_num_of_resources(self): - stack_resource.cfg.CONF.set_override('max_resources_per_stack', 2, - enforce_type=True) + stack_resource.cfg.CONF.set_override('max_resources_per_stack', 2) tmpl = {'HeatTemplateFormatVersion': '2012-12-12', 'Resources': { 'r': { diff --git a/heat/tests/test_template_format.py b/heat/tests/test_template_format.py index 878d8e8bc1..eb8daa5962 100644 --- a/heat/tests/test_template_format.py +++ b/heat/tests/test_template_format.py @@ -98,8 +98,7 @@ class YamlMinimalTest(common.HeatTestCase): def test_long_yaml(self): template = {'HeatTemplateFormatVersion': '2012-12-12'} - config.cfg.CONF.set_override('max_template_size', 10, - enforce_type=True) + config.cfg.CONF.set_override('max_template_size', 10) template['Resources'] = ['a'] * int( config.cfg.CONF.max_template_size / 3) limit = config.cfg.CONF.max_template_size diff --git a/heat/tests/test_urlfetch.py b/heat/tests/test_urlfetch.py index b2d4e56aa2..8ae88d1051 100644 --- a/heat/tests/test_urlfetch.py +++ b/heat/tests/test_urlfetch.py @@ -113,7 +113,7 @@ class UrlFetchTest(common.HeatTestCase): url = 'http://example.com/template' data = b'{ "foo": "bar" }' response = Response(data) - cfg.CONF.set_override('max_template_size', 500, enforce_type=True) + cfg.CONF.set_override('max_template_size', 500) requests.get(url, stream=True).AndReturn(response) self.m.ReplayAll() urlfetch.get(url) @@ -123,7 +123,7 @@ class UrlFetchTest(common.HeatTestCase): url = 'http://example.com/template' data = b'{ "foo": "bar" }' response = Response(data) - cfg.CONF.set_override('max_template_size', 5, enforce_type=True) + cfg.CONF.set_override('max_template_size', 5) requests.get(url, stream=True).AndReturn(response) self.m.ReplayAll() exception = self.assertRaises(urlfetch.URLFetchError,