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 <chenjiankun1@huawei.com>

8 files changed, 87 insertions, 62 deletions

diff --git a/tests/unit/cmd/commands/__init__.py b/tests/unit/benchmark/core/__init__.py
index e69de29bb..e69de29bb 100644
--- a/tests/unit/cmd/commands/__init__.py
+++ b/tests/unit/benchmark/core/__init__.py
diff --git a/tests/unit/cmd/commands/no_constraint_no_args_scenario_sample.yaml b/tests/unit/benchmark/core/no_constraint_no_args_scenario_sample.yaml
index 4933b93ae..4933b93ae 100644
--- a/tests/unit/cmd/commands/no_constraint_no_args_scenario_sample.yaml
+++ b/tests/unit/benchmark/core/no_constraint_no_args_scenario_sample.yaml
diff --git a/tests/unit/cmd/commands/no_constraint_with_args_scenario_sample.yaml b/tests/unit/benchmark/core/no_constraint_with_args_scenario_sample.yaml
index f39df7346..f39df7346 100644
--- a/tests/unit/cmd/commands/no_constraint_with_args_scenario_sample.yaml
+++ b/tests/unit/benchmark/core/no_constraint_with_args_scenario_sample.yaml
diff --git a/tests/unit/cmd/commands/test_plugin.py b/tests/unit/benchmark/core/test_plugin.py
index 2e823fdae..441116a25 100644
--- a/tests/unit/cmd/commands/test_plugin.py
+++ b/tests/unit/benchmark/core/test_plugin.py
@@ -9,12 +9,12 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-# Unittest for yardstick.cmd.commands.plugin
+# Unittest for yardstick.benchmark.core.plugin
 
 import mock
 import unittest
 
-from yardstick.cmd.commands import plugin
+from yardstick.benchmark.core import plugin
 
 
 class Arg(object):
@@ -22,30 +22,30 @@ class Arg(object):
         self.input_file = ('plugin/sample_config.yaml',)
 
 
-@mock.patch('yardstick.cmd.commands.plugin.ssh')
-class pluginCommandsTestCase(unittest.TestCase):
+@mock.patch('yardstick.benchmark.core.plugin.ssh')
+class pluginTestCase(unittest.TestCase):
 
     def setUp(self):
         self.result = {}
 
-    def test_do_install(self, mock_ssh):
-        p = plugin.PluginCommands()
+    def test_install(self, mock_ssh):
+        p = plugin.Plugin()
         mock_ssh.SSH().execute.return_value = (0, '', '')
         input_file = Arg()
-        p.do_install(input_file)
+        p.install(input_file)
         expected_result = {}
         self.assertEqual(self.result, expected_result)
 
-    def test_do_remove(self, mock_ssh):
-        p = plugin.PluginCommands()
+    def test_remove(self, mock_ssh):
+        p = plugin.Plugin()
         mock_ssh.SSH().execute.return_value = (0, '', '')
         input_file = Arg()
-        p.do_remove(input_file)
+        p.remove(input_file)
         expected_result = {}
         self.assertEqual(self.result, expected_result)
 
     def test_install_setup_run(self, mock_ssh):
-        p = plugin.PluginCommands()
+        p = plugin.Plugin()
         mock_ssh.SSH().execute.return_value = (0, '', '')
         plugins = {
             "name": "sample"
@@ -64,7 +64,7 @@ class pluginCommandsTestCase(unittest.TestCase):
         self.assertEqual(self.result, expected_result)
 
     def test_remove_setup_run(self, mock_ssh):
-        p = plugin.PluginCommands()
+        p = plugin.Plugin()
         mock_ssh.SSH().execute.return_value = (0, '', '')
         plugins = {
             "name": "sample"
@@ -81,3 +81,11 @@ class pluginCommandsTestCase(unittest.TestCase):
         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/cmd/commands/test_task.py b/tests/unit/benchmark/core/test_task.py
index 0177fd08a..463c43e1f 100644
--- a/tests/unit/cmd/commands/test_task.py
+++ b/tests/unit/benchmark/core/test_task.py
@@ -9,18 +9,18 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-# Unittest for yardstick.cmd.commands.task
+# Unittest for yardstick.benchmark.core.task
 
 import os
 import mock
 import unittest
 
-from yardstick.cmd.commands import task
+from yardstick.benchmark.core import task
 
 
-class TaskCommandsTestCase(unittest.TestCase):
+class TaskTestCase(unittest.TestCase):
 
-    @mock.patch('yardstick.cmd.commands.task.Context')
+    @mock.patch('yardstick.benchmark.core.task.Context')
     def test_parse_nodes_host_target_same_context(self, mock_context):
         nodes = {
             "host": "node1.LF",
@@ -38,42 +38,45 @@ class TaskCommandsTestCase(unittest.TestCase):
         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')
+    @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.TaskCommands()
+        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.cmd.commands.task.os')
+    @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'
-                 }
+        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']
+        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')
+    @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))
@@ -82,15 +85,15 @@ class TaskCommandsTestCase(unittest.TestCase):
         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')
+                         'tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml')
         self.assertEqual(task_files[1],
-            'tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml')
+                         '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')
+    @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))
@@ -99,16 +102,16 @@ class TaskCommandsTestCase(unittest.TestCase):
         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')
+                         'tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml')
         self.assertEqual(task_files[1],
-            'tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml')
+                         '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"}')
+                         '{"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')
+    @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))
@@ -117,15 +120,15 @@ class TaskCommandsTestCase(unittest.TestCase):
         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')
+                         'tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml')
         self.assertEqual(task_files[1],
-            'tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml')
+                         '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')
+    @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))
@@ -134,12 +137,12 @@ class TaskCommandsTestCase(unittest.TestCase):
         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')
+                         'tests/opnfv/test_cases/opnfv_yardstick_tc037.yaml')
         self.assertEqual(task_files[1],
-            'tests/opnfv/test_cases/opnfv_yardstick_tc043.yaml')
+                         '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"}')
+                         '{"host": "node1.LF","target": "node2.LF"}')
         self.assertEqual(task_args_fnames[0], None)
         self.assertEqual(task_args_fnames[1], None)
 
@@ -148,3 +151,10 @@ class TaskCommandsTestCase(unittest.TestCase):
         file_path = os.path.join(curr_path, filename)
         return file_path
 
+
+def main():
+    unittest.main()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/tests/unit/cmd/commands/test_testcase.py b/tests/unit/benchmark/core/test_testcase.py
index c55c367d0..6e0473cc1 100644
--- a/tests/unit/cmd/commands/test_testcase.py
+++ b/tests/unit/benchmark/core/test_testcase.py
@@ -11,26 +11,33 @@
 
 # Unittest for yardstick.cmd.commands.testcase
 
-import mock
 import unittest
 
-from yardstick.cmd.commands import testcase
-from yardstick.cmd.commands.testcase import TestcaseCommands
+from yardstick.benchmark.core import testcase
+
 
 class Arg(object):
     def __init__(self):
-        self.casename=('opnfv_yardstick_tc001',)
+        self.casename = ('opnfv_yardstick_tc001',)
+
 
-class TestcaseCommandsUT(unittest.TestCase):
+class TestcaseUT(unittest.TestCase):
 
-    def test_do_list(self):
-        t = testcase.TestcaseCommands()
-        result = t.do_list("")
+    def test_list_all(self):
+        t = testcase.Testcase()
+        result = t.list_all("")
         self.assertEqual(result, True)
 
-    def test_do_show(self):
-        t = testcase.TestcaseCommands()
+    def test_show(self):
+        t = testcase.Testcase()
         casename = Arg()
-        result = t.do_show(casename)
+        result = t.show(casename)
         self.assertEqual(result, True)
 
+
+def main():
+    unittest.main()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/tests/unit/cmd/commands/with_constraint_no_args_scenario_sample.yaml b/tests/unit/benchmark/core/with_constraint_no_args_scenario_sample.yaml
index 8194a2361..8194a2361 100644
--- a/tests/unit/cmd/commands/with_constraint_no_args_scenario_sample.yaml
+++ b/tests/unit/benchmark/core/with_constraint_no_args_scenario_sample.yaml
diff --git a/tests/unit/cmd/commands/with_constraint_with_args_scenario_sample.yaml b/tests/unit/benchmark/core/with_constraint_with_args_scenario_sample.yaml
index 86c9b2800..86c9b2800 100644
--- a/tests/unit/cmd/commands/with_constraint_with_args_scenario_sample.yaml
+++ b/tests/unit/benchmark/core/with_constraint_with_args_scenario_sample.yaml