openstack/watcher
Code Issues Proposed changes

Merge "Fix reraising of exceptions"

Browse Source
This commit is contained in:
Zuul 2019-05-10 03:49:57 +00:00 committed by Gerrit Code Review
commit ba82e8b68e
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
watcher/applier/actions/base.py
View File

@ -131,11 +131,8 @@ class BaseAction(loadable.Loadable):
raise NotImplementedError() raise NotImplementedError()
def validate_parameters(self): def validate_parameters(self):
try: jsonschema.validate(self.input_parameters, self.schema)
jsonschema.validate(self.input_parameters, self.schema) return True
return True
except jsonschema.ValidationError as e:
raise e
@abc.abstractmethod @abc.abstractmethod
def get_description(self): def get_description(self):

7
watcher/applier/actions/volume_migration.py
View File

@ -109,11 +109,8 @@ class VolumeMigrate(base.BaseAction):
} }
def validate_parameters(self): def validate_parameters(self):
try: jsonschema.validate(self.input_parameters, self.schema)
jsonschema.validate(self.input_parameters, self.schema) return True
return True
except jsonschema.ValidationError as e:
raise e
@property @property
def volume_id(self): def volume_id(self):

2
watcher/decision_engine/goal/efficacy/indicators.py
View File

@ -59,7 +59,7 @@ class IndicatorSpecification(object):
jsonschema.validate(value, cls.schema) jsonschema.validate(value, cls.schema)
except (SchemaError, ValidationError) as exc: except (SchemaError, ValidationError) as exc:
LOG.exception(exc) LOG.exception(exc)
raise exc raise
except Exception as exc: except Exception as exc:
LOG.exception(exc) LOG.exception(exc)
raise exception.InvalidIndicatorValue( raise exception.InvalidIndicatorValue(