Fix a notification bug when creating instances

Fixes a notifier bug that caused 'launched_at' to be empty and
state to be reported as 'building', due to failure to refresh
instance data prior to generating the notification.  Fixes
bug 834867.

Change-Id: I70fbf3c67407c67b69040ee481ca6d51212cc55d

nova/compute/manager.py

@@ -463,12 +463,12 @@ def _error_message(instance_id, message):
                                   network_info, block_device_info)
 
             current_power_state = self._get_power_state(context, instance)
-            self._instance_update(context,
-                                  instance_id,
-                                  power_state=current_power_state,
-                                  vm_state=vm_states.ACTIVE,
-                                  task_state=None,
-                                  launched_at=utils.utcnow())
+            instance = self._instance_update(context,
+                                             instance_id,
+                                             power_state=current_power_state,
+                                             vm_state=vm_states.ACTIVE,
+                                             task_state=None,
+                                             launched_at=utils.utcnow())
 
             usage_info = utils.usage_from_instance(instance)
             notifier.notify('compute.%s' % self.host,

nova/tests/test_compute.py

@@ -420,9 +420,11 @@ def test_run_instance_usage_notification(self):
         self.assertEquals(payload['instance_type'], 'm1.tiny')
         type_id = instance_types.get_instance_type_by_name('m1.tiny')['id']
         self.assertEquals(str(payload['instance_type_id']), str(type_id))
+        self.assertEquals(payload['state'], 'active')
         self.assertTrue('display_name' in payload)
         self.assertTrue('created_at' in payload)
         self.assertTrue('launched_at' in payload)
+        self.assertTrue(payload['launched_at'])
         self.assertEquals(payload['image_ref'], '1')
         self.compute.terminate_instance(self.context, instance_id)