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
This commit is contained in:
parent
06b97cc7d7
commit
52be59345b
@ -158,7 +158,7 @@ class K8sMonitor(monitors.MonitorBase):
|
|||||||
# Output of node.status.capacity is strong
|
# Output of node.status.capacity is strong
|
||||||
# for example:
|
# for example:
|
||||||
# capacity = "{'cpu': '1', 'memory': '1000Ki'}"
|
# capacity = "{'cpu': '1', 'memory': '1000Ki'}"
|
||||||
capacity = ast.literal_eval(node.status.capacity)
|
capacity = node.status.capacity
|
||||||
memory = utils.get_k8s_quantity(capacity['memory'])
|
memory = utils.get_k8s_quantity(capacity['memory'])
|
||||||
cpu = int(capacity['cpu'])
|
cpu = int(capacity['cpu'])
|
||||||
parsed_nodes.append({'Memory': memory, 'Cpu': cpu})
|
parsed_nodes.append({'Memory': memory, 'Cpu': cpu})
|
||||||
|
@ -135,7 +135,7 @@ class MonitorsTestCase(base.TestCase):
|
|||||||
mock_nodes = mock.MagicMock()
|
mock_nodes = mock.MagicMock()
|
||||||
mock_node = mock.MagicMock()
|
mock_node = mock.MagicMock()
|
||||||
mock_node.status = 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_nodes.items = [mock_node]
|
||||||
mock_k8s_api.return_value.list_namespaced_node.return_value = (
|
mock_k8s_api.return_value.list_namespaced_node.return_value = (
|
||||||
mock_nodes)
|
mock_nodes)
|
||||||
|
Loading…
Reference in New Issue
Block a user