Merge "Fix getting capacity in k8s_monitor"
This commit is contained in:
commit
42e9de4926
|
@ -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})
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue