Handle more Nova and Neutron events

This introduces a simpler matching system for event types that supports
wildcard. We use this to grab all Nova instances notifications and a bit
more Neutron events.

We also change the get_event_types to a property to simplify the code a
bit.

Change-Id: Ica133ff2e9348a5d2640f068251d034bbd8a4f43

1 files changed, 6 insertions, 6 deletions

diff --git a/ceilometer/volume/notifications.py b/ceilometer/volume/notifications.py
index 6f02c350..d4beafe9 100644
--- a/ceilometer/volume/notifications.py
+++ b/ceilometer/volume/notifications.py
@@ -38,6 +38,12 @@ cfg.CONF.register_opts(OPTS)
 class _Base(plugin.NotificationBase):
     """Convert volume notifications into Counters."""
 
+    event_types = [
+        'volume.exists',
+        'volume.create.*',
+        'volume.delete.*',
+    ]
+
     @staticmethod
     def get_exchange_topics(conf):
         """Return a sequence of ExchangeTopics defining the exchange and
@@ -50,12 +56,6 @@ class _Base(plugin.NotificationBase):
                            for topic in conf.notification_topics)),
         ]
 
-    @staticmethod
-    def get_event_types():
-        return ['volume.exists',
-                'volume.create.end',
-                'volume.delete.start']
-
 
 class Volume(_Base):
     def process_notification(self, message):