diff options
| -rw-r--r-- | nova/notifications.py | 1 | ||||
| -rw-r--r-- | nova/tests/test_notifications.py | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/nova/notifications.py b/nova/notifications.py index 2e5e7660d..3800632c5 100644 --- a/nova/notifications.py +++ b/nova/notifications.py @@ -318,6 +318,7 @@ def info_from_instance(context, instance_ref, network_info, # Location properties host=instance_ref['host'], + node=instance_ref['node'], availability_zone=instance_ref['availability_zone'], # Date properties diff --git a/nova/tests/test_notifications.py b/nova/tests/test_notifications.py index 0d2108557..71b85b375 100644 --- a/nova/tests/test_notifications.py +++ b/nova/tests/test_notifications.py @@ -82,6 +82,7 @@ class NotificationsTestCase(test.TestCase): inst['access_ip_v6'] = 'feed:5eed' inst['display_name'] = 'test_instance' inst['hostname'] = 'test_instance_hostname' + inst['node'] = 'test_instance_node' inst['system_metadata'] = sys_meta if params: inst.update(params) @@ -211,6 +212,7 @@ class NotificationsTestCase(test.TestCase): access_ip_v6 = self.instance["access_ip_v6"] display_name = self.instance["display_name"] hostname = self.instance["hostname"] + node = self.instance["node"] self.assertEquals(vm_states.BUILDING, payload["old_state"]) self.assertEquals(vm_states.ACTIVE, payload["state"]) @@ -220,6 +222,7 @@ class NotificationsTestCase(test.TestCase): self.assertEquals(payload["access_ip_v6"], access_ip_v6) self.assertEquals(payload["display_name"], display_name) self.assertEquals(payload["hostname"], hostname) + self.assertEquals(payload["node"], node) def test_task_update_with_states(self): self.flags(notify_on_state_change="vm_and_task_state") |