diff --git a/nova/tests/unit/api/openstack/fakes.py b/nova/tests/unit/api/openstack/fakes.py index 1f0e835e929a..2608a58e77eb 100644 --- a/nova/tests/unit/api/openstack/fakes.py +++ b/nova/tests/unit/api/openstack/fakes.py @@ -60,22 +60,6 @@ FAKE_UUID = 'aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' FAKE_UUIDS = {} -class Context(object): - pass - - -class FakeRouter(wsgi.Router): - def __init__(self, ext_mgr=None): - pass - - @webob.dec.wsgify - def __call__(self, req): - res = webob.Response() - res.status = '200' - res.headers['X-Test-Success'] = 'True' - return res - - @webob.dec.wsgify def fake_wsgi(self, req): return self.application @@ -333,15 +317,6 @@ class FakeAuthDatabase(object): del FakeAuthDatabase.data['id_%i' % token_id] -class FakeRateLimiter(object): - def __init__(self, application): - self.application = application - - @webob.dec.wsgify - def __call__(self, req): - return self.application - - def create_info_cache(nw_cache): if nw_cache is None: pub0 = ('192.168.1.100',) diff --git a/nova/tests/unit/network/test_manager.py b/nova/tests/unit/network/test_manager.py index f4c19b9b3713..c1576ea62b68 100644 --- a/nova/tests/unit/network/test_manager.py +++ b/nova/tests/unit/network/test_manager.py @@ -1925,16 +1925,6 @@ class _TestDomainObject(object): self.__setattr__(k, v) -class FakeNetwork(object): - def __init__(self, **kwargs): - self.vlan = None - for k, v in six.iteritems(kwargs): - self.__setattr__(k, v) - - def __getitem__(self, item): - return getattr(self, item) - - class CommonNetworkTestCase(test.TestCase): REQUIRES_LOCKING = True diff --git a/nova/tests/unit/virt/libvirt/test_driver.py b/nova/tests/unit/virt/libvirt/test_driver.py index c09f3f998b7c..c1d5807d511e 100644 --- a/nova/tests/unit/virt/libvirt/test_driver.py +++ b/nova/tests/unit/virt/libvirt/test_driver.py @@ -200,15 +200,6 @@ def _concurrency(signal, wait, done, target, is_block_dev=False): done.send() -class FakeVirDomainSnapshot(object): - - def __init__(self, dom=None): - self.dom = dom - - def delete(self, flags): - pass - - class FakeVirtDomain(object): def __init__(self, fake_xml=None, uuidstr=None, id=None, name=None): diff --git a/nova/tests/unit/virt/vmwareapi/fake.py b/nova/tests/unit/virt/vmwareapi/fake.py index 25e8158722d0..c55b8f0dc4af 100644 --- a/nova/tests/unit/virt/vmwareapi/fake.py +++ b/nova/tests/unit/virt/vmwareapi/fake.py @@ -137,16 +137,6 @@ class FakeRetrieveResult(object): self.objects.append(object) -class MissingProperty(object): - """Missing object in ObjectContent's missing set.""" - def __init__(self, path='fake-path', message='fake_message', - method_fault=None): - self.path = path - self.fault = DataObject() - self.fault.localizedMessage = message - self.fault.fault = method_fault - - def _get_object_refs(obj_type): """Get object References of the type.""" lst_objs = [] diff --git a/nova/tests/unit/virt/vmwareapi/test_driver_api.py b/nova/tests/unit/virt/vmwareapi/test_driver_api.py index 4141a7853050..a11609b8b2cc 100644 --- a/nova/tests/unit/virt/vmwareapi/test_driver_api.py +++ b/nova/tests/unit/virt/vmwareapi/test_driver_api.py @@ -71,18 +71,6 @@ CONF.import_opt('remove_unused_original_minimum_age_seconds', 'nova.virt.imagecache') -class fake_vm_ref(object): - def __init__(self): - self.value = 4 - self._type = 'VirtualMachine' - - -class fake_service_content(object): - def __init__(self): - self.ServiceContent = vmwareapi_fake.DataObject() - self.ServiceContent.fake = 'fake' - - def _fake_create_session(inst): session = vmwareapi_fake.DataObject() session.key = 'fake_key' diff --git a/nova/tests/unit/volume/test_cinder.py b/nova/tests/unit/volume/test_cinder.py index b3802a6d1265..79a7fc3395de 100644 --- a/nova/tests/unit/volume/test_cinder.py +++ b/nova/tests/unit/volume/test_cinder.py @@ -44,22 +44,6 @@ class FakeCinderClient(object): self.volume_snapshots = self.volumes -class FakeVolume(object): - def __init__(self, dict=dict()): - self.id = dict.get('id') or '1234' - self.status = dict.get('status') or 'available' - self.size = dict.get('size') or 1 - self.availability_zone = dict.get('availability_zone') or 'cinder' - self.created_at = dict.get('created_at') - self.attach_time = dict.get('attach_time') - self.mountpoint = dict.get('mountpoint') - self.display_name = dict.get('display_name') or 'volume-' + self.id - self.display_description = dict.get('display_description') or 'fake' - self.volume_type_id = dict.get('volume_type_id') - self.snapshot_id = dict.get('snapshot_id') - self.metadata = dict.get('volume_metadata') or {} - - class CinderApiTestCase(test.NoDBTestCase): def setUp(self): super(CinderApiTestCase, self).setUp()