General cleanup of unused objects

* Remove unused function fake_get_remote_image_service
* Remove unused local function fake_execute2
* stub_out_key_pair_funcs() does nothing, remove it.
* Removed usage of enumerate()

Closes-Bug: #1286714
Closes-Bug: #1286712
Closes-Bug: #1286742
Closes-Bug: #1286809
Change-Id: I76413c886f6903df2adcf4a4ceb8990486a2ff2f

diff --git a/cinder/tests/api/contrib/test_extended_snapshot_attributes.py b/cinder/tests/api/contrib/test_extended_snapshot_attributes.py
index e90c291634343c4ac0a6583ec8da58c1b6da73f4..7df8ebb207a1a9e9d0a9d78a3927463d7a01389f 100644 (file)
--- a/cinder/tests/api/contrib/test_extended_snapshot_attributes.py
+++ b/cinder/tests/api/contrib/test_extended_snapshot_attributes.py
@@ -91,7 +91,7 @@ class ExtendedSnapshotAttributesTest(test.TestCase):
         res = self._make_request(url)
 
         self.assertEqual(res.status_int, 200)
-        for i, snapshot in enumerate(self._get_snapshots(res.body)):
+        for snapshot in self._get_snapshots(res.body):
             self.assertSnapshotAttributes(snapshot,
                                           project_id='fake',
                                           progress='0%')

diff --git a/cinder/tests/api/fakes.py b/cinder/tests/api/fakes.py
index 4f3bfd7a06f3a100501f39e37575c8c43a0c8452..62c1f5288c9c821fcaa7d89d95bdc2727e1a9772 100644 (file)
--- a/cinder/tests/api/fakes.py
+++ b/cinder/tests/api/fakes.py
@@ -28,7 +28,6 @@ from cinder.api.v2 import limits
 from cinder.api.v2 import router
 from cinder.api import versions
 from cinder import context
-from cinder import exception as exc
 from cinder.openstack.common import timeutils
 from cinder import wsgi
 
@@ -83,20 +82,6 @@ def wsgi_app(inner_app_v2=None, fake_auth=True, fake_auth_context=None,
     return mapper
 
 
-def stub_out_key_pair_funcs(stubs, have_key_pair=True):
-    def key_pair(context, user_id):
-        return [dict(name='key', public_key='public_key')]
-
-    def one_key_pair(context, user_id, name):
-        if name == 'key':
-            return dict(name='key', public_key='public_key')
-        else:
-            raise exc.KeypairNotFound(user_id=user_id, name=name)
-
-    def no_key_pair(context, user_id):
-        return []
-
-
 class FakeToken(object):
     id_count = 0
 

diff --git a/cinder/tests/api/v1/test_snapshot_metadata.py b/cinder/tests/api/v1/test_snapshot_metadata.py
index 427d694eba00974b4edcdf58f3157386455a6585..b75a88a37ccf61577ab56863563e5e81f1ca9ea2 100644 (file)
--- a/cinder/tests/api/v1/test_snapshot_metadata.py
+++ b/cinder/tests/api/v1/test_snapshot_metadata.py
@@ -137,7 +137,6 @@ class SnapshotMetaDataTest(test.TestCase):
     def setUp(self):
         super(SnapshotMetaDataTest, self).setUp()
         self.volume_api = cinder.volume.api.API()
-        fakes.stub_out_key_pair_funcs(self.stubs)
         self.stubs.Set(cinder.db, 'volume_get', return_volume)
         self.stubs.Set(cinder.db, 'snapshot_get', return_snapshot)
         self.stubs.Set(cinder.db, 'snapshot_metadata_get',

diff --git a/cinder/tests/api/v1/test_volume_metadata.py b/cinder/tests/api/v1/test_volume_metadata.py
index 56d90b3036714a8ebf1ab3f442a8195ce129d495..0e71cf83aefb50345b3493c3358e1f5fe7bcb969 100644 (file)
--- a/cinder/tests/api/v1/test_volume_metadata.py
+++ b/cinder/tests/api/v1/test_volume_metadata.py
@@ -122,7 +122,6 @@ class volumeMetaDataTest(test.TestCase):
     def setUp(self):
         super(volumeMetaDataTest, self).setUp()
         self.volume_api = cinder.volume.api.API()
-        fakes.stub_out_key_pair_funcs(self.stubs)
         self.stubs.Set(cinder.db, 'volume_get', return_volume)
         self.stubs.Set(cinder.db, 'volume_metadata_get',
                        return_volume_metadata)

diff --git a/cinder/tests/api/v2/test_snapshot_metadata.py b/cinder/tests/api/v2/test_snapshot_metadata.py
index 8fc1b1f8fb0c542f557de84ea4f114896e059e3f..bbfe4539437ef52442875cd5caeb53a4090202f4 100644 (file)
--- a/cinder/tests/api/v2/test_snapshot_metadata.py
+++ b/cinder/tests/api/v2/test_snapshot_metadata.py
@@ -137,7 +137,6 @@ class SnapshotMetaDataTest(test.TestCase):
     def setUp(self):
         super(SnapshotMetaDataTest, self).setUp()
         self.volume_api = cinder.volume.api.API()
-        fakes.stub_out_key_pair_funcs(self.stubs)
         self.stubs.Set(cinder.db, 'volume_get', return_volume)
         self.stubs.Set(cinder.db, 'snapshot_get', return_snapshot)
         self.stubs.Set(cinder.db, 'snapshot_metadata_get',

diff --git a/cinder/tests/api/v2/test_volume_metadata.py b/cinder/tests/api/v2/test_volume_metadata.py
index 51c1dad38a10e4582f3b78078c68bcbab35573ba..9b76efa3b2813519a57cbb1048c679da48dd6264 100644 (file)
--- a/cinder/tests/api/v2/test_volume_metadata.py
+++ b/cinder/tests/api/v2/test_volume_metadata.py
@@ -123,7 +123,6 @@ class volumeMetaDataTest(test.TestCase):
     def setUp(self):
         super(volumeMetaDataTest, self).setUp()
         self.volume_api = volume_api.API()
-        fakes.stub_out_key_pair_funcs(self.stubs)
         self.stubs.Set(db, 'volume_get', return_volume)
         self.stubs.Set(db, 'volume_metadata_get',
                        return_volume_metadata)

diff --git a/cinder/tests/brick/test_brick_linuxscsi.py b/cinder/tests/brick/test_brick_linuxscsi.py
index 9611093eaf1edf2379e4e762967ba8a7fafbe3fb..5dc46130ebe8274f4c7a317b8e10a85dbc199695 100644 (file)
--- a/cinder/tests/brick/test_brick_linuxscsi.py
+++ b/cinder/tests/brick/test_brick_linuxscsi.py
@@ -106,15 +106,6 @@ class LinuxSCSITestCase(test.TestCase):
                    )
             return out, None
 
-        def fake_execute2(*cmd, **kwargs):
-            out = ("350002ac20398383d dm-3 3PARdata,VV\n"
-                   "size=2.0G features='0' hwhandler='0' wp=rw\n"
-                   "`-+- policy='round-robin 0' prio=-1 status=active\n"
-                   "  |- 0:0:0:1  sde 8:64 active undef running\n"
-                   "  `- 2:0:0:1  sdf 8:80 active undef running\n"
-                   )
-            return out, None
-
         self.stubs.Set(self.linuxscsi, '_execute', fake_execute)
 
         info = self.linuxscsi.find_multipath_device('/dev/sde')

diff --git a/cinder/tests/image/fake.py b/cinder/tests/image/fake.py
index 18cea571f74295516d5e87637915865529a58518..9b5a83fd7a7425a978f78c9bfdd73416cdec40bd 100644 (file)
--- a/cinder/tests/image/fake.py
+++ b/cinder/tests/image/fake.py
@@ -229,8 +229,6 @@ def FakeImageService_reset():
 
 
 def stub_out_image_service(stubs):
-    def fake_get_remote_image_service(context, image_href):
-        return (FakeImageService(), image_href)
     stubs.Set(cinder.image.glance, 'get_remote_image_service',
               lambda x, y: (FakeImageService(), y))
     stubs.Set(cinder.image.glance, 'get_default_image_service',