Add node as instance attribute for notification
Fix bug 1181900 In havana release, node is not set as instance attribute and node indicates the hypervisor where the instance reside in, we should set node as instance attribute for notification. Change-Id: I872fba626ef3e321d88cf60fc730df6cf4612c86
This commit is contained in:
		@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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")
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user