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

Merge "Transform KB into MB and normalize CPU"

Browse Source
This commit is contained in:
Jenkins
2016-11-07 14:24:44 +00:00
committed by Gerrit Code Review
parent aae3f79fef ef0d133ba8
commit 1fbc8b57bf
3 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
watcher/tests/decision_engine/model/faker_metrics_collector.py
View File

@@ -18,6 +18,8 @@
import random
import oslo_utils
class FakerMetricsCollector(object):
def __init__(self):
@@ -68,11 +70,12 @@ class FakerMetricsCollector(object):
def get_usage_node_ram(self, uuid):
mock = {}
mock['Node_0'] = 7
mock['Node_1'] = 5
mock['Node_2'] = 29
mock['Node_3'] = 8
mock['Node_4'] = 4
# Ceilometer returns hardware.memory.used samples in KB.
mock['Node_0'] = 7*oslo_utils.units.Ki
mock['Node_1'] = 5*oslo_utils.units.Ki
mock['Node_2'] = 29*oslo_utils.units.Ki
mock['Node_3'] = 8*oslo_utils.units.Ki
mock['Node_4'] = 4*oslo_utils.units.Ki
if uuid not in mock.keys():
# mock[uuid] = random.randint(1, 4)
@@ -136,11 +139,11 @@ class FakerMetricsCollector(object):
# node 4
mock['INSTANCE_7_hostname_7'] = 4
mock['Node_0'] = 0.07
mock['Node_1'] = 0.05
mock['Node_2'] = 0.1
mock['Node_3'] = 0.04
mock['Node_4'] = 0.02
mock['Node_0'] = 7
mock['Node_1'] = 5
mock['Node_2'] = 10
mock['Node_3'] = 4
mock['Node_4'] = 2
if uuid not in mock.keys():
# mock[uuid] = random.randint(1, 4)

20
watcher/tests/decision_engine/strategy/strategies/test_workload_stabilization.py
View File

@@ -94,7 +94,7 @@ class TestWorkloadStabilization(base.TestCase):
self.m_model.return_value = self.fake_cluster.generate_scenario_1()
instance_0_dict = {
'uuid': 'INSTANCE_0', 'vcpus': 10,
'cpu_util': 7, 'memory.resident': 2}
'cpu_util': 0.07, 'memory.resident': 2}
self.assertEqual(
instance_0_dict, self.strategy.get_instance_load("INSTANCE_0"))
@@ -114,9 +114,8 @@ class TestWorkloadStabilization(base.TestCase):
def test_get_hosts_load(self):
self.m_model.return_value = self.fake_cluster.generate_scenario_1()
self.assertEqual(
self.strategy.get_hosts_load(),
self.hosts_load_assert)
self.assertEqual(self.strategy.get_hosts_load(),
self.hosts_load_assert)
def test_get_sd(self):
test_cpu_sd = 0.027
@@ -136,11 +135,12 @@ class TestWorkloadStabilization(base.TestCase):
def test_calculate_migration_case(self):
self.m_model.return_value = self.fake_cluster.generate_scenario_1()
self.assertEqual(
self.strategy.calculate_migration_case(
self.hosts_load_assert, "INSTANCE_5",
"Node_2", "Node_1")[-1]["Node_1"],
{'cpu_util': 2.55, 'memory.resident': 21, 'vcpus': 40})
result = self.strategy.calculate_migration_case(
self.hosts_load_assert, "INSTANCE_5", "Node_2", "Node_1")[-1][
"Node_1"]
result['cpu_util'] = round(result['cpu_util'], 3)
self.assertEqual(result, {'cpu_util': 0.075, 'memory.resident': 21,
'vcpus': 40})
def test_simulate_migrations(self):
model = self.fake_cluster.generate_scenario_1()
@@ -182,7 +182,7 @@ class TestWorkloadStabilization(base.TestCase):
)
with mock.patch.object(self.strategy, 'migrate') as mock_migrate:
self.strategy.do_execute()
self.assertEqual(mock_migrate.call_count, 1)
self.assertEqual(mock_migrate.call_count, 2)
def test_execute_nothing_to_migrate(self):
self.m_model.return_value = self.fake_cluster.generate_scenario_1()