84cb589aa9
Changes to the baseclass for datasources so strategies can be made compatible with every datasource. Baseclass methods clearly describe expected values and types for both parameters and for method returns. query_retry has been added as base method since every current datasource implements it. Ceilometer is updated to work with the new baseclass. Several methods which are not part of the baseclass and are not used by any strategies are removed. The signature of these methods would have to be changed to fit with the new base class while it would limit strategies to only work with Ceilometer. Gnocchi is updated to work with the new baseclass. Gnocchi and Ceilometer will perform a transformation for the host_airflow metric as it retrieves 1/10 th of the actual CFM Monasca is updated to work with the new baseclass. FakeMetrics for Gnocchi, Monasca and Ceilometer are updated to work with the new method signatures of the baseclass. FakeClusterAndMetrics for Ceilometer and Gnocchi are updated to work with the new method signatures of the baseclass. The strategies workload_balance, vm_workload_consolidation, workload_stabilization, basic_consolidation, noisy_neighbour, outlet_temp_control and uniform_airflow are updated to work with the new datasource baseclass. This patch will break compatibility with plugin strategies and datasources due to the changes in signatures. Depends-on: I7aa52a9b82f4aa849f2378d4d1c03453e45c0c78 Change-Id: Ie30ca3dbf01062cbb20d3be5d514ec6b5155cd7c Implements: blueprint formal-datasource-interface
94 lines
3.4 KiB
Python
94 lines
3.4 KiB
Python
# -*- encoding: utf-8 -*-
|
|
# Copyright (c) 2015 b<>com
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
# implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import mock
|
|
from oslo_config import cfg
|
|
|
|
from watcher.common import clients
|
|
from watcher.datasources import monasca as monasca_helper
|
|
from watcher.tests import base
|
|
|
|
CONF = cfg.CONF
|
|
|
|
|
|
@mock.patch.object(clients.OpenStackClients, 'monasca')
|
|
class TestMonascaHelper(base.BaseTestCase):
|
|
|
|
def setUp(self):
|
|
super(TestMonascaHelper, self).setUp()
|
|
self.osc_mock = mock.Mock()
|
|
self.helper = monasca_helper.MonascaHelper(osc=self.osc_mock)
|
|
stat_agg_patcher = mock.patch.object(
|
|
self.helper, 'statistic_aggregation',
|
|
spec=monasca_helper.MonascaHelper.statistic_aggregation)
|
|
self.mock_aggregation = stat_agg_patcher.start()
|
|
self.addCleanup(stat_agg_patcher.stop)
|
|
|
|
def test_monasca_statistic_aggregation(self, mock_monasca):
|
|
monasca = mock.MagicMock()
|
|
expected_stat = [{
|
|
'columns': ['timestamp', 'avg'],
|
|
'dimensions': {
|
|
'hostname': 'rdev-indeedsrv001',
|
|
'service': 'monasca'},
|
|
'id': '0',
|
|
'name': 'cpu.percent',
|
|
'statistics': [
|
|
['2016-07-29T12:45:00Z', 0.0],
|
|
['2016-07-29T12:50:00Z', 0.9],
|
|
['2016-07-29T12:55:00Z', 0.9]]}]
|
|
|
|
monasca.metrics.list_statistics.return_value = expected_stat
|
|
mock_monasca.return_value = monasca
|
|
|
|
helper = monasca_helper.MonascaHelper()
|
|
result = helper.statistic_aggregation(
|
|
resource=mock.Mock(id='NODE_UUID'),
|
|
resource_type='compute_node',
|
|
meter_name='host_cpu_usage',
|
|
period=7200,
|
|
granularity=300,
|
|
aggregate='mean',
|
|
)
|
|
self.assertEqual(0.6, result)
|
|
|
|
def test_check_availability(self, mock_monasca):
|
|
monasca = mock.MagicMock()
|
|
monasca.metrics.list.return_value = True
|
|
mock_monasca.return_value = monasca
|
|
helper = monasca_helper.MonascaHelper()
|
|
result = helper.check_availability()
|
|
self.assertEqual('available', result)
|
|
|
|
def test_check_availability_with_failure(self, mock_monasca):
|
|
monasca = mock.MagicMock()
|
|
monasca.metrics.list.side_effect = Exception()
|
|
mock_monasca.return_value = monasca
|
|
helper = monasca_helper.MonascaHelper()
|
|
self.assertEqual('not available', helper.check_availability())
|
|
|
|
def test_get_host_cpu_usage(self, mock_monasca):
|
|
self.mock_aggregation.return_value = 0.6
|
|
node = mock.Mock(id='compute1')
|
|
cpu_usage = self.helper.get_host_cpu_usage(node, 600, 'mean')
|
|
self.assertEqual(0.6, cpu_usage)
|
|
|
|
def test_get_instance_cpu_usage(self, mock_monasca):
|
|
self.mock_aggregation.return_value = 0.6
|
|
node = mock.Mock(id='vm1')
|
|
cpu_usage = self.helper.get_instance_cpu_usage(node, 600, 'mean')
|
|
self.assertEqual(0.6, cpu_usage)
|