From 6b9bd89649f7d436a8fb9d4db03b7b6e80432aaa Mon Sep 17 00:00:00 2001
From: Julien Danjou <julien@danjou.info>
Date: Thu, 19 Jul 2012 14:51:16 +0200
Subject: [PATCH] Merge c1 function into process

c1 does not mean anything, so it seems better to merge it in the method its
used.

Change-Id: I51a953062d450ac4b392d0f86acc9a415b7b22af
Signed-off-by: Julien Danjou <julien@danjou.info>
---
 ceilometer/compute/notifications.py | 36 +++++++++++++----------------
 tests/compute/test_notifications.py |  4 ++--
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/ceilometer/compute/notifications.py b/ceilometer/compute/notifications.py
index 9819b9032..7cebca1bf 100644
--- a/ceilometer/compute/notifications.py
+++ b/ceilometer/compute/notifications.py
@@ -23,32 +23,28 @@ from ceilometer import plugin
 from ceilometer.compute import instance
 
 
-def c1(body):
-    """Generate c1(instance) counters for a notice."""
-    return counter.Counter(
-        source='?',
-        name='instance',
-        type='delta',
-        volume=1,
-        user_id=body['payload']['user_id'],
-        project_id=body['payload']['tenant_id'],
-        resource_id=body['payload']['instance_id'],
-        timestamp=body['timestamp'],
-        duration=0,
-        resource_metadata=instance.get_metadata_from_event(body),
-        )
-
-
 class InstanceNotifications(plugin.NotificationBase):
     """Convert compute.instance.* notifications into Counters
     """
 
-    def get_event_types(self):
+    @staticmethod
+    def get_event_types():
         return ['compute.instance.create.end',
                 'compute.instance.exists',
                 'compute.instance.delete.start',
                 ]
 
-    def process_notification(self, message):
-        return [c1(message),
-                ]
+    @staticmethod
+    def process_notification(message):
+        return [counter.Counter(
+            source='?',
+            name='instance',
+            type='delta',
+            volume=1,
+            user_id=message['payload']['user_id'],
+            project_id=message['payload']['tenant_id'],
+            resource_id=message['payload']['instance_id'],
+            timestamp=message['timestamp'],
+            duration=0,
+            resource_metadata=instance.get_metadata_from_event(message),
+        )]
diff --git a/tests/compute/test_notifications.py b/tests/compute/test_notifications.py
index 3c5f1c59e..e03425b39 100644
--- a/tests/compute/test_notifications.py
+++ b/tests/compute/test_notifications.py
@@ -167,8 +167,8 @@ def compare(name, actual, expected):
     assert actual == expected, name
 
 
-def test_c1():
-    info = notifications.c1(INSTANCE_CREATE_END)
+def test_process_notification():
+    info = notifications.InstanceNotifications.process_notification(INSTANCE_CREATE_END)[0]
 
     for name, actual, expected in [
         ('counter_name', info.name, 'instance'),