openstack
/
nova
Code Issues Proposed changes

Merge "Ignore uuid if already set in ComputeNode.update_from_virt_driver"

This commit is contained in:
Zuul 2018-10-17 23:19:49 +00:00 committed by Gerrit Code Review
parent a534ccc5a7 498413074d
commit ce520ee789
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova/objects/compute_node.py
View File

@ -351,6 +351,11 @@ class ComputeNode(base.NovaPersistentObject, base.NovaObject):
"disk_available_least", "host_ip", "uuid"]
for key in keys:
if key in resources:
# The uuid field is read-only so it should only be set when
# creating the compute node record for the first time. Ignore
# it otherwise.
if key == 'uuid' and 'uuid' in self:
continue
setattr(self, key, resources[key])
# supported_instances has a different name in compute_node

14
nova/tests/unit/objects/test_compute_node.py
View File

@ -496,6 +496,20 @@ class _TestComputeNodeObject(object):
expected.uuid = uuidsentinel.node_uuid
self.assertTrue(base.obj_equal_prims(expected, compute))
def test_update_from_virt_driver_uuid_already_set(self):
"""Tests update_from_virt_driver where the compute node object already
has a uuid value so the uuid from the virt driver is ignored.
"""
# 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(uuid=uuidsentinel.something_else)
compute.update_from_virt_driver(resources)
expected = fake_compute_with_resources.obj_clone()
expected.uuid = uuidsentinel.something_else
self.assertTrue(base.obj_equal_prims(expected, compute))
def test_update_from_virt_driver_missing_field(self):
# NOTE(pmurray): update_from_virt_driver does not require
# all fields to be present in resources. Validation of the