openstack/ironic
Code Issues Proposed changes

Merge "Add missing stats to IronicNodeState"

Browse Source
This commit is contained in:
Jenkins 2014-06-18 11:26:43 +00:00 committed by Gerrit Code Review
commit 172203ed3b
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ironic/nova/scheduler/ironic_host_manager.py
View File

@ -22,6 +22,7 @@ subdivided into multiple instances.
""" """
from oslo.config import cfg from oslo.config import cfg
from nova.openstack.common import jsonutils
from nova.openstack.common import log as logging from nova.openstack.common import log as logging
from nova.openstack.common import timeutils from nova.openstack.common import timeutils
from nova.scheduler import host_manager from nova.scheduler import host_manager
@ -70,6 +71,9 @@ class IronicNodeState(host_manager.HostState):
self.vcpus_total = compute['vcpus'] self.vcpus_total = compute['vcpus']
self.vcpus_used = compute['vcpus_used'] self.vcpus_used = compute['vcpus_used']
stats = compute.get('stats', '{}')
self.stats = jsonutils.loads(stats)
self.updated = compute['updated_at'] self.updated = compute['updated_at']
def consume_from_instance(self, instance): def consume_from_instance(self, instance):

2
ironic/nova/tests/scheduler/test_ironic_host_manager.py
View File

@ -128,6 +128,8 @@ class IronicHostManagerChangedNodesTestCase(test.NoDBTestCase):
self.assertEqual(10240, host.free_disk_mb) self.assertEqual(10240, host.free_disk_mb)
self.assertEqual(1, host.vcpus_total) self.assertEqual(1, host.vcpus_total)
self.assertEqual(0, host.vcpus_used) self.assertEqual(0, host.vcpus_used)
self.assertEqual(jsonutils.loads(self.compute_node['stats']),
host.stats)
def test_consume_identical_instance_from_compute(self): def test_consume_identical_instance_from_compute(self):
host = ironic_host_manager.IronicNodeState("fakehost", "fakenode") host = ironic_host_manager.IronicNodeState("fakehost", "fakenode")