diff options
| -rw-r--r-- | nova/tests/compute/test_compute.py | 46 |
1 files changed, 14 insertions, 32 deletions
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 8a5ced502..d67924868 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -792,11 +792,11 @@ class ComputeTestCase(BaseTestCase): instance_uuid = instance['uuid'] self.compute.run_instance(self.context, instance=instance) - db.instance_update(self.context, instance['uuid'], + db.instance_update(self.context, instance_uuid, {"task_state": task_states.RESCUING}) self.compute.rescue_instance(self.context, instance=instance) self.assertTrue(called['rescued']) - db.instance_update(self.context, instance['uuid'], + db.instance_update(self.context, instance_uuid, {"task_state": task_states.UNRESCUING}) self.compute.unrescue_instance(self.context, instance=instance) self.assertTrue(called['unrescued']) @@ -1165,7 +1165,6 @@ class ComputeTestCase(BaseTestCase): fake_driver_reset_network) instance = jsonutils.to_primitive(self._create_fake_instance()) - instance_uuid = instance['uuid'] self.compute.run_instance(self.context, instance=instance) self.compute.reset_network(self.context, instance=instance) @@ -1177,7 +1176,6 @@ class ComputeTestCase(BaseTestCase): def test_snapshot(self): """Ensure instance can be snapshotted""" instance = jsonutils.to_primitive(self._create_fake_instance()) - instance_uuid = instance['uuid'] name = "myfakesnapshot" self.compute.run_instance(self.context, instance=instance) db.instance_update(self.context, instance['uuid'], @@ -1317,7 +1315,6 @@ class ComputeTestCase(BaseTestCase): 'reset_network', dummy) instance = jsonutils.to_primitive(self._create_fake_instance()) - instance_uuid = instance['uuid'] self.assertEquals(len(test_notifier.NOTIFICATIONS), 0) self.compute.add_fixed_ip_to_instance(self.context, network_id=1, @@ -1338,7 +1335,6 @@ class ComputeTestCase(BaseTestCase): 'reset_network', dummy) instance = jsonutils.to_primitive(self._create_fake_instance()) - instance_uuid = instance['uuid'] self.assertEquals(len(test_notifier.NOTIFICATIONS), 0) self.compute.remove_fixed_ip_from_instance(self.context, 1, @@ -1770,8 +1766,6 @@ class ComputeTestCase(BaseTestCase): cur_time = datetime.datetime(2012, 12, 21, 12, 21) timeutils.set_time_override(old_time) instance = jsonutils.to_primitive(self._create_fake_instance()) - old_type_id = instance_types.get_instance_type_by_name( - 'm1.tiny')['id'] new_type = instance_types.get_instance_type_by_name('m1.small') new_type = jsonutils.to_primitive(new_type) new_type_id = new_type['id'] @@ -1954,12 +1948,12 @@ class ComputeTestCase(BaseTestCase): self.compute.run_instance(self.context, instance=instance) # Confirm the instance size before the resize starts - inst_ref = db.instance_get_by_uuid(self.context, instance['uuid']) + inst_ref = db.instance_get_by_uuid(self.context, instance_uuid) instance_type_ref = db.instance_type_get(self.context, inst_ref['instance_type_id']) self.assertEqual(instance_type_ref['flavorid'], '1') - new_inst_ref = db.instance_update(self.context, instance['uuid'], + new_inst_ref = db.instance_update(self.context, instance_uuid, {'host': 'foo'}) new_instance_type_ref = db.instance_type_get_by_flavor_id( @@ -1974,7 +1968,7 @@ class ComputeTestCase(BaseTestCase): inst_ref['uuid'], 'pre-migrating') instance = jsonutils.to_primitive(inst_ref) - db.instance_update(self.context, instance["uuid"], + db.instance_update(self.context, instance_uuid, {"task_state": task_states.RESIZE_PREP}) self.compute.resize_instance(self.context, instance=instance, migration=migration_ref, @@ -1984,14 +1978,14 @@ class ComputeTestCase(BaseTestCase): disk_info={}, image={}, instance=instance) # Prove that the instance size is now the new size - inst_ref = db.instance_get_by_uuid(self.context, instance['uuid']) + inst_ref = db.instance_get_by_uuid(self.context, instance_uuid) instance_type_ref = db.instance_type_get(self.context, inst_ref['instance_type_id']) self.assertEqual(instance_type_ref['flavorid'], '3') # Finally, revert and confirm the old flavor has been applied rpcinst = jsonutils.to_primitive(inst_ref) - db.instance_update(self.context, instance["uuid"], + db.instance_update(self.context, instance_uuid, {"task_state": task_states.RESIZE_REVERTING}) self.compute.revert_resize(self.context, migration_id=migration_ref['id'], instance=rpcinst, @@ -2009,11 +2003,11 @@ class ComputeTestCase(BaseTestCase): migration_id=migration_ref['id'], instance=rpcinst, reservations=reservations) - instance = db.instance_get_by_uuid(self.context, instance['uuid']) + instance = db.instance_get_by_uuid(self.context, instance_uuid) self.assertEqual(instance['vm_state'], vm_states.ACTIVE) self.assertEqual(instance['task_state'], None) - inst_ref = db.instance_get_by_uuid(self.context, instance['uuid']) + inst_ref = db.instance_get_by_uuid(self.context, instance_uuid) instance_type_ref = db.instance_type_get(self.context, inst_ref['instance_type_id']) self.assertEqual(instance_type_ref['flavorid'], '1') @@ -2076,8 +2070,6 @@ class ComputeTestCase(BaseTestCase): """Confirm check_can_live_migrate_source works on positive path""" inst_ref = jsonutils.to_primitive(self._create_fake_instance( {'host': 'fake_host_2'})) - inst_id = inst_ref["id"] - dest = "fake_host_1" self.mox.StubOutWithMock(db, 'instance_get') self.mox.StubOutWithMock(self.compute.driver, @@ -2096,8 +2088,6 @@ class ComputeTestCase(BaseTestCase): """Confirm check_can_live_migrate_destination works on positive path""" inst_ref = jsonutils.to_primitive(self._create_fake_instance( {'host': 'fake_host_2'})) - inst_id = inst_ref["id"] - dest = "fake_host_1" compute_info = {"compute": "info"} self.mox.StubOutWithMock(self.compute, @@ -2132,8 +2122,6 @@ class ComputeTestCase(BaseTestCase): """Confirm check_can_live_migrate_destination works on positive path""" inst_ref = jsonutils.to_primitive(self._create_fake_instance( {'host': 'fake_host_2'})) - inst_id = inst_ref["id"] - dest = "fake_host_1" compute_info = {"compute": "info"} self.mox.StubOutWithMock(self.compute, @@ -2160,8 +2148,6 @@ class ComputeTestCase(BaseTestCase): """Confirm check_can_live_migrate_destination works on positive path""" inst_ref = jsonutils.to_primitive(self._create_fake_instance( {'host': 'fake_host_2'})) - inst_id = inst_ref["id"] - dest = "fake_host_1" compute_info = {"compute": "info"} self.mox.StubOutWithMock(self.compute, @@ -2197,7 +2183,6 @@ class ComputeTestCase(BaseTestCase): """Confirm raising exception if instance doesn't have fixed_ip.""" # creating instance testdata instance = jsonutils.to_primitive(self._create_fake_instance()) - inst_id = instance["id"] self.mox.ReplayAll() self.assertRaises(exception.FixedIpNotFoundForInstance, @@ -2215,7 +2200,6 @@ class ComputeTestCase(BaseTestCase): # creating instance testdata instance = jsonutils.to_primitive(self._create_fake_instance( {'host': 'dummy'})) - inst_id = instance['id'] c = context.get_admin_context() nw_info = fake_network.fake_get_instance_nw_info(self.stubs) @@ -3611,7 +3595,7 @@ class ComputeAPITestCase(BaseTestCase): """Ensure a snapshot of an instance can be created""" instance = self._create_fake_instance() image = self.compute_api.snapshot(self.context, instance, 'snap1', - {'extra_param': 'value1'}) + {'extra_param': 'value1'}) self.assertEqual(image['name'], 'snap1') properties = image['properties'] @@ -3640,7 +3624,7 @@ class ComputeAPITestCase(BaseTestCase): instance['instance_type'].update(inst_params) image = self.compute_api.snapshot(self.context, instance, 'snap1', - {'extra_param': 'value1'}) + {'extra_param': 'value1'}) self.assertEqual(image['name'], 'snap1') self.assertEqual(image['min_ram'], 256) @@ -3672,7 +3656,7 @@ class ComputeAPITestCase(BaseTestCase): instance = self._create_fake_instance() image = self.compute_api.snapshot(self.context, instance, 'snap1', - {'extra_param': 'value1'}) + {'extra_param': 'value1'}) self.assertEqual(image['name'], 'snap1') self.assertEqual(image['min_ram'], 512) @@ -3701,7 +3685,7 @@ class ComputeAPITestCase(BaseTestCase): instance = self._create_fake_instance() image = self.compute_api.snapshot(self.context, instance, 'snap1', - {'extra_param': 'value1'}) + {'extra_param': 'value1'}) self.assertEqual(image['name'], 'snap1') self.assertFalse('min_ram' in image) @@ -3729,7 +3713,7 @@ class ComputeAPITestCase(BaseTestCase): instance = self._create_fake_instance() image = self.compute_api.snapshot(self.context, instance, 'snap1', - {'extra_param': 'value1'}) + {'extra_param': 'value1'}) self.assertEqual(image['name'], 'snap1') @@ -5569,8 +5553,6 @@ class ComputeReschedulingTestCase(BaseTestCase): scheduler_method = self.compute.scheduler_rpcapi.run_instance method_args = (request_spec, admin_password, injected_files, requested_networks, is_first_time, filter_properties) - task_state = task_states.SCHEDULING - return self.compute._reschedule(self.context, request_spec, filter_properties, instance_uuid, scheduler_method, method_args, self.expected_task_state) |