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

Merge "Typo in ClusteStateNotDefined"

Browse Source
This commit is contained in:
Jenkins
2015-12-14 10:56:51 +00:00
committed by Gerrit Code Review
parent 7c8ce453ed 33ea5f96f8
commit 92940ba9e2
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
watcher/common/exception.py
View File

@@ -294,7 +294,7 @@ class MetricCollectorNotDefined(WatcherException):
message = _("The metrics resource collector is not defined.'") message = _("The metrics resource collector is not defined.'")
class ClusteStateNotDefined(WatcherException): class ClusterStateNotDefined(WatcherException):
message = _("the cluster state is not defined") message = _("the cluster state is not defined")

8
watcher/decision_engine/strategy/basic_consolidation.py
View File

@@ -18,7 +18,7 @@
# #
from oslo_log import log from oslo_log import log
from watcher.common.exception import ClusterEmpty from watcher.common.exception import ClusterEmpty
from watcher.common.exception import ClusteStateNotDefined from watcher.common.exception import ClusterStateNotDefined
from watcher.decision_engine.actions.hypervisor_state import \ from watcher.decision_engine.actions.hypervisor_state import \
ChangeHypervisorState ChangeHypervisorState
from watcher.decision_engine.actions.migration import Migrate from watcher.decision_engine.actions.migration import Migrate
@@ -297,7 +297,7 @@ class BasicConsolidation(BaseStrategy):
:return: score :return: score
""" """
if model is None: if model is None:
raise ClusteStateNotDefined() raise ClusterStateNotDefined()
vm_cpu_utilization = self.ceilometer. \ vm_cpu_utilization = self.ceilometer. \
statistic_aggregation(resource_id=vm.uuid, statistic_aggregation(resource_id=vm.uuid,
@@ -321,7 +321,7 @@ class BasicConsolidation(BaseStrategy):
def print_utilization(self, model): def print_utilization(self, model):
if model is None: if model is None:
raise ClusteStateNotDefined() raise ClusterStateNotDefined()
for node_id in model.get_all_hypervisors(): for node_id in model.get_all_hypervisors():
LOG.debug("{0} utilization {1} % ". LOG.debug("{0} utilization {1} % ".
format(node_id, format(node_id,
@@ -334,7 +334,7 @@ class BasicConsolidation(BaseStrategy):
LOG.debug("initialize Sercon Consolidation") LOG.debug("initialize Sercon Consolidation")
if orign_model is None: if orign_model is None:
raise ClusteStateNotDefined() raise ClusterStateNotDefined()
# todo(jed) clone model # todo(jed) clone model
current_model = orign_model current_model = orign_model

6
watcher/tests/decision_engine/test_basic_consolidation.py
View File

@@ -127,7 +127,7 @@ class TestBasicConsolidation(base.BaseTestCase):
def test_exception_model(self): def test_exception_model(self):
sercon = BasicConsolidation() sercon = BasicConsolidation()
self.assertRaises(exception.ClusteStateNotDefined, sercon.execute, self.assertRaises(exception.ClusterStateNotDefined, sercon.execute,
None) None)
def test_exception_cluster_empty(self): def test_exception_cluster_empty(self):
@@ -143,12 +143,12 @@ class TestBasicConsolidation(base.BaseTestCase):
sercon.ceilometer = MagicMock( sercon.ceilometer = MagicMock(
statistic_aggregation=self.fake_metrics.mock_get_statistics) statistic_aggregation=self.fake_metrics.mock_get_statistics)
self.assertRaises(exception.ClusteStateNotDefined, self.assertRaises(exception.ClusterStateNotDefined,
sercon.calculate_score_vm, "VM_1", None) sercon.calculate_score_vm, "VM_1", None)
def test_print_utilization_raise_cluster_state_not_found(self): def test_print_utilization_raise_cluster_state_not_found(self):
sercon = BasicConsolidation() sercon = BasicConsolidation()
self.assertRaises(exception.ClusteStateNotDefined, self.assertRaises(exception.ClusterStateNotDefined,
sercon.print_utilization, None) sercon.print_utilization, None)
def test_check_migration(self): def test_check_migration(self):