openstack/aodh
Code Issues Proposed changes

network: add counter for actions

Browse Source 
We also count creation, update and deletion of things.

Change-Id: Iccc161a36b6332a077ef6f146e2c84d38f47c316
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou 2012-10-01 15:36:09 +02:00
parent fad2201a30
commit 0d4d97047c
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ceilometer/network/notifications.py
View File

@ -60,7 +60,7 @@ class NetworkNotificationBase(plugin.NotificationBase):
return [ return [
counter.Counter(source='?', counter.Counter(source='?',
name=self.resource_name, name=self.resource_name,
type='absolute', type='gauge',
volume=1, volume=1,
user_id=message['_context_user_id'], user_id=message['_context_user_id'],
project_id=message['payload']['tenant_id'], project_id=message['payload']['tenant_id'],
@ -70,6 +70,18 @@ class NetworkNotificationBase(plugin.NotificationBase):
resource_metadata=self.notification_to_metadata( resource_metadata=self.notification_to_metadata(
message), message),
), ),
counter.Counter(source='?',
name=message['event_type'].rpartition('.')[0],
type='gauge',
volume=1,
user_id=message['_context_user_id'],
project_id=message['payload']['tenant_id'],
resource_id='network',
timestamp=message['timestamp'],
duration=None,
resource_metadata=self.notification_to_metadata(
message),
),
] ]

8
tests/network/test_notifications.py
View File

@ -137,19 +137,19 @@ class TestNotifications(unittest.TestCase):
def test_network_create(self): def test_network_create(self):
v = notifications.Network() v = notifications.Network()
counters = v.process_notification(NOTIFICATION_NETWORK_CREATE) counters = v.process_notification(NOTIFICATION_NETWORK_CREATE)
self.assertEqual(len(counters), 1) self.assertEqual(len(counters), 2)
def test_subnet_create(self): def test_subnet_create(self):
v = notifications.Subnet() v = notifications.Subnet()
counters = v.process_notification(NOTIFICATION_SUBNET_CREATE) counters = v.process_notification(NOTIFICATION_SUBNET_CREATE)
self.assertEqual(len(counters), 1) self.assertEqual(len(counters), 2)
def test_port_create(self): def test_port_create(self):
v = notifications.Port() v = notifications.Port()
counters = v.process_notification(NOTIFICATION_PORT_CREATE) counters = v.process_notification(NOTIFICATION_PORT_CREATE)
self.assertEqual(len(counters), 1) self.assertEqual(len(counters), 2)
def test_port_update(self): def test_port_update(self):
v = notifications.Port() v = notifications.Port()
counters = v.process_notification(NOTIFICATION_PORT_UPDATE) counters = v.process_notification(NOTIFICATION_PORT_UPDATE)
self.assertEqual(len(counters), 1) self.assertEqual(len(counters), 2)