From 0c3748240cfb2bce7d8727dd0283468e44d57ae9 Mon Sep 17 00:00:00 2001 From: lihuan Date: Sat, 25 Jun 2016 11:22:57 +0800 Subject: Creating a generic monitor JIRA: YARDSTICK-274 Change-Id: Iac8c525b36b2778767177b17e6107866cc514e40 Signed-off-by: lihuan --- .../scenarios/availability/test_basemonitor.py | 6 ++ .../scenarios/availability/test_monitor_general.py | 73 ++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 tests/unit/benchmark/scenarios/availability/test_monitor_general.py (limited to 'tests/unit/benchmark/scenarios') diff --git a/tests/unit/benchmark/scenarios/availability/test_basemonitor.py b/tests/unit/benchmark/scenarios/availability/test_basemonitor.py index 13295273b..140841075 100644 --- a/tests/unit/benchmark/scenarios/availability/test_basemonitor.py +++ b/tests/unit/benchmark/scenarios/availability/test_basemonitor.py @@ -23,6 +23,7 @@ class MonitorMgrTestCase(unittest.TestCase): def setUp(self): config = { 'monitor_type': 'openstack-api', + 'key' : 'service_status' } self.monitor_configs = [] @@ -36,6 +37,11 @@ class MonitorMgrTestCase(unittest.TestCase): ret = instance.verify_SLA() + def test_MonitorMgr_getitem(self, mock_monitor): + monitorMgr = basemonitor.MonitorMgr() + monitorMgr.init_monitors(self.monitor_configs, None) + monitorIns = monitorMgr['service_status'] + class BaseMonitorTestCase(unittest.TestCase): class MonitorSimple(basemonitor.BaseMonitor): diff --git a/tests/unit/benchmark/scenarios/availability/test_monitor_general.py b/tests/unit/benchmark/scenarios/availability/test_monitor_general.py new file mode 100644 index 000000000..85487a574 --- /dev/null +++ b/tests/unit/benchmark/scenarios/availability/test_monitor_general.py @@ -0,0 +1,73 @@ +#!/usr/bin/env python + +############################################################################## +# Copyright (c) 2016 Huan Li and others +# lihuansse@tongji.edu.cn +# 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.availability.monitor +# .monitor_general + +import mock +import unittest +from yardstick.benchmark.scenarios.availability.monitor import monitor_general + + +@mock.patch('yardstick.benchmark.scenarios.availability.monitor.' + 'monitor_general.ssh') +@mock.patch('yardstick.benchmark.scenarios.availability.monitor.' + 'monitor_general.open') +class GeneralMonitorServiceTestCase(unittest.TestCase): + def setUp(self): + host = { + "ip": "10.20.0.5", + "user": "root", + "key_filename": "/root/.ssh/id_rsa" + } + self.context = {"node1": host} + self.monitor_cfg = { + 'monitor_type': 'general-monitor', + 'key': 'service_status', + 'host': 'node1', + 'monitor_time': 3, + 'parameter': {'serviceName': 'haproxy'}, + 'sla': {'max_recover_time': 1} + } + self.monitor_cfg_noparam = { + 'monitor_type': 'general-monitor', + 'key': 'service_status', + 'host': 'node1', + 'monitor_time': 3, + 'sla': {'max_recover_time': 1} + } + + def test__monitor_general_all_successful(self, mock_open, mock_ssh): + ins = monitor_general.GeneralMonitor(self.monitor_cfg, self.context) + + ins.setup() + mock_ssh.SSH().execute.return_value = (0, "running", '') + ins.monitor_func() + ins._result = {'outage_time' : 0} + ins.verify_SLA() + + def test__monitor_general_all_successful_noparam(self, mock_open, mock_ssh): + ins = monitor_general.GeneralMonitor(self.monitor_cfg_noparam, self.context) + + ins.setup() + mock_ssh.SSH().execute.return_value = (0, "running", '') + ins.monitor_func() + ins._result = {'outage_time' : 0} + ins.verify_SLA() + + def test__monitor_general_failure(self, mock_open, mock_ssh): + ins = monitor_general.GeneralMonitor(self.monitor_cfg_noparam, self.context) + + ins.setup() + mock_ssh.SSH().execute.return_value = (1, "error", 'error') + ins.monitor_func() + ins._result = {'outage_time' : 2} + ins.verify_SLA() -- cgit 1.2.3-korg