Merge "Match ComputeNode.uuid to ironic node uuid in RT"

nova/objects/compute_node.py

@@ -347,7 +347,7 @@ class ComputeNode(base.NovaPersistentObject, base.NovaObject):
                 "vcpus_used", "memory_mb_used", "local_gb_used",
                 "numa_topology", "hypervisor_type",
                 "hypervisor_version", "hypervisor_hostname",
-                "disk_available_least", "host_ip"]
+                "disk_available_least", "host_ip", "uuid"]
         for key in keys:
             if key in resources:
                 setattr(self, key, resources[key])

nova/tests/unit/objects/test_compute_node.py

@@ -487,9 +487,12 @@ class _TestComputeNodeObject(object):
     def test_update_from_virt_driver(self):
         # copy in case the update has a side effect
         resources = copy.deepcopy(fake_resources)
+        # Emulate the ironic driver which adds a uuid field.
+        resources['uuid'] = uuidsentinel.node_uuid
         compute = compute_node.ComputeNode()
         compute.update_from_virt_driver(resources)
-        expected = fake_compute_with_resources
+        expected = fake_compute_with_resources.obj_clone()
+        expected.uuid = uuidsentinel.node_uuid
         self.assertTrue(base.obj_equal_prims(expected, compute))
 
     def test_update_from_virt_driver_missing_field(self):

nova/tests/unit/virt/ironic/test_driver.py

@@ -273,7 +273,7 @@ class IronicDriverTestCase(test.NoDBTestCase):
 
         result = self.driver._node_resource(node)
 
-        wantkeys = ["hypervisor_hostname", "hypervisor_type",
+        wantkeys = ["uuid", "hypervisor_hostname", "hypervisor_type",
                     "hypervisor_version", "cpu_info",
                     "vcpus", "vcpus_used",
                     "memory_mb", "memory_mb_used",
@@ -292,7 +292,7 @@ class IronicDriverTestCase(test.NoDBTestCase):
         self.assertEqual(result['memory_mb'], result['memory_mb_used'])
         self.assertEqual(props['local_gb'], result['local_gb'])
         self.assertEqual(result['local_gb'], result['local_gb_used'])
-
+        self.assertEqual(node_uuid, result['uuid'])
         self.assertEqual(node_uuid, result['hypervisor_hostname'])
         self.assertEqual(stats, result['stats'])
         self.assertEqual('foo', result['resource_class'])

nova/virt/ironic/driver.py

@@ -314,6 +314,7 @@ class IronicDriver(virt_driver.ComputeDriver):
             local_gb = 0
 
         dic = {
+            'uuid': str(node.uuid),
             'hypervisor_hostname': str(node.uuid),
             'hypervisor_type': self._get_hypervisor_type(),
             'hypervisor_version': self._get_hypervisor_version(),