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/cmd/commands/__init__.py | 0 .../no_constraint_no_args_scenario_sample.yaml | 13 -- .../no_constraint_with_args_scenario_sample.yaml | 15 --- tests/unit/cmd/commands/test_plugin.py | 83 ------------ tests/unit/cmd/commands/test_task.py | 150 --------------------- tests/unit/cmd/commands/test_testcase.py | 36 ----- .../with_constraint_no_args_scenario_sample.yaml | 16 --- .../with_constraint_with_args_scenario_sample.yaml | 18 --- 8 files changed, 331 deletions(-) delete mode 100644 tests/unit/cmd/commands/__init__.py delete mode 100644 tests/unit/cmd/commands/no_constraint_no_args_scenario_sample.yaml delete mode 100644 tests/unit/cmd/commands/no_constraint_with_args_scenario_sample.yaml delete mode 100644 tests/unit/cmd/commands/test_plugin.py delete mode 100644 tests/unit/cmd/commands/test_task.py delete mode 100644 tests/unit/cmd/commands/test_testcase.py delete mode 100644 tests/unit/cmd/commands/with_constraint_no_args_scenario_sample.yaml delete mode 100644 tests/unit/cmd/commands/with_constraint_with_args_scenario_sample.yaml (limited to 'tests/unit/cmd/commands') diff --git a/tests/unit/cmd/commands/__init__.py b/tests/unit/cmd/commands/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/unit/cmd/commands/no_constraint_no_args_scenario_sample.yaml b/tests/unit/cmd/commands/no_constraint_no_args_scenario_sample.yaml deleted file mode 100644 index 4933b93ae..000000000 --- a/tests/unit/cmd/commands/no_constraint_no_args_scenario_sample.yaml +++ /dev/null @@ -1,13 +0,0 @@ ---- -# 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/cmd/commands/no_constraint_with_args_scenario_sample.yaml b/tests/unit/cmd/commands/no_constraint_with_args_scenario_sample.yaml deleted file mode 100644 index f39df7346..000000000 --- a/tests/unit/cmd/commands/no_constraint_with_args_scenario_sample.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -# 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/cmd/commands/test_plugin.py b/tests/unit/cmd/commands/test_plugin.py deleted file mode 100644 index 2e823fdae..000000000 --- a/tests/unit/cmd/commands/test_plugin.py +++ /dev/null @@ -1,83 +0,0 @@ -#!/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.cmd.commands.plugin - -import mock -import unittest - -from yardstick.cmd.commands import plugin - - -class Arg(object): - def __init__(self): - self.input_file = ('plugin/sample_config.yaml',) - - -@mock.patch('yardstick.cmd.commands.plugin.ssh') -class pluginCommandsTestCase(unittest.TestCase): - - def setUp(self): - self.result = {} - - def test_do_install(self, mock_ssh): - p = plugin.PluginCommands() - mock_ssh.SSH().execute.return_value = (0, '', '') - input_file = Arg() - p.do_install(input_file) - expected_result = {} - self.assertEqual(self.result, expected_result) - - def test_do_remove(self, mock_ssh): - p = plugin.PluginCommands() - mock_ssh.SSH().execute.return_value = (0, '', '') - input_file = Arg() - p.do_remove(input_file) - expected_result = {} - self.assertEqual(self.result, expected_result) - - def test_install_setup_run(self, mock_ssh): - p = plugin.PluginCommands() - 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.PluginCommands() - 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) diff --git a/tests/unit/cmd/commands/test_task.py b/tests/unit/cmd/commands/test_task.py deleted file mode 100644 index 0177fd08a..000000000 --- a/tests/unit/cmd/commands/test_task.py +++ /dev/null @@ -1,150 +0,0 @@ -#!/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.task - -import os -import mock -import unittest - -from yardstick.cmd.commands import task - - -class TaskCommandsTestCase(unittest.TestCase): - - @mock.patch('yardstick.cmd.commands.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.cmd.commands.task.Context') - @mock.patch('yardstick.cmd.commands.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.TaskCommands() - 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.cmd.commands.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.cmd.commands.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.cmd.commands.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.cmd.commands.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.cmd.commands.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 - diff --git a/tests/unit/cmd/commands/test_testcase.py b/tests/unit/cmd/commands/test_testcase.py deleted file mode 100644 index c55c367d0..000000000 --- a/tests/unit/cmd/commands/test_testcase.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/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 mock -import unittest - -from yardstick.cmd.commands import testcase -from yardstick.cmd.commands.testcase import TestcaseCommands - -class Arg(object): - def __init__(self): - self.casename=('opnfv_yardstick_tc001',) - -class TestcaseCommandsUT(unittest.TestCase): - - def test_do_list(self): - t = testcase.TestcaseCommands() - result = t.do_list("") - self.assertEqual(result, True) - - def test_do_show(self): - t = testcase.TestcaseCommands() - casename = Arg() - result = t.do_show(casename) - self.assertEqual(result, True) - diff --git a/tests/unit/cmd/commands/with_constraint_no_args_scenario_sample.yaml b/tests/unit/cmd/commands/with_constraint_no_args_scenario_sample.yaml deleted file mode 100644 index 8194a2361..000000000 --- a/tests/unit/cmd/commands/with_constraint_no_args_scenario_sample.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -# 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/cmd/commands/with_constraint_with_args_scenario_sample.yaml b/tests/unit/cmd/commands/with_constraint_with_args_scenario_sample.yaml deleted file mode 100644 index 86c9b2800..000000000 --- a/tests/unit/cmd/commands/with_constraint_with_args_scenario_sample.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -# 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