openstack/nova
Code Issues Proposed changes

Merge "Set IronicNodeState.uuid in _update_from_compute_node"

Browse Source
This commit is contained in:
Jenkins
2017-07-26 07:00:20 +00:00
committed by Gerrit Code Review
parent 987c2d3fbf f30b66245d
commit 15500b89be
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
nova/scheduler/ironic_host_manager.py
View File

@@ -58,6 +58,7 @@ class IronicNodeState(host_manager.HostState):
self.free_disk_mb = compute.free_disk_gb * 1024 self.free_disk_mb = compute.free_disk_gb * 1024
self.stats = compute.stats or {} self.stats = compute.stats or {}
self.uuid = compute.uuid
self.total_usable_disk_gb = compute.local_gb self.total_usable_disk_gb = compute.local_gb
self.hypervisor_type = compute.hypervisor_type self.hypervisor_type = compute.hypervisor_type

11
nova/tests/unit/scheduler/ironic_fakes.py
View File

@@ -17,6 +17,7 @@ Fake nodes for Ironic host manager tests.
""" """
from nova import objects from nova import objects
from nova.tests import uuidsentinel as uuids
COMPUTE_NODES = [ COMPUTE_NODES = [
@@ -34,7 +35,7 @@ COMPUTE_NODES = [
["i386", "baremetal", "baremetal"])], ["i386", "baremetal", "baremetal"])],
free_disk_gb=10, free_ram_mb=1024, free_disk_gb=10, free_ram_mb=1024,
cpu_allocation_ratio=16.0, ram_allocation_ratio=1.5, cpu_allocation_ratio=16.0, ram_allocation_ratio=1.5,
disk_allocation_ratio=1.0), disk_allocation_ratio=1.0, uuid=uuids.compute_node_1),
objects.ComputeNode( objects.ComputeNode(
id=2, local_gb=20, memory_mb=2048, vcpus=1, id=2, local_gb=20, memory_mb=2048, vcpus=1,
vcpus_used=0, local_gb_used=0, memory_mb_used=0, vcpus_used=0, local_gb_used=0, memory_mb_used=0,
@@ -49,7 +50,7 @@ COMPUTE_NODES = [
["i386", "baremetal", "baremetal"])], ["i386", "baremetal", "baremetal"])],
free_disk_gb=20, free_ram_mb=2048, free_disk_gb=20, free_ram_mb=2048,
cpu_allocation_ratio=16.0, ram_allocation_ratio=1.5, cpu_allocation_ratio=16.0, ram_allocation_ratio=1.5,
disk_allocation_ratio=1.0), disk_allocation_ratio=1.0, uuid=uuids.compute_node_2),
objects.ComputeNode( objects.ComputeNode(
id=3, local_gb=30, memory_mb=3072, vcpus=1, id=3, local_gb=30, memory_mb=3072, vcpus=1,
vcpus_used=0, local_gb_used=0, memory_mb_used=0, vcpus_used=0, local_gb_used=0, memory_mb_used=0,
@@ -64,7 +65,7 @@ COMPUTE_NODES = [
["i386", "baremetal", "baremetal"])], ["i386", "baremetal", "baremetal"])],
free_disk_gb=30, free_ram_mb=3072, free_disk_gb=30, free_ram_mb=3072,
cpu_allocation_ratio=16.0, ram_allocation_ratio=1.5, cpu_allocation_ratio=16.0, ram_allocation_ratio=1.5,
disk_allocation_ratio=1.0), disk_allocation_ratio=1.0, uuid=uuids.compute_node_3),
objects.ComputeNode( objects.ComputeNode(
id=4, local_gb=40, memory_mb=4096, vcpus=1, id=4, local_gb=40, memory_mb=4096, vcpus=1,
vcpus_used=0, local_gb_used=0, memory_mb_used=0, vcpus_used=0, local_gb_used=0, memory_mb_used=0,
@@ -79,7 +80,7 @@ COMPUTE_NODES = [
["i386", "baremetal", "baremetal"])], ["i386", "baremetal", "baremetal"])],
free_disk_gb=40, free_ram_mb=4096, free_disk_gb=40, free_ram_mb=4096,
cpu_allocation_ratio=16.0, ram_allocation_ratio=1.5, cpu_allocation_ratio=16.0, ram_allocation_ratio=1.5,
disk_allocation_ratio=1.0), disk_allocation_ratio=1.0, uuid=uuids.compute_node_4),
# Broken entry # Broken entry
objects.ComputeNode( objects.ComputeNode(
id=5, local_gb=50, memory_mb=5120, vcpus=1, id=5, local_gb=50, memory_mb=5120, vcpus=1,
@@ -90,7 +91,7 @@ COMPUTE_NODES = [
supported_hv_specs=[objects.HVSpec.from_list( supported_hv_specs=[objects.HVSpec.from_list(
["i386", "baremetal", "baremetal"])], ["i386", "baremetal", "baremetal"])],
free_disk_gb=50, free_ram_mb=5120, free_disk_gb=50, free_ram_mb=5120,
hypervisor_hostname='fake-hyp'), hypervisor_hostname='fake-hyp', uuid=uuids.compute_node_5),
] ]
SERVICES = [ SERVICES = [

3
nova/tests/unit/scheduler/test_ironic_host_manager.py
View File

@@ -277,6 +277,9 @@ class IronicHostManagerChangedNodesTestCase(test.NoDBTestCase):
self.assertEqual('ironic', host.hypervisor_type) self.assertEqual('ironic', host.hypervisor_type)
self.assertEqual(1, host.hypervisor_version) self.assertEqual(1, host.hypervisor_version)
self.assertEqual('fake_host', host.hypervisor_hostname) self.assertEqual('fake_host', host.hypervisor_hostname)
# Make sure the uuid is set since that's needed for the allocation
# requests (claims to Placement) made in the FilterScheduler.
self.assertEqual(self.compute_node.uuid, host.uuid)
def test_update_from_compute_node_not_ready(self): def test_update_from_compute_node_not_ready(self):
"""Tests that we ignore a compute node that does not have its """Tests that we ignore a compute node that does not have its