openstack/watcher
Code Issues Proposed changes

Merge "Remove shadow BaseException class"

Browse Source
This commit is contained in:
Jenkins 2016-01-21 08:10:55 +00:00 committed by Gerrit Code Review
commit f675003076
3 changed files with 9 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
watcher/applier/primitives/change_nova_service_state.py
View File

@ -63,7 +63,7 @@ class ChangeNovaServiceState(base.BasePrimitive):
def nova_manage_service(self, state):
if state is None:
raise exception.IllegalArgumentException(
_("The target state is not defined"))
message=_("The target state is not defined"))
keystone = kclient.KeystoneClient()
wrapper = nclient.NovaClient(keystone.get_credentials(),

47
watcher/common/exception.py
View File

@ -220,51 +220,16 @@ class PatchError(Invalid):
# decision engine
class BaseException(Exception):
def __init__(self, desc=""):
if (not isinstance(desc, six.string_types)):
raise ValueError(_("Description must be an instance of str"))
desc = desc.strip()
self._desc = desc
def get_description(self):
return self._desc
def get_message(self):
return _("An exception occurred without a description")
def __str__(self):
return self.get_message()
class IllegalArgumentException(WatcherException):
msg_fmt = _('Illegal argument')
class IllegalArgumentException(BaseException):
def __init__(self, desc):
desc = desc or _("Description cannot be empty")
super(IllegalArgumentException, self).__init__(desc)
def get_message(self):
return self._desc
class NoSuchMetric(WatcherException):
msg_fmt = _('No such metric')
class NoSuchMetric(BaseException):
def __init__(self, desc):
desc = desc or _("No such metric")
super(NoSuchMetric, self).__init__(desc)
def get_message(self):
return self._desc
class NoDataFound(BaseException):
def __init__(self, desc):
desc = desc or _("No rows were returned")
super(NoDataFound, self).__init__(desc)
def get_message(self):
return self._desc
class NoDataFound(WatcherException):
msg_fmt = _('No rows were returned')
class KeystoneFailure(WatcherException):

4
watcher/decision_engine/model/model_root.py
View File

@ -34,12 +34,12 @@ class ModelRoot(object):
def assert_hypervisor(self, obj):
if not isinstance(obj, hypervisor.Hypervisor):
raise exception.IllegalArgumentException(
_("'obj' argument type is not valid"))
message=_("'obj' argument type is not valid"))
def assert_vm(self, obj):
if not isinstance(obj, vm.VM):
raise exception.IllegalArgumentException(
_("'obj' argument type is not valid"))
message=_("'obj' argument type is not valid"))
def add_hypervisor(self, hypervisor):
self.assert_hypervisor(hypervisor)