Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make datasource methods match names of metrics"

Browse Source
This commit is contained in:
Zuul
2019-04-11 03:13:51 +00:00
committed by Gerrit Code Review
parent 0ed016182e c8e4efcd0b
commit 721b710e2f
8 changed files with 74 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
watcher/tests/datasource/test_ceilometer_helper.py
View File

@@ -127,7 +127,7 @@ class TestCeilometerHelper(base.BaseTestCase):
def test_get_instance_memory_usage(self, mock_aggregation,
mock_ceilometer):
helper = ceilometer_helper.CeilometerHelper()
helper.get_instance_memory_usage('compute1', 600, 'mean')
helper.get_instance_ram_usage('compute1', 600, 'mean')
mock_aggregation.assert_called_once_with(
'compute1', helper.METRIC_MAP['instance_ram_usage'], 600, None,
aggregate='mean')
@@ -157,7 +157,7 @@ class TestCeilometerHelper(base.BaseTestCase):
def test_get_instance_root_disk_allocated(self, mock_aggregation,
mock_ceilometer):
helper = ceilometer_helper.CeilometerHelper()
helper.get_instance_root_disk_allocated('compute1', 600, 'mean')
helper.get_instance_root_disk_size('compute1', 600, 'mean')
mock_aggregation.assert_called_once_with(
'compute1', helper.METRIC_MAP['instance_root_disk_size'], 600,
None, aggregate='mean')
@@ -167,7 +167,7 @@ class TestCeilometerHelper(base.BaseTestCase):
def test_get_host_outlet_temperature(self, mock_aggregation,
mock_ceilometer):
helper = ceilometer_helper.CeilometerHelper()
helper.get_host_outlet_temperature('compute1', 600, 'mean')
helper.get_host_outlet_temp('compute1', 600, 'mean')
mock_aggregation.assert_called_once_with(
'compute1', helper.METRIC_MAP['host_outlet_temp'], 600, None,
aggregate='mean')
@@ -177,7 +177,7 @@ class TestCeilometerHelper(base.BaseTestCase):
def test_get_host_inlet_temperature(self, mock_aggregation,
mock_ceilometer):
helper = ceilometer_helper.CeilometerHelper()
helper.get_host_inlet_temperature('compute1', 600, 'mean')
helper.get_host_inlet_temp('compute1', 600, 'mean')
mock_aggregation.assert_called_once_with(
'compute1', helper.METRIC_MAP['host_inlet_temp'], 600, None,
aggregate='mean')

16
watcher/tests/datasource/test_gnocchi_helper.py
View File

@@ -75,8 +75,8 @@ class TestGnocchiHelper(base.BaseTestCase):
@mock.patch.object(gnocchi_helper.GnocchiHelper, 'statistic_aggregation')
def test_get_instance_memory_usage(self, mock_aggregation, mock_gnocchi):
helper = gnocchi_helper.GnocchiHelper()
helper.get_instance_memory_usage('compute1', 600, 'mean',
granularity=300)
helper.get_instance_ram_usage('compute1', 600, 'mean',
granularity=300)
mock_aggregation.assert_called_once_with(
'compute1', helper.METRIC_MAP['instance_ram_usage'], 600, 300,
aggregation='mean')
@@ -94,8 +94,8 @@ class TestGnocchiHelper(base.BaseTestCase):
def test_get_instance_root_disk_allocated(self, mock_aggregation,
mock_gnocchi):
helper = gnocchi_helper.GnocchiHelper()
helper.get_instance_root_disk_allocated('compute1', 600, 'mean',
granularity=300)
helper.get_instance_root_disk_size('compute1', 600, 'mean',
granularity=300)
mock_aggregation.assert_called_once_with(
'compute1', helper.METRIC_MAP['instance_root_disk_size'], 600,
300, aggregation='mean')
@@ -103,8 +103,8 @@ class TestGnocchiHelper(base.BaseTestCase):
@mock.patch.object(gnocchi_helper.GnocchiHelper, 'statistic_aggregation')
def test_get_host_outlet_temperature(self, mock_aggregation, mock_gnocchi):
helper = gnocchi_helper.GnocchiHelper()
helper.get_host_outlet_temperature('compute1', 600, 'mean',
granularity=300)
helper.get_host_outlet_temp('compute1', 600, 'mean',
granularity=300)
mock_aggregation.assert_called_once_with(
'compute1', helper.METRIC_MAP['host_outlet_temp'], 600, 300,
aggregation='mean')
@@ -112,8 +112,8 @@ class TestGnocchiHelper(base.BaseTestCase):
@mock.patch.object(gnocchi_helper.GnocchiHelper, 'statistic_aggregation')
def test_get_host_inlet_temperature(self, mock_aggregation, mock_gnocchi):
helper = gnocchi_helper.GnocchiHelper()
helper.get_host_inlet_temperature('compute1', 600, 'mean',
granularity=300)
helper.get_host_inlet_temp('compute1', 600, 'mean',
granularity=300)
mock_aggregation.assert_called_once_with(
'compute1', helper.METRIC_MAP['host_inlet_temp'], 600, 300,
aggregation='mean')

4
watcher/tests/decision_engine/strategy/strategies/test_vm_workload_consolidation.py
View File

@@ -60,9 +60,9 @@ class TestVMWorkloadConsolidation(TestBaseStrategy):
self.m_datasource.return_value = mock.Mock(
get_instance_cpu_usage=(
self.fake_metrics.get_instance_cpu_util),
get_instance_memory_usage=(
get_instance_ram_usage=(
self.fake_metrics.get_instance_ram_util),
get_instance_root_disk_allocated=(
get_instance_root_disk_size=(
self.fake_metrics.get_instance_disk_root_size),
)
self.strategy = strategies.VMWorkloadConsolidation(