From 52be59345bc7e78917c6d145a927c157e436e78a Mon Sep 17 00:00:00 2001 From: Spyros Trigazis Date: Sat, 21 Jan 2017 23:22:01 +0100 Subject: [PATCH] Fix getting capacity in k8s_monitor Remove parsing literal for capacity. K8s client returns an object now. Change-Id: I26b3e529ee69ea9e48e0bedfbf95dd77d2b78593 Depends-On: Ia55d01a7cfd6e11448272e5859dd84e40147b618 Closes-Bug: #1595373 --- magnum/drivers/common/k8s_monitor.py | 2 +- magnum/tests/unit/conductor/test_monitors.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/magnum/drivers/common/k8s_monitor.py b/magnum/drivers/common/k8s_monitor.py index 0de63a9688..c15cd9efdf 100644 --- a/magnum/drivers/common/k8s_monitor.py +++ b/magnum/drivers/common/k8s_monitor.py @@ -158,7 +158,7 @@ class K8sMonitor(monitors.MonitorBase): # Output of node.status.capacity is strong # for example: # capacity = "{'cpu': '1', 'memory': '1000Ki'}" - capacity = ast.literal_eval(node.status.capacity) + capacity = node.status.capacity memory = utils.get_k8s_quantity(capacity['memory']) cpu = int(capacity['cpu']) parsed_nodes.append({'Memory': memory, 'Cpu': cpu}) diff --git a/magnum/tests/unit/conductor/test_monitors.py b/magnum/tests/unit/conductor/test_monitors.py index 71c30b6a9e..ef63a6131e 100644 --- a/magnum/tests/unit/conductor/test_monitors.py +++ b/magnum/tests/unit/conductor/test_monitors.py @@ -135,7 +135,7 @@ class MonitorsTestCase(base.TestCase): mock_nodes = mock.MagicMock() mock_node = mock.MagicMock() mock_node.status = mock.MagicMock() - mock_node.status.capacity = "{'memory': '2000Ki', 'cpu': '1'}" + mock_node.status.capacity = {'memory': '2000Ki', 'cpu': '1'} mock_nodes.items = [mock_node] mock_k8s_api.return_value.list_namespaced_node.return_value = ( mock_nodes)