Merge changes I55bdc631,I57789eab,I5ed8707b,Iaae16e63

* changes:
  Send a full instance in revert_resize.
  Send a full instance in resume_instance.
  Send a full instance in resize_instance.
  Send a full instance in reset_network.

2 files changed, 38 insertions, 30 deletions

diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index de02a9d85..36d001966 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -499,12 +499,11 @@ class ComputeTestCase(BaseTestCase):
 
     def test_suspend(self):
         """ensure instance can be suspended and resumed"""
-        instance = self._create_fake_instance()
+        instance = jsonutils.to_primitive(self._create_fake_instance())
         instance_uuid = instance['uuid']
         self.compute.run_instance(self.context, instance_uuid)
-        self.compute.suspend_instance(self.context,
-                instance=jsonutils.to_primitive(instance))
-        self.compute.resume_instance(self.context, instance_uuid)
+        self.compute.suspend_instance(self.context, instance=instance)
+        self.compute.resume_instance(self.context, instance=instance)
         self.compute.terminate_instance(self.context, instance_uuid)
 
     def test_suspend_error(self):
@@ -707,19 +706,24 @@ class ComputeTestCase(BaseTestCase):
 
     def test_reset_network(self):
         """Ensure we can reset networking on an instance"""
-        called = {'reset': False}
+        called = {'count': 0}
 
         def fake_driver_reset_network(self, instance):
-            called['reset'] = True
+            called['count'] += 1
 
         self.stubs.Set(nova.virt.fake.FakeDriver, 'reset_network',
                        fake_driver_reset_network)
 
-        instance = self._create_fake_instance()
+        instance = jsonutils.to_primitive(self._create_fake_instance())
         instance_uuid = instance['uuid']
         self.compute.run_instance(self.context, instance_uuid)
-        self.compute.reset_network(self.context, instance_uuid)
-        self.assertTrue(called['reset'])
+
+        # Make sure it works with both an instance and instance_uuid
+        self.compute.reset_network(self.context, instance=instance)
+        self.compute.reset_network(self.context, instance_uuid=instance_uuid)
+
+        self.assertEqual(called['count'], 2)
+
         self.compute.terminate_instance(self.context, instance_uuid)
 
     def test_agent_update(self):
@@ -1201,8 +1205,8 @@ class ComputeTestCase(BaseTestCase):
         migration_ref = db.migration_get_by_instance_and_status(context,
                                                 instance['uuid'],
                                                 'pre-migrating')
-        self.compute.resize_instance(context, instance['uuid'],
-                                     migration_ref['id'], {})
+        self.compute.resize_instance(context, migration_ref['id'], {},
+                                     instance=instance)
         timeutils.set_time_override(cur_time)
         test_notifier.NOTIFICATIONS = []
 
@@ -1299,7 +1303,7 @@ class ComputeTestCase(BaseTestCase):
         self.stubs.Set(self.compute.driver, 'migrate_disk_and_power_off',
                        throw_up)
 
-        instance = self._create_fake_instance()
+        instance = jsonutils.to_primitive(self._create_fake_instance())
         context = self.context.elevated()
 
         self.compute.run_instance(self.context, instance['uuid'])
@@ -1311,7 +1315,7 @@ class ComputeTestCase(BaseTestCase):
 
         #verify
         self.assertRaises(test.TestingException, self.compute.resize_instance,
-                          context, instance['uuid'], migration_ref['id'], {})
+                          context, migration_ref['id'], {}, instance=instance)
         instance = db.instance_get_by_uuid(context, instance['uuid'])
         self.assertEqual(instance['vm_state'], vm_states.ERROR)
 
@@ -1319,7 +1323,7 @@ class ComputeTestCase(BaseTestCase):
 
     def test_resize_instance(self):
         """Ensure instance can be migrated/resized"""
-        instance = self._create_fake_instance()
+        instance = jsonutils.to_primitive(self._create_fake_instance())
         context = self.context.elevated()
 
         self.compute.run_instance(self.context, instance['uuid'])
@@ -1329,8 +1333,8 @@ class ComputeTestCase(BaseTestCase):
                                  filter_properties={})
         migration_ref = db.migration_get_by_instance_and_status(context,
                 instance['uuid'], 'pre-migrating')
-        self.compute.resize_instance(context, instance['uuid'],
-                migration_ref['id'], {})
+        self.compute.resize_instance(context, migration_ref['id'], {},
+                                     instance=instance)
         self.compute.terminate_instance(context, instance['uuid'])
 
     def test_finish_revert_resize(self):
@@ -1363,8 +1367,8 @@ class ComputeTestCase(BaseTestCase):
         migration_ref = db.migration_get_by_instance_and_status(context,
                 inst_ref['uuid'], 'pre-migrating')
 
-        self.compute.resize_instance(context, inst_ref['uuid'],
-                migration_ref['id'], {})
+        self.compute.resize_instance(context, migration_ref['id'], {},
+                instance=jsonutils.to_primitive(inst_ref))
         self.compute.finish_resize(context,
                     migration_id=int(migration_ref['id']), disk_info={},
                     image={}, instance=jsonutils.to_primitive(inst_ref))
@@ -1376,11 +1380,11 @@ class ComputeTestCase(BaseTestCase):
         self.assertEqual(instance_type_ref['flavorid'], '3')
 
         # Finally, revert and confirm the old flavor has been applied
-        self.compute.revert_resize(context, inst_ref['uuid'],
-                migration_ref['id'])
+        rpcinst = jsonutils.to_primitive(inst_ref)
+        self.compute.revert_resize(context,
+                migration_id=migration_ref['id'], instance=rpcinst)
         self.compute.finish_revert_resize(context,
-                migration_id=migration_ref['id'],
-                instance=jsonutils.to_primitive(inst_ref))
+                migration_id=migration_ref['id'], instance=rpcinst)
 
         instance = db.instance_get_by_uuid(context, instance['uuid'])
         self.assertEqual(instance['vm_state'], vm_states.ACTIVE)
@@ -1416,7 +1420,7 @@ class ComputeTestCase(BaseTestCase):
                 'migrate_disk_and_power_off',
                 raise_migration_failure)
 
-        inst_ref = self._create_fake_instance()
+        inst_ref = jsonutils.to_primitive(self._create_fake_instance())
         context = self.context.elevated()
 
         self.compute.run_instance(self.context, inst_ref['uuid'])
@@ -1426,7 +1430,7 @@ class ComputeTestCase(BaseTestCase):
         migration_ref = db.migration_get_by_instance_and_status(context,
                 inst_ref['uuid'], 'pre-migrating')
         self.assertRaises(test.TestingException, self.compute.resize_instance,
-                          context, inst_ref['uuid'], migration_ref['id'], {})
+                          context, migration_ref['id'], {}, instance=inst_ref)
         inst_ref = db.instance_get_by_uuid(context, inst_ref['uuid'])
         self.assertEqual(inst_ref['vm_state'], vm_states.ERROR)
         self.compute.terminate_instance(context, inst_ref['uuid'])
diff --git a/nova/tests/compute/test_rpcapi.py b/nova/tests/compute/test_rpcapi.py
index 27d379eed..7a1195fe0 100644
--- a/nova/tests/compute/test_rpcapi.py
+++ b/nova/tests/compute/test_rpcapi.py
@@ -58,8 +58,10 @@ class ComputeRpcAPITestCase(test.TestCase):
             'post_live_migration_at_destination', 'power_off_instance',
             'power_on_instance', 'pre_live_migration', 'reboot_instance',
             'rebuild_instance', 'remove_fixed_ip_from_instance',
-            'remove_volume_connection', 'rescue_instance', 'start_instance',
-            'stop_instance', 'suspend_instance', 'unpause_instance'
+            'remove_volume_connection', 'rescue_instance', 'reset_network',
+            'resize_instance', 'resume_instance', 'revert_resize',
+            'start_instance', 'stop_instance', 'suspend_instance',
+            'unpause_instance'
         ]
 
         if 'rpcapi_class' in kwargs:
@@ -271,19 +273,21 @@ class ComputeRpcAPITestCase(test.TestCase):
 
     def test_reset_network(self):
         self._test_compute_api('reset_network', 'cast',
-                instance=self.fake_instance)
+                instance=self.fake_instance, version='1.28')
 
     def test_resize_instance(self):
         self._test_compute_api('resize_instance', 'cast',
-                instance=self.fake_instance, migration_id='id', image='image')
+                instance=self.fake_instance, migration_id='id', image='image',
+                version='1.29')
 
     def test_resume_instance(self):
         self._test_compute_api('resume_instance', 'cast',
-                instance=self.fake_instance)
+                instance=self.fake_instance, version='1.30')
 
     def test_revert_resize(self):
         self._test_compute_api('revert_resize', 'cast',
-                instance=self.fake_instance, migration_id='id', host='host')
+                instance=self.fake_instance, migration_id='id', host='host',
+                version='1.31')
 
     def test_rollback_live_migration_at_destination(self):
         self._test_compute_api('rollback_live_migration_at_destination',