From 57011bd0769f54a98b90d489df0f38751ca76c0e Mon Sep 17 00:00:00 2001 From: chenjiankun Date: Thu, 29 Dec 2016 11:45:12 +0000 Subject: Split Yardstick CLI with Yardstick core logic JIRA: YARDSTICK-511 We need to unify yardstick entry. Now the solution is using CLI call API as nova do. This is the first step: coupling the yardstick core logic from CLI. Moving the core logic to yardstick/benchmark/core and the CLI using a object to call yardstick core logic. Change-Id: I84f10d2134635880c281cc63212a8533f2dd7d4e Signed-off-by: chenjiankun --- tests/unit/benchmark/core/__init__.py | 0 .../no_constraint_no_args_scenario_sample.yaml | 13 ++ .../no_constraint_with_args_scenario_sample.yaml | 15 ++ tests/unit/benchmark/core/test_plugin.py | 91 ++++++++++++ tests/unit/benchmark/core/test_task.py | 160 +++++++++++++++++++++ tests/unit/benchmark/core/test_testcase.py | 43 ++++++ .../with_constraint_no_args_scenario_sample.yaml | 16 +++ .../with_constraint_with_args_scenario_sample.yaml | 18 +++ 8 files changed, 356 insertions(+) create mode 100644 tests/unit/benchmark/core/__init__.py create mode 100644 tests/unit/benchmark/core/no_constraint_no_args_scenario_sample.yaml create mode 100644 tests/unit/benchmark/core/no_constraint_with_args_scenario_sample.yaml create mode 100644 tests/unit/benchmark/core/test_plugin.py create mode 100644 tests/unit/benchmark/core/test_task.py create mode 100644 tests/unit/benchmark/core/test_testcase.py create mode 100644 tests/unit/benchmark/core/with_constraint_no_args_scenario_sample.yaml create mode 100644 tests/unit/benchmark/core/with_constraint_with_args_scenario_sample.yaml (limited to 'tests/unit/benchmark') diff --git a/tests/unit/benchmark/core/__init__.py b/tests/unit/benchmark/core/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/tests/unit/benchmark/core/no_constraint_no_args_scenario_sample.yaml b/tests/unit/benchmark/core/no_constraint_no_args_scenario_sample.yaml new file mode 100644 index 000000000..4933b93ae --- /dev/null +++ b/tests/unit/benchmark/core/no_constraint_no_args_scenario_sample.yaml @@ -0,0 +1,13 @@ +--- +# Huawei US bare daily task suite + +schema: "yardstick:suite:0.1" + +name: "os-nosdn-nofeature-ha" +test_cases_dir: "tests/opnfv/test_cases/" +test_cases: +- + file_name: opnfv_yardstick_tc037.yaml +- + file_name: opnfv_yardstick_tc043.yaml + diff --git a/tests/unit/benchmark/core/no_constraint_with_args_scenario_sample.yaml b/tests/unit/benchmark/core/no_constraint_with_args_scenario_sample.yaml new file mode 100644 index 000000000..f39df7346 --- /dev/null +++ b/tests/unit/benchmark/core/no_constraint_with_args_scenario_sample.yaml @@ -0,0 +1,15 @@ +--- +# Huawei US bare daily task suite + +schema: "yardstick:suite:0.1" + +name: "os-nosdn-nofeature-ha" +test_cases_dir: "tests/opnfv/test_cases/" +test_cases: +- + file_name: opnfv_yardstick_tc037.yaml +- + file_name: opnfv_yardstick_tc043.yaml + task_args: + huawei-pod1: '{"host": "node1.LF","target": "node2.LF"}' + diff --git a/tests/unit/benchmark/core/test_plugin.py b/tests/unit/benchmark/core/test_plugin.py new file mode 100644 index 000000000..441116a25 --- /dev/null +++ b/tests/unit/benchmark/core/test_plugin.py @@ -0,0 +1,91 @@ +#!/usr/bin/env python + +############################################################################## +# Copyright (c) 2016 Huawei Technologies Co.,Ltd 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.core.plugin + +import mock +import unittest + +from yardstick.benchmark.core import plugin + + +class Arg(object): + def __init__(self): + self.input_file = ('plugin/sample_config.yaml',) + + +@mock.patch('yardstick.benchmark.core.plugin.ssh') +class pluginTestCase(unittest.TestCase): + + def setUp(self): + self.result = {} + + def test_install(self, mock_ssh): + p = plugin.Plugin() + mock_ssh.SSH().execute.return_value = (0, '', '') + input_file = Arg() + p.install(input_file) + expected_result = {} + self.assertEqual(self.result, expected_result) + + def test_remove(self, mock_ssh): + p = plugin.Plugin() + mock_ssh.SSH().execute.return_value = (0, '', '') + input_file = Arg() + p.remove(input_file) + expected_result = {} + self.assertEqual(self.result, expected_result) + + def test_install_setup_run(self, mock_ssh): + p = plugin.Plugin() + mock_ssh.SSH().execute.return_value = (0, '', '') + plugins = { + "name": "sample" + } + deployment = { + "ip": "10.1.0.50", + "user": "root", + "password": "root" + } + plugin_name = plugins.get("name") + p._install_setup(plugin_name, deployment) + self.assertIsNotNone(p.client) + + p._run(plugin_name) + expected_result = {} + self.assertEqual(self.result, expected_result) + + def test_remove_setup_run(self, mock_ssh): + p = plugin.Plugin() + mock_ssh.SSH().execute.return_value = (0, '', '') + plugins = { + "name": "sample" + } + deployment = { + "ip": "10.1.0.50", + "user": "root", + "password": "root" + } + plugin_name = plugins.get("name") + p._remove_setup(plugin_name, deployment) + self.assertIsNotNone(p.client) + + p._run(plugin_name) + expected_result = {} + self.assertEqual(self.result, expected_result) + + +def main(): + unittest.main() + + +if __name__ == '__main__': + main() diff --git a/tests/unit/benchmark/core/test_task.py b/tests/unit/benchmark/core/test_task.py new file mode 100644 index 000000000..463c43e1f --- /dev/null +++ b/tests/unit/benchmark/core/test_task.py @@ -0,0 +1,160 @@ +#!/usr/bin/env python + +############################################################################## +# Copyright (c) 2015 Huawei Technologies Co.,Ltd 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.core.task + +import os +import mock +import unittest + +from yardstick.benchmark.core import task + + +class TaskTestCase(unittest.TestCase): + + @mock.patch('yardstick.benchmark.core.task.Context') + def test_parse_nodes_host_target_same_context(self, mock_context): + nodes = { + "host": "node1.LF", + "target": "node2.LF" + } + scenario_cfg = {"nodes": nodes} + server_info = { + "ip": "10.20.0.3", + "user": "root", + "key_filename": "/root/.ssh/id_rsa" + } + mock_context.get_server.return_value = server_info + context_cfg = task.parse_nodes_with_context(scenario_cfg) + + self.assertEqual(context_cfg["host"], server_info) + self.assertEqual(context_cfg["target"], server_info) + + @mock.patch('yardstick.benchmark.core.task.Context') + @mock.patch('yardstick.benchmark.core.task.base_runner') + def test_run(self, mock_base_runner, mock_ctx): + scenario = { + 'host': 'athena.demo', + 'target': 'ares.demo', + 'runner': { + 'duration': 60, + 'interval': 1, + 'type': 'Duration' + }, + 'type': 'Ping' + } + + t = task.Task() + runner = mock.Mock() + runner.join.return_value = 0 + mock_base_runner.Runner.get.return_value = runner + t._run([scenario], False, "yardstick.out") + self.assertTrue(runner.run.called) + + @mock.patch('yardstick.benchmark.core.task.os') + def test_check_precondition(self, mock_os): + cfg = { + 'precondition': { + 'installer_type': 'compass', + 'deploy_scenarios': 'os-nosdn', + 'pod_name': 'huawei-pod1' + } + } + + t = task.TaskParser('/opt') + mock_os.environ.get.side_effect = ['compass', + 'os-nosdn', + 'huawei-pod1'] + result = t._check_precondition(cfg) + self.assertTrue(result) + + @mock.patch('yardstick.benchmark.core.task.os.environ') + def test_parse_suite_no_constraint_no_args(self, mock_environ): + SAMPLE_SCENARIO_PATH = "no_constraint_no_args_scenario_sample.yaml" + t = task.TaskParser(self._get_file_abspath(SAMPLE_SCENARIO_PATH)) + mock_environ.get.side_effect = ['huawei-pod1', 'compass'] + task_files, task_args, task_args_fnames = t.parse_suite() + print ("files=%s, args=%s, fnames=%s" % (task_files, task_args, + task_args_fnames)) + self.assertEqual(task_files[0], + 'tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml') + self.assertEqual(task_files[1], + 'tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml') + self.assertEqual(task_args[0], None) + self.assertEqual(task_args[1], None) + self.assertEqual(task_args_fnames[0], None) + self.assertEqual(task_args_fnames[1], None) + + @mock.patch('yardstick.benchmark.core.task.os.environ') + def test_parse_suite_no_constraint_with_args(self, mock_environ): + SAMPLE_SCENARIO_PATH = "no_constraint_with_args_scenario_sample.yaml" + t = task.TaskParser(self._get_file_abspath(SAMPLE_SCENARIO_PATH)) + mock_environ.get.side_effect = ['huawei-pod1', 'compass'] + task_files, task_args, task_args_fnames = t.parse_suite() + print ("files=%s, args=%s, fnames=%s" % (task_files, task_args, + task_args_fnames)) + self.assertEqual(task_files[0], + 'tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml') + self.assertEqual(task_files[1], + 'tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml') + self.assertEqual(task_args[0], None) + self.assertEqual(task_args[1], + '{"host": "node1.LF","target": "node2.LF"}') + self.assertEqual(task_args_fnames[0], None) + self.assertEqual(task_args_fnames[1], None) + + @mock.patch('yardstick.benchmark.core.task.os.environ') + def test_parse_suite_with_constraint_no_args(self, mock_environ): + SAMPLE_SCENARIO_PATH = "with_constraint_no_args_scenario_sample.yaml" + t = task.TaskParser(self._get_file_abspath(SAMPLE_SCENARIO_PATH)) + mock_environ.get.side_effect = ['huawei-pod1', 'compass'] + task_files, task_args, task_args_fnames = t.parse_suite() + print ("files=%s, args=%s, fnames=%s" % (task_files, task_args, + task_args_fnames)) + self.assertEqual(task_files[0], + 'tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml') + self.assertEqual(task_files[1], + 'tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml') + self.assertEqual(task_args[0], None) + self.assertEqual(task_args[1], None) + self.assertEqual(task_args_fnames[0], None) + self.assertEqual(task_args_fnames[1], None) + + @mock.patch('yardstick.benchmark.core.task.os.environ') + def test_parse_suite_with_constraint_with_args(self, mock_environ): + SAMPLE_SCENARIO_PATH = "with_constraint_with_args_scenario_sample.yaml" + t = task.TaskParser(self._get_file_abspath(SAMPLE_SCENARIO_PATH)) + mock_environ.get.side_effect = ['huawei-pod1', 'compass'] + task_files, task_args, task_args_fnames = t.parse_suite() + print ("files=%s, args=%s, fnames=%s" % (task_files, task_args, + task_args_fnames)) + self.assertEqual(task_files[0], + 'tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml') + self.assertEqual(task_files[1], + 'tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml') + self.assertEqual(task_args[0], None) + self.assertEqual(task_args[1], + '{"host": "node1.LF","target": "node2.LF"}') + self.assertEqual(task_args_fnames[0], None) + self.assertEqual(task_args_fnames[1], None) + + def _get_file_abspath(self, filename): + curr_path = os.path.dirname(os.path.abspath(__file__)) + file_path = os.path.join(curr_path, filename) + return file_path + + +def main(): + unittest.main() + + +if __name__ == '__main__': + main() diff --git a/tests/unit/benchmark/core/test_testcase.py b/tests/unit/benchmark/core/test_testcase.py new file mode 100644 index 000000000..6e0473cc1 --- /dev/null +++ b/tests/unit/benchmark/core/test_testcase.py @@ -0,0 +1,43 @@ +#!/usr/bin/env python + +############################################################################## +# Copyright (c) 2015 Huawei Technologies Co.,Ltd 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.cmd.commands.testcase + +import unittest + +from yardstick.benchmark.core import testcase + + +class Arg(object): + def __init__(self): + self.casename = ('opnfv_yardstick_tc001',) + + +class TestcaseUT(unittest.TestCase): + + def test_list_all(self): + t = testcase.Testcase() + result = t.list_all("") + self.assertEqual(result, True) + + def test_show(self): + t = testcase.Testcase() + casename = Arg() + result = t.show(casename) + self.assertEqual(result, True) + + +def main(): + unittest.main() + + +if __name__ == '__main__': + main() diff --git a/tests/unit/benchmark/core/with_constraint_no_args_scenario_sample.yaml b/tests/unit/benchmark/core/with_constraint_no_args_scenario_sample.yaml new file mode 100644 index 000000000..8194a2361 --- /dev/null +++ b/tests/unit/benchmark/core/with_constraint_no_args_scenario_sample.yaml @@ -0,0 +1,16 @@ +--- +# Huawei US bare daily task suite + +schema: "yardstick:suite:0.1" + +name: "os-nosdn-nofeature-ha" +test_cases_dir: "tests/opnfv/test_cases/" +test_cases: +- + file_name: opnfv_yardstick_tc037.yaml +- + file_name: opnfv_yardstick_tc043.yaml + constraint: + installer: compass + pod: huawei-pod1 + diff --git a/tests/unit/benchmark/core/with_constraint_with_args_scenario_sample.yaml b/tests/unit/benchmark/core/with_constraint_with_args_scenario_sample.yaml new file mode 100644 index 000000000..86c9b2800 --- /dev/null +++ b/tests/unit/benchmark/core/with_constraint_with_args_scenario_sample.yaml @@ -0,0 +1,18 @@ +--- +# Huawei US bare daily task suite + +schema: "yardstick:suite:0.1" + +name: "os-nosdn-nofeature-ha" +test_cases_dir: "tests/opnfv/test_cases/" +test_cases: +- + file_name: opnfv_yardstick_tc037.yaml +- + file_name: opnfv_yardstick_tc043.yaml + constraint: + installer: compass + pod: huawei-pod1 + task_args: + huawei-pod1: '{"host": "node1.LF","target": "node2.LF"}' + -- cgit 1.2.3-korg