10 files changed, 419 insertions, 56 deletions
diff --git a/tests/unit/api/actions/test_result.py b/tests/unit/api/actions/test_result.py
new file mode 100644
index 000000000..168631905
--- /dev/null
+++ b/tests/unit/api/actions/test_result.py
@@ -0,0 +1,29 @@
+##############################################################################
+# 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
+##############################################################################
+import unittest
+import json
+
+from api.actions import result
+
+
+class GetResultTestCase(unittest.TestCase):
+
+    def test_getResult_with_no_taskid_arg(self):
+        args = {}
+        output = json.loads(result.getResult(args))
+
+        self.assertEqual('error', output['status'])
+
+
+def main():
+    unittest.main()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/tests/unit/api/actions/test_test.py b/tests/unit/api/actions/test_test.py
new file mode 100644
index 000000000..7ebe9fc24
--- /dev/null
+++ b/tests/unit/api/actions/test_test.py
@@ -0,0 +1,29 @@
+##############################################################################
+# 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
+##############################################################################
+import unittest
+import json
+
+from api.actions import test
+
+
+class RunTestCase(unittest.TestCase):
+
+    def test_runTestCase_with_no_testcase_arg(self):
+        args = {}
+        output = json.loads(test.runTestCase(args))
+
+        self.assertEqual('error', output['status'])
+
+
+def main():
+    unittest.main()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/tests/unit/api/test_views.py b/tests/unit/api/test_views.py
new file mode 100644
index 000000000..e57ec08a4
--- /dev/null
+++ b/tests/unit/api/test_views.py
@@ -0,0 +1,45 @@
+##############################################################################
+# 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
+##############################################################################
+import unittest
+import mock
+import json
+
+from api.views import Test
+from api.views import Result
+
+
+class TestTestCase(unittest.TestCase):
+
+    @mock.patch('api.views.request')
+    def test_post(self, mock_request):
+        mock_request.json.get.side_effect = ['hello', {}]
+
+        result = json.loads(Test().post())
+
+        self.assertEqual('error', result['status'])
+
+
+class ResultTestCase(unittest.TestCase):
+
+    @mock.patch('api.views.request')
+    def test_get(self, mock_request):
+        mock_request.args.get.return_value = 'hello'
+
+        print Result().get()
+        result = json.loads(Result().get())
+
+        self.assertEqual('error', result['status'])
+
+
+def main():
+    unittest.main()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/tests/unit/api/utils/test_common.py b/tests/unit/api/utils/test_common.py
new file mode 100644
index 000000000..9e050c714
--- /dev/null
+++ b/tests/unit/api/utils/test_common.py
@@ -0,0 +1,95 @@
+##############################################################################
+# 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
+##############################################################################
+import unittest
+import json
+
+from api.utils import common
+
+
+class TranslateToStrTestCase(unittest.TestCase):
+
+    def test_translate_to_str_unicode(self):
+        input_str = u'hello'
+        output_str = common.translate_to_str(input_str)
+
+        result = 'hello'
+        self.assertEqual(result, output_str)
+
+    def test_translate_to_str_dict_list_unicode(self):
+        input_str = {
+            u'hello': {u'hello': [u'world']}
+        }
+        output_str = common.translate_to_str(input_str)
+
+        result = {
+            'hello': {'hello': ['world']}
+        }
+        self.assertEqual(result, output_str)
+
+
+class GetCommandListTestCase(unittest.TestCase):
+
+    def test_get_command_list_no_opts(self):
+        command_list = ['a']
+        opts = {}
+        args = 'b'
+        output_list = common.get_command_list(command_list, opts, args)
+
+        result_list = ['a', 'b']
+        self.assertEqual(result_list, output_list)
+
+    def test_get_command_list_with_opts_args(self):
+        command_list = ['a']
+        opts = {
+            'b': 'c',
+            'task-args': 'd'
+        }
+        args = 'e'
+
+        output_list = common.get_command_list(command_list, opts, args)
+
+        result_list = ['a', 'e', '--b', '--task-args', 'd']
+        self.assertEqual(result_list, output_list)
+
+
+class ErrorHandlerTestCase(unittest.TestCase):
+
+    def test_error_handler(self):
+        message = 'hello world'
+        output_dict = json.loads(common.error_handler(message))
+
+        result = {
+            'status': 'error',
+            'message': message
+        }
+
+        self.assertEqual(result, output_dict)
+
+
+class ResultHandlerTestCase(unittest.TestCase):
+
+    def test_result_handler(self):
+        status = 1
+        data = ['hello world']
+        output_dict = json.loads(common.result_handler(status, data))
+
+        result = {
+            'status': status,
+            'result': data
+        }
+
+        self.assertEqual(result, output_dict)
+
+
+def main():
+    unittest.main()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/tests/unit/api/utils/test_daemonthread.py b/tests/unit/api/utils/test_daemonthread.py
new file mode 100644
index 000000000..f07f0fede
--- /dev/null
+++ b/tests/unit/api/utils/test_daemonthread.py
@@ -0,0 +1,37 @@
+##############################################################################
+# 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
+##############################################################################
+import unittest
+import mock
+
+from api.utils.daemonthread import DaemonThread
+
+
+class DaemonThreadTestCase(unittest.TestCase):
+
+    @mock.patch('api.utils.daemonthread.os')
+    def test_run(self, mock_os):
+        def func(common_list, task_id):
+            return task_id
+
+        common_list = []
+        task_id = '1234'
+        thread = DaemonThread(func, (common_list, task_id))
+        thread.run()
+
+        mock_os.path.exist.return_value = True
+        pre_path = '../tests/opnfv/test_suites/'
+        mock_os.remove.assert_called_with(pre_path + '1234.yaml')
+
+
+def main():
+    unittest.main()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/tests/unit/api/utils/test_influx.py b/tests/unit/api/utils/test_influx.py
new file mode 100644
index 000000000..0852da2dd
--- /dev/null
+++ b/tests/unit/api/utils/test_influx.py
@@ -0,0 +1,82 @@
+##############################################################################
+# 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
+##############################################################################
+import unittest
+import mock
+import uuid
+import datetime
+
+from api.utils import influx
+
+
+class GetDataDbClientTestCase(unittest.TestCase):
+
+    @mock.patch('api.utils.influx.ConfigParser')
+    def test_get_data_db_client_dispatcher_not_influxdb(self, mock_parser):
+        mock_parser.ConfigParser().get.return_value = 'file'
+        try:
+            influx.get_data_db_client()
+        except Exception as e:
+            self.assertIsInstance(e, RuntimeError)
+
+
+class GetIpTestCase(unittest.TestCase):
+
+    def test_get_url(self):
+        url = 'http://localhost:8086/hello'
+        output = influx._get_ip(url)
+
+        result = 'localhost'
+        self.assertEqual(result, output)
+
+
+class WriteDataTestCase(unittest.TestCase):
+
+    @mock.patch('api.utils.influx.get_data_db_client')
+    def test_write_data(self, mock_get_client):
+        measurement = 'tasklist'
+        field = {'status': 1}
+        timestamp = datetime.datetime.now()
+        tags = {'task_id': str(uuid.uuid4())}
+
+        influx._write_data(measurement, field, timestamp, tags)
+        mock_get_client.assert_called_with()
+
+
+class WriteDataTasklistTestCase(unittest.TestCase):
+
+    @mock.patch('api.utils.influx._write_data')
+    def test_write_data_tasklist(self, mock_write_data):
+        task_id = str(uuid.uuid4())
+        timestamp = datetime.datetime.now()
+        status = 1
+        influx.write_data_tasklist(task_id, timestamp, status)
+
+        field = {'status': status, 'error': ''}
+        tags = {'task_id': task_id}
+        mock_write_data.assert_called_with('tasklist', field, timestamp, tags)
+
+
+class QueryTestCase(unittest.TestCase):
+
+    @mock.patch('api.utils.influx.ConfigParser')
+    def test_query_dispatcher_not_influxdb(self, mock_parser):
+        mock_parser.ConfigParser().get.return_value = 'file'
+        try:
+            sql = 'select * form tasklist'
+            influx.query(sql)
+        except Exception as e:
+            self.assertIsInstance(e, RuntimeError)
+
+
+def main():
+    unittest.main()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/tests/unit/benchmark/scenarios/networking/test_networkcapacity.py b/tests/unit/benchmark/scenarios/networking/test_networkcapacity.py
index e3a096446..e42832f1b 100644
--- a/tests/unit/benchmark/scenarios/networking/test_networkcapacity.py
+++ b/tests/unit/benchmark/scenarios/networking/test_networkcapacity.py
@@ -1,56 +1,56 @@
-#!/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.scenarios.networking.networkcapacity.NetworkCapacity
-
-import mock
-import unittest
-import os
-import json
-
-from yardstick.benchmark.scenarios.networking import networkcapacity
-
-SAMPLE_OUTPUT = '{"Number of connections":"308","Number of frames received": "166503"}'
-
-@mock.patch('yardstick.benchmark.scenarios.networking.networkcapacity.ssh')
-class NetworkCapacityTestCase(unittest.TestCase):
-
-    def setUp(self):
-        self.ctx = {
-                'host': {
-                    'ip': '172.16.0.137',
-                    'user': 'cirros',
-                    'password': "root"
-                },
-        }
-
-        self.result = {}
-
-    def test_capacity_successful_setup(self, mock_ssh):
-        c = networkcapacity.NetworkCapacity({}, self.ctx)
-        mock_ssh.SSH().execute.return_value = (0, '', '')
-        c.setup()
-        self.assertIsNotNone(c.client)
-        self.assertTrue(c.setup_done)
-
-    def test_capacity_successful(self, mock_ssh):
-        c = networkcapacity.NetworkCapacity({}, self.ctx)
-
-        mock_ssh.SSH().execute.return_value = (0, SAMPLE_OUTPUT, '')
-        c.run(self.result)
-        expected_result = json.loads(SAMPLE_OUTPUT)
-        self.assertEqual(self.result, expected_result)
-
-    def test_capacity_unsuccessful_script_error(self, mock_ssh):
-        c = networkcapacity.NetworkCapacity({}, self.ctx)
-
-        mock_ssh.SSH().execute.return_value = (1, '', 'FOOBAR')
-        self.assertRaises(RuntimeError, c.run, self.result)
+#!/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.scenarios.networking.networkcapacity.NetworkCapacity
+
+import mock
+import unittest
+import os
+import json
+
+from yardstick.benchmark.scenarios.networking import networkcapacity
+
+SAMPLE_OUTPUT = '{"Number of connections":"308","Number of frames received": "166503"}'
+
+@mock.patch('yardstick.benchmark.scenarios.networking.networkcapacity.ssh')
+class NetworkCapacityTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.ctx = {
+                'host': {
+                    'ip': '172.16.0.137',
+                    'user': 'cirros',
+                    'password': "root"
+                },
+        }
+
+        self.result = {}
+
+    def test_capacity_successful_setup(self, mock_ssh):
+        c = networkcapacity.NetworkCapacity({}, self.ctx)
+        mock_ssh.SSH().execute.return_value = (0, '', '')
+        c.setup()
+        self.assertIsNotNone(c.client)
+        self.assertTrue(c.setup_done)
+
+    def test_capacity_successful(self, mock_ssh):
+        c = networkcapacity.NetworkCapacity({}, self.ctx)
+
+        mock_ssh.SSH().execute.return_value = (0, SAMPLE_OUTPUT, '')
+        c.run(self.result)
+        expected_result = json.loads(SAMPLE_OUTPUT)
+        self.assertEqual(self.result, expected_result)
+
+    def test_capacity_unsuccessful_script_error(self, mock_ssh):
+        c = networkcapacity.NetworkCapacity({}, self.ctx)
+
+        mock_ssh.SSH().execute.return_value = (1, '', 'FOOBAR')
+        self.assertRaises(RuntimeError, c.run, self.result)
diff --git a/tests/unit/benchmark/scenarios/networking/test_ping6.py b/tests/unit/benchmark/scenarios/networking/test_ping6.py
index 995113e28..0b8fba268 100644
--- a/tests/unit/benchmark/scenarios/networking/test_ping6.py
+++ b/tests/unit/benchmark/scenarios/networking/test_ping6.py
@@ -25,12 +25,29 @@ class PingTestCase(unittest.TestCase):
             'host1': {
                 'ip': '172.16.0.137',
                 'user': 'cirros',
+                'role': "Controller",
                 'key_filename': "mykey.key",
                 'password': "root"
                 },
+            'host2': {
+                "ip": "172.16.0.138",
+                "key_filename": "/root/.ssh/id_rsa",
+                "role": "Compute",
+                "name": "node3.IPV6",
+                "user": "root"
+                },
             }
         }
 
+    def test_get_controller_node(self):
+        args = {
+            'options': {'host': 'host1','packetsize': 200, 'ping_count': 5},
+            'sla': {'max_rtt': 50}
+        }
+        p = ping6.Ping6(args, self.ctx)
+        controller_node = p._get_controller_node(['host1','host2'])
+        self.assertEqual(controller_node, 'host1')
+
     @mock.patch('yardstick.benchmark.scenarios.networking.ping6.ssh')
     def test_ping_successful_setup(self, mock_ssh):
         args = {
diff --git a/tests/unit/common/config_sample.yaml b/tests/unit/common/config_sample.yaml
new file mode 100644
index 000000000..8caa19ec6
--- /dev/null
+++ b/tests/unit/common/config_sample.yaml
@@ -0,0 +1,2 @@
+releng:
+    dir:                                /home/opnfv/repos/releng
diff --git a/tests/unit/common/test_utils.py b/tests/unit/common/test_utils.py
index 002d0494c..a64c1f1ab 100644
--- a/tests/unit/common/test_utils.py
+++ b/tests/unit/common/test_utils.py
@@ -83,6 +83,33 @@ class ImportModulesFromPackageTestCase(unittest.TestCase):
         mock_importutils.import_module.assert_called_with('bar.baz')
 
 
+class GetParaFromYaml(unittest.TestCase):
+
+    def test_get_para_from_yaml_file_not_exist(self):
+        file_path = '/etc/yardstick/hello.yaml'
+        args = 'hello.world'
+        para = utils.get_para_from_yaml(file_path, args)
+        self.assertIsNone(para)
+
+    def test_get_para_from_yaml_para_not_found(self):
+        file_path = 'config_sample.yaml'
+        file_path = self._get_file_abspath(file_path)
+        args = 'releng.file'
+        self.assertIsNone(utils.get_para_from_yaml(file_path, args))
+
+    def test_get_para_from_yaml_para_exists(self):
+        file_path = 'config_sample.yaml'
+        file_path = self._get_file_abspath(file_path)
+        args = 'releng.dir'
+        para = '/home/opnfv/repos/releng'
+        self.assertEqual(para, utils.get_para_from_yaml(file_path, args))
+
+    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()