openstack/nova
Code Issues Proposed changes

Include hostname in notification payloads.

Browse Source 
Moniker is going to want this in order to autogenerate
certain DNS records.

Change-Id: I3a9a6afb88712a297397493d310d55abcc63897e
This commit is contained in:
andrewbogott
2012-11-06 17:08:17 -06:00
parent 8117306c65
commit f30b352ac5
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nova/notifications.py
View File

@@ -300,6 +300,7 @@ def info_from_instance(context, instance_ref, network_info,
instance_id=instance_ref['uuid'], instance_id=instance_ref['uuid'],
display_name=instance_ref['display_name'], display_name=instance_ref['display_name'],
reservation_id=instance_ref['reservation_id'], reservation_id=instance_ref['reservation_id'],
hostname=instance_ref['hostname'],
# Type properties # Type properties
instance_type=instance_type_name, instance_type=instance_type_name,

5
nova/tests/test_notifications.py
View File

@@ -82,6 +82,7 @@ class NotificationsTestCase(test.TestCase):
inst['access_ip_v4'] = '1.2.3.4' inst['access_ip_v4'] = '1.2.3.4'
inst['access_ip_v6'] = 'feed:5eed' inst['access_ip_v6'] = 'feed:5eed'
inst['display_name'] = 'test_instance' inst['display_name'] = 'test_instance'
inst['hostname'] = 'test_instance_hostname'
if params: if params:
inst.update(params) inst.update(params)
return db.instance_create(self.context, inst) return db.instance_create(self.context, inst)
@@ -211,6 +212,7 @@ class NotificationsTestCase(test.TestCase):
access_ip_v4 = self.instance["access_ip_v4"] access_ip_v4 = self.instance["access_ip_v4"]
access_ip_v6 = self.instance["access_ip_v6"] access_ip_v6 = self.instance["access_ip_v6"]
display_name = self.instance["display_name"] display_name = self.instance["display_name"]
hostname = self.instance["hostname"]
self.assertEquals(vm_states.BUILDING, payload["old_state"]) self.assertEquals(vm_states.BUILDING, payload["old_state"])
self.assertEquals(vm_states.ACTIVE, payload["state"]) self.assertEquals(vm_states.ACTIVE, payload["state"])
@@ -219,6 +221,7 @@ class NotificationsTestCase(test.TestCase):
self.assertEquals(payload["access_ip_v4"], access_ip_v4) self.assertEquals(payload["access_ip_v4"], access_ip_v4)
self.assertEquals(payload["access_ip_v6"], access_ip_v6) self.assertEquals(payload["access_ip_v6"], access_ip_v6)
self.assertEquals(payload["display_name"], display_name) self.assertEquals(payload["display_name"], display_name)
self.assertEquals(payload["hostname"], hostname)
def test_task_update_with_states(self): def test_task_update_with_states(self):
self.flags(notify_on_state_change="vm_and_task_state") self.flags(notify_on_state_change="vm_and_task_state")
@@ -232,6 +235,7 @@ class NotificationsTestCase(test.TestCase):
access_ip_v4 = self.instance["access_ip_v4"] access_ip_v4 = self.instance["access_ip_v4"]
access_ip_v6 = self.instance["access_ip_v6"] access_ip_v6 = self.instance["access_ip_v6"]
display_name = self.instance["display_name"] display_name = self.instance["display_name"]
hostname = self.instance["hostname"]
self.assertEquals(vm_states.BUILDING, payload["old_state"]) self.assertEquals(vm_states.BUILDING, payload["old_state"])
self.assertEquals(vm_states.BUILDING, payload["state"]) self.assertEquals(vm_states.BUILDING, payload["state"])
@@ -240,6 +244,7 @@ class NotificationsTestCase(test.TestCase):
self.assertEquals(payload["access_ip_v4"], access_ip_v4) self.assertEquals(payload["access_ip_v4"], access_ip_v4)
self.assertEquals(payload["access_ip_v6"], access_ip_v6) self.assertEquals(payload["access_ip_v6"], access_ip_v6)
self.assertEquals(payload["display_name"], display_name) self.assertEquals(payload["display_name"], display_name)
self.assertEquals(payload["hostname"], hostname)
def test_update_no_service_name(self): def test_update_no_service_name(self):
notifications.send_update_with_states(self.context, self.instance, notifications.send_update_with_states(self.context, self.instance,