From c9f8bbe529efe6843437d1810e51e8767f18535c Mon Sep 17 00:00:00 2001 From: Jo¶rgen Karlsson Date: Fri, 20 Nov 2015 17:42:59 +0100 Subject: Add scenario for reading processor load MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This scenario reads processor and system load statistics and does not run any benchmark tests. The scenario is intended to be run in parallell with other scenarios in order to collect processor and system load statistics. System load is read from /proc/loadavg. Processor usage stats is read using the 'mpstat' utility if it has been installed on the host. If 'mpstat' is not installed on the host processor usage stats is read from /proc/stats. Change-Id: I7156e0c941100023571db750de7540786a4fedb8 JIRA: YARDSTICK-181 Signed-off-by: Jo¶rgen Karlsson --- .../scenarios/compute/cpuload_sample_output1.txt | 5 + .../scenarios/compute/cpuload_sample_output2.txt | 2 + .../benchmark/scenarios/compute/test_cpuload.py | 238 +++++++++++++++++++++ 3 files changed, 245 insertions(+) create mode 100644 tests/unit/benchmark/scenarios/compute/cpuload_sample_output1.txt create mode 100644 tests/unit/benchmark/scenarios/compute/cpuload_sample_output2.txt create mode 100644 tests/unit/benchmark/scenarios/compute/test_cpuload.py (limited to 'tests/unit/benchmark/scenarios/compute') diff --git a/tests/unit/benchmark/scenarios/compute/cpuload_sample_output1.txt b/tests/unit/benchmark/scenarios/compute/cpuload_sample_output1.txt new file mode 100644 index 000000000..b1723ae17 --- /dev/null +++ b/tests/unit/benchmark/scenarios/compute/cpuload_sample_output1.txt @@ -0,0 +1,5 @@ +Linux 3.13.0-68-generic (elxg482ls42) 11/30/2015 _x86_64_ (12 CPU) + +04:53:04 PM CPU %usr %nice %sys %iowait %irq %soft %steal %guest %gnice %idle +04:53:04 PM all 11.31 0.03 1.19 0.18 0.00 0.01 0.00 5.51 0.00 81.77 +04:53:04 PM 0 20.03 0.03 1.36 0.33 0.00 0.06 0.00 6.62 0.00 71.56 diff --git a/tests/unit/benchmark/scenarios/compute/cpuload_sample_output2.txt b/tests/unit/benchmark/scenarios/compute/cpuload_sample_output2.txt new file mode 100644 index 000000000..c66520a27 --- /dev/null +++ b/tests/unit/benchmark/scenarios/compute/cpuload_sample_output2.txt @@ -0,0 +1,2 @@ +cpu 245813227 366650 17338727 1195600354 2652765 178 177114 0 80439531 0 +cpu0 32334587 35782 1659040 87008833 401178 60 73571 0 8030817 0 diff --git a/tests/unit/benchmark/scenarios/compute/test_cpuload.py b/tests/unit/benchmark/scenarios/compute/test_cpuload.py new file mode 100644 index 000000000..22c4419b2 --- /dev/null +++ b/tests/unit/benchmark/scenarios/compute/test_cpuload.py @@ -0,0 +1,238 @@ +#!/usr/bin/env python + +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +# Unittest for yardstick.benchmark.scenarios.compute.lmbench.Lmbench + +import mock +import unittest +import os + +from yardstick.benchmark.scenarios.compute import cpuload + + +@mock.patch('yardstick.benchmark.scenarios.compute.cpuload.ssh') +class CPULoadTestCase(unittest.TestCase): + + def setUp(self): + self.ctx = { + 'host': { + 'ip': '172.16.0.137', + 'user': 'cirros', + 'key_filename': "mykey.key" + } + } + + self.result = {} + + def test_setup_mpstat_installed(self, mock_ssh): + l = cpuload.CPULoad({}, self.ctx) + mock_ssh.SSH().execute.return_value = (0, '', '') + + l.setup() + self.assertIsNotNone(l.client) + self.assertTrue(l.setup_done) + self.assertTrue(l.has_mpstat) + + def test_setup_mpstat_not_installed(self, mock_ssh): + l = cpuload.CPULoad({}, self.ctx) + mock_ssh.SSH().execute.return_value = (127, '', '') + + l.setup() + self.assertIsNotNone(l.client) + self.assertTrue(l.setup_done) + self.assertFalse(l.has_mpstat) + + def test_execute_command_success(self, mock_ssh): + l = cpuload.CPULoad({}, self.ctx) + mock_ssh.SSH().execute.return_value = (0, '', '') + l.setup() + + expected_result = 'abcdefg' + mock_ssh.SSH().execute.return_value = (0, expected_result, '') + result = l._execute_command("foo") + self.assertEqual(result, expected_result) + + def test_execute_command_failed(self, mock_ssh): + l = cpuload.CPULoad({}, self.ctx) + mock_ssh.SSH().execute.return_value = (0, '', '') + l.setup() + + mock_ssh.SSH().execute.return_value = (127, '', 'abcdefg') + self.assertRaises(RuntimeError, l._execute_command, + "cat /proc/loadavg") + + def test_get_loadavg(self, mock_ssh): + l = cpuload.CPULoad({}, self.ctx) + mock_ssh.SSH().execute.return_value = (0, '', '') + l.setup() + + mock_ssh.SSH().execute.return_value = \ + (0, '1.50 1.45 1.51 3/813 14322', '') + result = l._get_loadavg() + expected_result = \ + {'loadavg': ['1.50', '1.45', '1.51', '3/813', '14322']} + self.assertEqual(result, expected_result) + + def test_get_cpu_usage_mpstat(self, mock_ssh): + l = cpuload.CPULoad({}, self.ctx) + mock_ssh.SSH().execute.return_value = (0, '', '') + l.setup() + + l.interval = 0 + mpstat_output = self._read_file("cpuload_sample_output1.txt") + mock_ssh.SSH().execute.return_value = (0, mpstat_output, '') + result = l._get_cpu_usage_mpstat() + + expected_result = \ + {'mpstat': + {'cpu': + {'%gnice': '0.00', + '%guest': '5.51', + '%idle': '81.77', + '%iowait': '0.18', + '%irq': '0.00', + '%nice': '0.03', + '%soft': '0.01', + '%steal': '0.00', + '%sys': '1.19', + '%usr': '11.31'}, + 'cpu0': + {'%gnice': '0.00', + '%guest': '6.62', + '%idle': '71.56', + '%iowait': '0.33', + '%irq': '0.00', + '%nice': '0.03', + '%soft': '0.06', + '%steal': '0.00', + '%sys': '1.36', + '%usr': '20.03'}}} + + self.assertDictEqual(result, expected_result) + + def test_get_cpu_usage(self, mock_ssh): + l = cpuload.CPULoad({}, self.ctx) + mock_ssh.SSH().execute.return_value = (0, '', '') + l.setup() + + l.interval = 0 + output = self._read_file("cpuload_sample_output2.txt") + mock_ssh.SSH().execute.return_value = (0, output, '') + result = l._get_cpu_usage() + + expected_result = \ + {'mpstat': + {'cpu': + {'%steal': '0.00', + '%usr': '11.31', + '%gnice': '0.00', + '%idle': '81.78', + '%iowait': '0.18', + '%guest': '5.50', + '%sys': '1.19', + '%soft': '0.01', + '%irq': '0.00', + '%nice': '0.03'}, + 'cpu0': + {'%steal': '0.00', + '%usr': '20.00', + '%gnice': '0.00', + '%idle': '71.60', + '%iowait': '0.33', + '%guest': '6.61', + '%sys': '1.37', + '%soft': '0.06', + '%irq': '0.00', + '%nice': '0.03'}}} + + self.assertDictEqual(result, expected_result) + + def test_run_mpstat(self, mock_ssh): + l = cpuload.CPULoad({'options': {'interval': 1}}, self.ctx) + mock_ssh.SSH().execute.return_value = (0, '', '') + + mpstat_output = self._read_file("cpuload_sample_output1.txt") + mock_ssh.SSH().execute.side_effect = \ + [(0, '', ''), (0, '1.50 1.45 1.51 3/813 14322', ''), (0, mpstat_output, '')] + + l.run(self.result) + + expected_result = { + 'loadavg': ['1.50', '1.45', '1.51', '3/813', '14322'], + 'mpstat': + {'cpu': {'%gnice': '0.00', + '%guest': '5.51', + '%idle': '81.77', + '%iowait': '0.18', + '%irq': '0.00', + '%nice': '0.03', + '%soft': '0.01', + '%steal': '0.00', + '%sys': '1.19', + '%usr': '11.31'}, + 'cpu0': {'%gnice': '0.00', + '%guest': '6.62', + '%idle': '71.56', + '%iowait': '0.33', + '%irq': '0.00', + '%nice': '0.03', + '%soft': '0.06', + '%steal': '0.00', + '%sys': '1.36', + '%usr': '20.03'}}} + + self.assertDictEqual(self.result, expected_result) + + def test_run_proc_stat(self, mock_ssh): + l = cpuload.CPULoad({}, self.ctx) + mock_ssh.SSH().execute.return_value = (1, '', '') + l.setup() + + l.interval = 0 + stat_output = self._read_file("cpuload_sample_output2.txt") + mock_ssh.SSH().execute.side_effect = \ + [(0, '1.50 1.45 1.51 3/813 14322', ''), (0, stat_output, '')] + + l.run(self.result) + expected_result = { + 'loadavg': ['1.50', '1.45', '1.51', '3/813', '14322'], + 'mpstat': + {'cpu': + {'%steal': '0.00', + '%usr': '11.31', + '%gnice': '0.00', + '%idle': '81.78', + '%iowait': '0.18', + '%guest': '5.50', + '%sys': '1.19', + '%soft': '0.01', + '%irq': '0.00', + '%nice': '0.03'}, + 'cpu0': + {'%steal': '0.00', + '%usr': '20.00', + '%gnice': '0.00', + '%idle': '71.60', + '%iowait': '0.33', + '%guest': '6.61', + '%sys': '1.37', + '%soft': '0.06', + '%irq': '0.00', + '%nice': '0.03'}}} + + self.assertDictEqual(self.result, expected_result) + + def _read_file(self, filename): + curr_path = os.path.dirname(os.path.abspath(__file__)) + output = os.path.join(curr_path, filename) + with open(output) as f: + sample_output = f.read() + return sample_output -- cgit 1.2.3-korg