diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-05-26 16:04:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-05-26 16:04:51 +0000 |
| commit | c4286d672f2c51ac2257e981487db6e62a889d8f (patch) | |
| tree | 17fbe15e817948ecf23ae97e5ecccbbabcf24c15 /ceilometer/event | |
| parent | f6b2406fffdd4deae508b9f251691fe9b70cb1ee (diff) | |
| parent | d59f099372b89e8d0552266db0b5b0bca4b17b87 (diff) | |
| download | ceilometer-c4286d672f2c51ac2257e981487db6e62a889d8f.tar.gz | |
Merge "refactor DefinitionException classes"
Diffstat (limited to 'ceilometer/event')
| -rw-r--r-- | ceilometer/event/converter.py | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/ceilometer/event/converter.py b/ceilometer/event/converter.py index 62b3fa4b..6806909c 100644 --- a/ceilometer/event/converter.py +++ b/ceilometer/event/converter.py @@ -13,7 +13,6 @@ # License for the specific language governing permissions and limitations # under the License. -from debtcollector import moves from oslo_config import cfg from oslo_log import log from oslo_utils import fnmatch @@ -44,12 +43,6 @@ cfg.CONF.register_opts(OPTS, group='event') LOG = log.getLogger(__name__) -EventDefinitionException = moves.moved_class(declarative.DefinitionException, - 'EventDefinitionException', - __name__, - version=6.0, - removal_version="?") - class TraitDefinition(declarative.Definition): def __init__(self, name, trait_cfg, plugin_manager): @@ -58,7 +51,7 @@ class TraitDefinition(declarative.Definition): if isinstance(trait_cfg, dict) else 'text') self.trait_type = models.Trait.get_type_by_name(type_name) if self.trait_type is None: - raise declarative.DefinitionException( + raise declarative.EventDefinitionException( _("Invalid trait type '%(type)s' for trait %(trait)s") % dict(type=type_name, trait=name), self.cfg) @@ -102,7 +95,7 @@ class EventDefinition(object): event_type = definition_cfg['event_type'] traits = definition_cfg['traits'] except KeyError as err: - raise declarative.DefinitionException( + raise declarative.EventDefinitionException( _("Required field %s not specified") % err.args[0], self.cfg) if isinstance(event_type, six.string_types): |