Add listeners for other instance-related events

bug 1004560

Convert events for instance "exists" check and deletion into counters.

Change-Id: I882eeed2baf0445c53236c14f30969e95494a714

ceilometer/compute/notifications.py

@@ -41,16 +41,20 @@ def c1(body):
             'instance_type':
                 body['payload']['instance_type_id'],
             'host': body['publisher_id'],
+            'event_type': body['event_type'],
             },
         )
 
 
-class InstanceCreate(plugin.NotificationBase):
+class InstanceNotifications(plugin.NotificationBase):
-    """Convert compute.instance.create.end notifications into Counters
+    """Convert compute.instance.* notifications into Counters
     """
 
     def get_event_types(self):
-        return ['compute.instance.create.end']
+        return ['compute.instance.create.end',
+                'compute.instance.exists',
+                'compute.instance.delete.start',
+                ]
 
     def process_notification(self, message):
         return [c1(message),

setup.py

@@ -33,8 +33,7 @@ setuptools.setup(
     py_modules=[],
     entry_points={
         'ceilometer.collector.compute': [
-            'instance_create'
+          'instance = ceilometer.compute.notifications:InstanceNotifications',
-            '= ceilometer.compute.notifications:InstanceCreate',
             ],
         'ceilometer.poll.compute': [
             'libvirt_diskio = ceilometer.compute.libvirt:DiskIOPollster',

tests/collector/test_dispatcher.py

@@ -24,7 +24,9 @@ from ceilometer.collector import dispatcher
 
 class StubDispatcher(dispatcher.NotificationDispatcher):
     def _load_plugins(self):
-        self.handlers['compute.instance.create.end'] = [notifications.InstanceCreate()]
+        self.handlers['compute.instance.create.end'] = [
+            notifications.InstanceNotifications(),
+            ]
 
 
 TEST_NOTICE = {

tests/compute/test_notifications.py

@@ -59,6 +59,73 @@ INSTANCE_CREATE_END = {
     u'timestamp': u'2012-05-08 20:23:48.028195',
     }
 
+INSTANCE_DELETE_START = {
+    u'_context_auth_token': u'3d8b13de1b7d499587dfc69b77dc09c2',
+    u'_context_is_admin': True,
+    u'_context_project_id': u'7c150a59fe714e6f9263774af9688f0e',
+    u'_context_quota_class': None,
+    u'_context_read_deleted': u'no',
+    u'_context_remote_address': u'10.0.2.15',
+    u'_context_request_id': u'req-fb3c4546-a2e5-49b7-9fd2-a63bd658bc39',
+    u'_context_roles': [u'admin'],
+    u'_context_timestamp': u'2012-05-08T20:24:14.547374',
+    u'_context_user_id': u'1e3ce043029547f1a61c1996d1a531a2',
+    u'event_type': u'compute.instance.delete.start',
+    u'message_id': u'a15b94ee-cb8e-4c71-9abe-14aa80055fb4',
+    u'payload': {u'created_at': u'2012-05-08 20:23:41',
+                 u'deleted_at': u'',
+                 u'disk_gb': 0,
+                 u'display_name': u'testme',
+                 u'image_ref_url': u'http://10.0.2.15:9292/images/UUID',
+                 u'instance_id': u'9f9d01b9-4a58-4271-9e27-398b21ab20d1',
+                 u'instance_type': u'm1.tiny',
+                 u'instance_type_id': 2,
+                 u'launched_at': u'2012-05-08 20:23:47',
+                 u'memory_mb': 512,
+                 u'state': u'active',
+                 u'state_description': u'deleting',
+                 u'tenant_id': u'7c150a59fe714e6f9263774af9688f0e',
+                 u'user_id': u'1e3ce043029547f1a61c1996d1a531a2'},
+    u'priority': u'INFO',
+    u'publisher_id': u'compute.vagrant-precise',
+    u'timestamp': u'2012-05-08 20:24:14.824743',
+    }
+
+INSTANCE_EXISTS = {
+    u'_context_auth_token': None,
+    u'_context_is_admin': True,
+    u'_context_project_id': None,
+    u'_context_quota_class': None,
+    u'_context_read_deleted': u'no',
+    u'_context_remote_address': None,
+    u'_context_request_id': u'req-659a8eb2-4372-4c01-9028-ad6e40b0ed22',
+    u'_context_roles': [u'admin'],
+    u'_context_timestamp': u'2012-05-08T16:03:43.760204',
+    u'_context_user_id': None,
+    u'event_type': u'compute.instance.exists',
+    u'message_id': u'4b884c03-756d-4c06-8b42-80b6def9d302',
+    u'payload': {u'audit_period_beginning': u'2012-05-08 15:00:00',
+                 u'audit_period_ending': u'2012-05-08 16:00:00',
+                 u'bandwidth': {},
+                 u'created_at': u'2012-05-07 22:16:18',
+                 u'deleted_at': u'',
+                 u'disk_gb': 0,
+                 u'display_name': u'testme',
+                 u'image_ref_url': u'http://10.0.2.15:9292/images/UUID',
+                 u'instance_id': u'3a513875-95c9-4012-a3e7-f90c678854e5',
+                 u'instance_type': u'm1.tiny',
+                 u'instance_type_id': 2,
+                 u'launched_at': u'2012-05-07 23:01:27',
+                 u'memory_mb': 512,
+                 u'state': u'active',
+                 u'state_description': u'',
+                 u'tenant_id': u'7c150a59fe714e6f9263774af9688f0e',
+                 u'user_id': u'1e3ce043029547f1a61c1996d1a531a2'},
+    u'priority': u'INFO',
+    u'publisher_id': u'compute.vagrant-precise',
+    u'timestamp': u'2012-05-08 16:03:44.122481',
+    }
+
 
 def compare(name, actual, expected):
     assert actual == expected, name
@@ -85,7 +152,21 @@ def test_c1():
 
 
 def test_instance_create():
-    ic = notifications.InstanceCreate()
+    ic = notifications.InstanceNotifications()
     counters = ic.process_notification(INSTANCE_CREATE_END)
     assert len(counters) == 1
     assert counters[0].type == 'instance'
+
+
+def test_instance_exists():
+    ic = notifications.InstanceNotifications()
+    counters = ic.process_notification(INSTANCE_EXISTS)
+    assert len(counters) == 1
+    assert counters[0].type == 'instance'
+
+
+def test_instance_delete():
+    ic = notifications.InstanceNotifications()
+    counters = ic.process_notification(INSTANCE_DELETE_START)
+    assert len(counters) == 1
+    assert counters[0].type == 'instance'