diff --git a/cinder/common/config.py b/cinder/common/config.py index 4e9c6207df4..b12447b7f18 100644 --- a/cinder/common/config.py +++ b/cinder/common/config.py @@ -56,10 +56,6 @@ def _get_my_ip(): core_opts = [ - cfg.StrOpt('connection_type', - default=None, - help='Virtualization api connection type : libvirt, xenapi, ' - 'or fake'), cfg.StrOpt('api_paste_config', default="api-paste.ini", help='File name for the paste.deploy config for cinder-api'), diff --git a/cinder/tests/api/contrib/test_qos_specs_manage.py b/cinder/tests/api/contrib/test_qos_specs_manage.py index 310b8b62d71..0c3afd7f2c0 100644 --- a/cinder/tests/api/contrib/test_qos_specs_manage.py +++ b/cinder/tests/api/contrib/test_qos_specs_manage.py @@ -141,8 +141,7 @@ def return_disassociate_all(context, id): class QoSSpecManageApiTest(test.TestCase): def setUp(self): super(QoSSpecManageApiTest, self).setUp() - self.flags(connection_type='fake', - host='fake', + self.flags(host='fake', notification_driver=[test_notifier.__name__]) self.controller = qos_specs_manage.QoSSpecsController() #reset notifier drivers left over from other api/contrib tests diff --git a/cinder/tests/api/contrib/test_types_extra_specs.py b/cinder/tests/api/contrib/test_types_extra_specs.py index 1cdc3ab3ece..ccf29ad949c 100644 --- a/cinder/tests/api/contrib/test_types_extra_specs.py +++ b/cinder/tests/api/contrib/test_types_extra_specs.py @@ -65,8 +65,7 @@ class VolumeTypesExtraSpecsTest(test.TestCase): def setUp(self): super(VolumeTypesExtraSpecsTest, self).setUp() - self.flags(connection_type='fake', - host='fake', + self.flags(host='fake', notification_driver=[test_notifier.__name__]) self.stubs.Set(cinder.db, 'volume_type_get', volume_type_get) self.api_path = '/v2/fake/os-volume-types/1/extra_specs' diff --git a/cinder/tests/api/contrib/test_types_manage.py b/cinder/tests/api/contrib/test_types_manage.py index d8e6ef30c39..6be714f2262 100644 --- a/cinder/tests/api/contrib/test_types_manage.py +++ b/cinder/tests/api/contrib/test_types_manage.py @@ -64,8 +64,7 @@ def return_volume_types_get_by_name(context, name): class VolumeTypesManageApiTest(test.TestCase): def setUp(self): super(VolumeTypesManageApiTest, self).setUp() - self.flags(connection_type='fake', - host='fake', + self.flags(host='fake', notification_driver=[test_notifier.__name__]) self.controller = types_manage.VolumeTypesManageController() """to reset notifier drivers left over from other api/contrib tests""" diff --git a/cinder/tests/api/contrib/test_volume_type_encryption.py b/cinder/tests/api/contrib/test_volume_type_encryption.py index e2d2a1d9357..96ceb24326a 100644 --- a/cinder/tests/api/contrib/test_volume_type_encryption.py +++ b/cinder/tests/api/contrib/test_volume_type_encryption.py @@ -51,8 +51,7 @@ class VolumeTypeEncryptionTest(test.TestCase): def setUp(self): super(VolumeTypeEncryptionTest, self).setUp() - self.flags(connection_type='fake', - host='fake', + self.flags(host='fake', notification_driver=[test_notifier.__name__]) self.api_path = '/v2/fake/os-volume-types/1/encryption' """to reset notifier drivers left over from other api/contrib tests""" diff --git a/cinder/tests/conf_fixture.py b/cinder/tests/conf_fixture.py index 72b5b59a964..5f88f6348f9 100644 --- a/cinder/tests/conf_fixture.py +++ b/cinder/tests/conf_fixture.py @@ -36,7 +36,6 @@ def set_defaults(conf): conf.set_default('volume_driver', 'cinder.tests.fake_driver.FakeISCSIDriver') conf.set_default('iscsi_helper', 'fake') - conf.set_default('connection_type', 'fake') conf.set_default('fake_rabbit', True) conf.set_default('rpc_backend', 'cinder.openstack.common.rpc.impl_fake') conf.set_default('iscsi_num_targets', 8) diff --git a/cinder/tests/test_backup.py b/cinder/tests/test_backup.py index c8b33779f69..310326bd0af 100644 --- a/cinder/tests/test_backup.py +++ b/cinder/tests/test_backup.py @@ -45,8 +45,7 @@ class BackupTestCase(test.TestCase): def setUp(self): super(BackupTestCase, self).setUp() vol_tmpdir = tempfile.mkdtemp() - self.flags(connection_type='fake', - volumes_dir=vol_tmpdir) + self.flags(volumes_dir=vol_tmpdir) self.backup_mgr = \ importutils.import_object(CONF.backup_manager) self.backup_mgr.host = 'testhost' diff --git a/cinder/tests/test_volume.py b/cinder/tests/test_volume.py index 1a43feacc63..6eb542d7cb0 100644 --- a/cinder/tests/test_volume.py +++ b/cinder/tests/test_volume.py @@ -92,8 +92,7 @@ class BaseVolumeTestCase(test.TestCase): def setUp(self): super(BaseVolumeTestCase, self).setUp() vol_tmpdir = tempfile.mkdtemp() - self.flags(connection_type='fake', - volumes_dir=vol_tmpdir, + self.flags(volumes_dir=vol_tmpdir, notification_driver=[test_notifier.__name__]) self.volume = importutils.import_object(CONF.volume_manager) self.context = context.get_admin_context() diff --git a/cinder/tests/test_volume_utils.py b/cinder/tests/test_volume_utils.py index 727647ff217..60703909260 100644 --- a/cinder/tests/test_volume_utils.py +++ b/cinder/tests/test_volume_utils.py @@ -43,8 +43,7 @@ class UsageInfoTestCase(test.TestCase): def setUp(self): super(UsageInfoTestCase, self).setUp() - self.flags(connection_type='fake', - host='fake', + self.flags(host='fake', notification_driver=[test_notifier.__name__]) self.volume = importutils.import_object(CONF.volume_manager) self.user_id = 'fake' diff --git a/etc/cinder/cinder.conf.sample b/etc/cinder/cinder.conf.sample index 967cd7bc808..340fd1f8fe8 100644 --- a/etc/cinder/cinder.conf.sample +++ b/etc/cinder/cinder.conf.sample @@ -236,10 +236,6 @@ # Options defined in cinder.common.config # -# Virtualization api connection type : libvirt, xenapi, or -# fake (string value) -#connection_type= - # File name for the paste.deploy config for cinder-api (string # value) #api_paste_config=api-paste.ini