Merge "Remove **kwargs from prep_resize in compute manager."

2 files changed, 9 insertions, 18 deletions

diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index f86e20f40..bcff79b05 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -1477,8 +1477,7 @@ class ComputeManager(manager.SchedulerDependentManager):
     @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id())
     @checks_instance_lock
     @wrap_instance_fault
-    def prep_resize(self, context, instance_uuid, instance_type_id, image,
-                    **kwargs):
+    def prep_resize(self, context, instance_uuid, instance_type_id, image):
         """Initiates the process of moving a running instance to another host.
 
         Possibly changes the RAM and disk size in the process.
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index 747fcb12e..a5e0a1265 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -1123,8 +1123,7 @@ class ComputeTestCase(BaseTestCase):
 
         context = self.context.elevated()
         instance = jsonutils.to_primitive(self._create_fake_instance())
-        self.compute.prep_resize(context, instance['uuid'], 1, {},
-                                 filter_properties={})
+        self.compute.prep_resize(context, instance['uuid'], 1, {})
         migration_ref = db.migration_get_by_instance_and_status(context,
                 instance['uuid'], 'pre-migrating')
         self.compute.finish_resize(context,
@@ -1145,8 +1144,7 @@ class ComputeTestCase(BaseTestCase):
 
         context = self.context.elevated()
         instance = jsonutils.to_primitive(self._create_fake_instance())
-        self.compute.prep_resize(context, instance['uuid'], 1, {},
-                                 filter_properties={})
+        self.compute.prep_resize(context, instance['uuid'], 1, {})
         migration_ref = db.migration_get_by_instance_and_status(context,
                 instance['uuid'], 'pre-migrating')
 
@@ -1234,8 +1232,7 @@ class ComputeTestCase(BaseTestCase):
         self.compute.run_instance(self.context, instance['uuid'])
 
         db.instance_update(self.context, instance['uuid'], {'host': 'foo'})
-        self.compute.prep_resize(context, instance['uuid'], new_type_id, {},
-                                 filter_properties={})
+        self.compute.prep_resize(context, instance['uuid'], new_type_id, {})
         migration_ref = db.migration_get_by_instance_and_status(context,
                                                 instance['uuid'],
                                                 'pre-migrating')
@@ -1284,8 +1281,7 @@ class ComputeTestCase(BaseTestCase):
         test_notifier.NOTIFICATIONS = []
 
         db.instance_update(self.context, instance['uuid'], {'host': 'foo'})
-        self.compute.prep_resize(context, instance['uuid'], 1, {},
-                                 filter_properties={})
+        self.compute.prep_resize(context, instance['uuid'], 1, {})
         db.migration_get_by_instance_and_status(context,
                                                 instance['uuid'],
                                                 'pre-migrating')
@@ -1345,8 +1341,7 @@ class ComputeTestCase(BaseTestCase):
 
         self.compute.run_instance(self.context, instance['uuid'])
         db.instance_update(self.context, instance['uuid'], {'host': 'foo'})
-        self.compute.prep_resize(context, instance['uuid'], 1, {},
-                                 filter_properties={})
+        self.compute.prep_resize(context, instance['uuid'], 1, {})
         migration_ref = db.migration_get_by_instance_and_status(context,
                 instance['uuid'], 'pre-migrating')
 
@@ -1367,8 +1362,7 @@ class ComputeTestCase(BaseTestCase):
         self.compute.run_instance(self.context, instance['uuid'])
         db.instance_update(self.context, instance['uuid'],
                            {'host': 'foo'})
-        self.compute.prep_resize(context, instance['uuid'], 1, {},
-                                 filter_properties={})
+        self.compute.prep_resize(context, instance['uuid'], 1, {})
         migration_ref = db.migration_get_by_instance_and_status(context,
                 instance['uuid'], 'pre-migrating')
         self.compute.resize_instance(context, migration_ref['id'], {},
@@ -1400,8 +1394,7 @@ class ComputeTestCase(BaseTestCase):
 
         new_instance_type_ref = db.instance_type_get_by_flavor_id(context, 3)
         self.compute.prep_resize(context, inst_ref['uuid'],
-                                 new_instance_type_ref['id'], {},
-                                 filter_properties={})
+                                 new_instance_type_ref['id'], {})
 
         migration_ref = db.migration_get_by_instance_and_status(context,
                 inst_ref['uuid'], 'pre-migrating')
@@ -1466,8 +1459,7 @@ class ComputeTestCase(BaseTestCase):
 
         self.compute.run_instance(self.context, inst_ref['uuid'])
         db.instance_update(self.context, inst_ref['uuid'], {'host': 'foo'})
-        self.compute.prep_resize(context, inst_ref['uuid'], 1, {},
-                                 filter_properties={})
+        self.compute.prep_resize(context, inst_ref['uuid'], 1, {})
         migration_ref = db.migration_get_by_instance_and_status(context,
                 inst_ref['uuid'], 'pre-migrating')
         self.assertRaises(test.TestingException, self.compute.resize_instance,