diff options
| author | Matt Dietz <matt.dietz@rackspace.com> | 2012-07-30 19:27:52 +0000 |
|---|---|---|
| committer | Matt Dietz <matt.dietz@rackspace.com> | 2012-07-30 19:27:52 +0000 |
| commit | a84c35d0830f68553cf9c814f7ae2eccf04b84e8 (patch) | |
| tree | 3d729ff662d7628822cacbaea3aed73ff807a30a | |
| parent | 115fea1f9fa0fdb93f344a8ef9dc8ce9ba3cf6e9 (diff) | |
| download | nova-a84c35d0830f68553cf9c814f7ae2eccf04b84e8.tar.gz nova-a84c35d0830f68553cf9c814f7ae2eccf04b84e8.tar.xz nova-a84c35d0830f68553cf9c814f7ae2eccf04b84e8.zip | |
Reverts fix lp1031004
The fix was incorrectly applied to the resize.end event. There was a
miscommunication about the resize.end versus resize.finish event
Change-Id: I301b46bbb7684d70946a426ce371eaf1198b97df
| -rw-r--r-- | nova/compute/manager.py | 14 | ||||
| -rw-r--r-- | nova/tests/compute/test_compute.py | 4 |
2 files changed, 5 insertions, 13 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 1bcc23a13..686409e47 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1572,6 +1572,9 @@ class ComputeManager(manager.SchedulerDependentManager): self.compute_rpcapi.finish_resize(context, instance_ref, migration_id, image, disk_info, migration_ref['dest_compute']) + self._notify_about_instance_usage(context, instance_ref, "resize.end", + network_info=network_info) + def _finish_resize(self, context, instance, migration_ref, disk_info, image): resize_instance = False @@ -1647,17 +1650,6 @@ class ComputeManager(manager.SchedulerDependentManager): instance=instance) self._set_instance_error_state(context, instance['uuid']) - try: - network_info = self._get_instance_nw_info(context, instance) - except Exception, error: - with excutils.save_and_reraise_exception(): - msg = _('%s. Setting instance vm_state to ERROR') - LOG.error(msg % error) - self._set_instance_error_state(context, instance_uuid) - - self._notify_about_instance_usage(context, instance, "resize.end", - network_info=network_info) - @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id()) @checks_instance_lock @wrap_instance_fault diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py index 848376da1..c5913d9d3 100644 --- a/nova/tests/compute/test_compute.py +++ b/nova/tests/compute/test_compute.py @@ -1,4 +1,4 @@ -# vim: tabstop=5 shiftwidth=4 softtabstop=4 +# vim: tabstop=4 shiftwidth=4 softtabstop=4 # Copyright 2010 United States Government as represented by the # Administrator of the National Aeronautics and Space Administration. @@ -1208,7 +1208,7 @@ class ComputeTestCase(BaseTestCase): migration_id=int(migration_ref['id']), disk_info={}, image={}, instance=instance) - self.assertEquals(len(test_notifier.NOTIFICATIONS), 3) + self.assertEquals(len(test_notifier.NOTIFICATIONS), 2) msg = test_notifier.NOTIFICATIONS[0] self.assertEquals(msg['event_type'], 'compute.instance.finish_resize.start') |