Merge "Add notifications for identity CRUD events"
This commit is contained in:
commit
b6a597804f
@ -1,6 +1,4 @@
|
|||||||
# Copyright 2014 Mirantis Inc.
|
# Copyright 2014 Mirantis Inc.
|
||||||
# All Rights Reserved.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
# not use this file except in compliance with the License. You may obtain
|
# not use this file except in compliance with the License. You may obtain
|
||||||
# a copy of the License at
|
# a copy of the License at
|
||||||
@ -14,6 +12,10 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo.config import cfg
|
from oslo.config import cfg
|
||||||
|
import oslo.messaging
|
||||||
|
|
||||||
|
from ceilometer import plugin
|
||||||
|
from ceilometer import sample
|
||||||
|
|
||||||
OPTS = [
|
OPTS = [
|
||||||
cfg.StrOpt('keystone_control_exchange',
|
cfg.StrOpt('keystone_control_exchange',
|
||||||
@ -23,3 +25,87 @@ OPTS = [
|
|||||||
|
|
||||||
|
|
||||||
cfg.CONF.register_opts(OPTS)
|
cfg.CONF.register_opts(OPTS)
|
||||||
|
|
||||||
|
SERVICE = 'identity'
|
||||||
|
|
||||||
|
|
||||||
|
class _Base(plugin.NotificationBase):
|
||||||
|
"""Convert identity notification into Samples."""
|
||||||
|
|
||||||
|
resource_type = None
|
||||||
|
resource_name = None
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def get_targets(conf):
|
||||||
|
"""Return a sequence of oslo.messaging.Target
|
||||||
|
|
||||||
|
Sequence defining the exchange and topics to be connected for this
|
||||||
|
plugin.
|
||||||
|
"""
|
||||||
|
return [oslo.messaging.Target(topic=topic,
|
||||||
|
exchange=conf.keystone_control_exchange)
|
||||||
|
for topic in conf.notification_topics]
|
||||||
|
|
||||||
|
def process_notification(self, message):
|
||||||
|
yield sample.Sample.from_notification(
|
||||||
|
name=message['event_type'],
|
||||||
|
type=sample.TYPE_DELTA,
|
||||||
|
unit=self.resource_type,
|
||||||
|
volume=1,
|
||||||
|
resource_id=message['payload']['resource_info'],
|
||||||
|
user_id=None,
|
||||||
|
project_id=None,
|
||||||
|
message=message)
|
||||||
|
|
||||||
|
|
||||||
|
class User(_Base):
|
||||||
|
|
||||||
|
resource_type = 'user'
|
||||||
|
resource_name = '%s.%s' % (SERVICE, resource_type)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def event_types(self):
|
||||||
|
return ['%s.*' % (self.resource_name)]
|
||||||
|
|
||||||
|
|
||||||
|
class Group(_Base):
|
||||||
|
|
||||||
|
resource_type = 'group'
|
||||||
|
resource_name = '%s.%s' % (SERVICE, resource_type)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def event_types(self):
|
||||||
|
return ['%s.*' % (self.resource_name)]
|
||||||
|
|
||||||
|
|
||||||
|
class Project(_Base):
|
||||||
|
|
||||||
|
resource_type = 'project'
|
||||||
|
resource_name = '%s.%s' % (SERVICE, resource_type)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def event_types(self):
|
||||||
|
return ['%s.*' % (self.resource_name)]
|
||||||
|
|
||||||
|
|
||||||
|
class Role(_Base):
|
||||||
|
|
||||||
|
resource_type = 'role'
|
||||||
|
resource_name = '%s.%s' % (SERVICE, resource_type)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def event_types(self):
|
||||||
|
return ['%s.*' % (self.resource_name)]
|
||||||
|
|
||||||
|
|
||||||
|
class Trust(_Base):
|
||||||
|
|
||||||
|
resource_type = 'trust'
|
||||||
|
resource_name = '%s.%s' % (SERVICE, resource_type)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def event_types(self):
|
||||||
|
return [
|
||||||
|
'%s.created' % (self.resource_name),
|
||||||
|
'%s.deleted' % (self.resource_name)
|
||||||
|
]
|
||||||
|
0
ceilometer/tests/identity/__init__.py
Normal file
0
ceilometer/tests/identity/__init__.py
Normal file
112
ceilometer/tests/identity/test_notifications.py
Normal file
112
ceilometer/tests/identity/test_notifications.py
Normal file
@ -0,0 +1,112 @@
|
|||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
# a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
|
||||||
|
import datetime
|
||||||
|
|
||||||
|
import mock
|
||||||
|
|
||||||
|
from ceilometer.identity import notifications
|
||||||
|
from ceilometer.openstack.common import test
|
||||||
|
from ceilometer import sample
|
||||||
|
|
||||||
|
|
||||||
|
NOW = datetime.datetime.isoformat(datetime.datetime.utcnow())
|
||||||
|
|
||||||
|
PROJECT_ID = u'project_id'
|
||||||
|
USER_ID = u'user_id'
|
||||||
|
ROLE_ID = u'role_id'
|
||||||
|
GROUP_ID = u'group_id'
|
||||||
|
TRUST_ID = u'trust_id'
|
||||||
|
PUBLISHER_ID = u'identity.node-n5x66lxdy67d'
|
||||||
|
|
||||||
|
|
||||||
|
def notification_for(resource_type, operation, resource_id):
|
||||||
|
|
||||||
|
return {
|
||||||
|
u'event_type': '%s.%s.%s' % (notifications.SERVICE, resource_type,
|
||||||
|
operation),
|
||||||
|
u'message_id': u'ef921faa-7f7b-4854-8b86-a424ab93c96e',
|
||||||
|
u'payload': {
|
||||||
|
u'resource_info': resource_id
|
||||||
|
},
|
||||||
|
u'priority': u'INFO',
|
||||||
|
u'publisher_id': PUBLISHER_ID,
|
||||||
|
u'timestamp': NOW
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class TestNotification(test.BaseTestCase):
|
||||||
|
|
||||||
|
def _verify_common_sample(self, s):
|
||||||
|
self.assertIsNotNone(s)
|
||||||
|
self.assertEqual(NOW, s.timestamp)
|
||||||
|
self.assertEqual(sample.TYPE_DELTA, s.type)
|
||||||
|
self.assertIsNone(s.project_id)
|
||||||
|
self.assertIsNone(s.user_id)
|
||||||
|
metadata = s.resource_metadata
|
||||||
|
self.assertEqual(PUBLISHER_ID, metadata.get('host'))
|
||||||
|
|
||||||
|
def _test_operation(self, resource_type, operation, resource_id,
|
||||||
|
notification_class):
|
||||||
|
notif = notification_for(resource_type, operation, resource_id)
|
||||||
|
handler = notification_class(mock.Mock())
|
||||||
|
data = list(handler.process_notification(notif))
|
||||||
|
self.assertEqual(1, len(data))
|
||||||
|
self.assertEqual(resource_id, data[0].resource_id)
|
||||||
|
name = '%s.%s.%s' % (notifications.SERVICE, resource_type, operation)
|
||||||
|
self.assertEqual(name, data[0].name)
|
||||||
|
self._verify_common_sample(data[0])
|
||||||
|
|
||||||
|
def test_create_user(self):
|
||||||
|
self._test_operation('user', 'created', USER_ID, notifications.User)
|
||||||
|
|
||||||
|
def test_delete_user(self):
|
||||||
|
self._test_operation('user', 'deleted', USER_ID, notifications.User)
|
||||||
|
|
||||||
|
def test_update_user(self):
|
||||||
|
self._test_operation('user', 'updated', USER_ID, notifications.User)
|
||||||
|
|
||||||
|
def test_create_group(self):
|
||||||
|
self._test_operation('group', 'created', GROUP_ID, notifications.Group)
|
||||||
|
|
||||||
|
def test_update_group(self):
|
||||||
|
self._test_operation('group', 'updated', GROUP_ID, notifications.Group)
|
||||||
|
|
||||||
|
def test_delete_group(self):
|
||||||
|
self._test_operation('group', 'deleted', GROUP_ID, notifications.Group)
|
||||||
|
|
||||||
|
def test_create_project(self):
|
||||||
|
self._test_operation('project', 'created', PROJECT_ID,
|
||||||
|
notifications.Project)
|
||||||
|
|
||||||
|
def test_update_project(self):
|
||||||
|
self._test_operation('project', 'updated', PROJECT_ID,
|
||||||
|
notifications.Project)
|
||||||
|
|
||||||
|
def test_delete_project(self):
|
||||||
|
self._test_operation('project', 'deleted', PROJECT_ID,
|
||||||
|
notifications.Project)
|
||||||
|
|
||||||
|
def test_create_role(self):
|
||||||
|
self._test_operation('role', 'deleted', ROLE_ID, notifications.Role)
|
||||||
|
|
||||||
|
def test_update_role(self):
|
||||||
|
self._test_operation('role', 'updated', ROLE_ID, notifications.Role)
|
||||||
|
|
||||||
|
def test_delete_role(self):
|
||||||
|
self._test_operation('role', 'deleted', ROLE_ID, notifications.Role)
|
||||||
|
|
||||||
|
def test_create_trust(self):
|
||||||
|
self._test_operation('trust', 'created', TRUST_ID, notifications.Trust)
|
||||||
|
|
||||||
|
def test_delete_trust(self):
|
||||||
|
self._test_operation('trust', 'deleted', TRUST_ID, notifications.Trust)
|
@ -51,6 +51,11 @@ ceilometer.notification =
|
|||||||
volume_size = ceilometer.volume.notifications:VolumeSize
|
volume_size = ceilometer.volume.notifications:VolumeSize
|
||||||
snapshot = ceilometer.volume.notifications:Snapshot
|
snapshot = ceilometer.volume.notifications:Snapshot
|
||||||
snapshot_size = ceilometer.volume.notifications:SnapshotSize
|
snapshot_size = ceilometer.volume.notifications:SnapshotSize
|
||||||
|
user = ceilometer.identity.notifications:User
|
||||||
|
group = ceilometer.identity.notifications:Group
|
||||||
|
role = ceilometer.identity.notifications:Role
|
||||||
|
project = ceilometer.identity.notifications:Project
|
||||||
|
trust = ceilometer.identity.notifications:Trust
|
||||||
image_crud = ceilometer.image.notifications:ImageCRUD
|
image_crud = ceilometer.image.notifications:ImageCRUD
|
||||||
image = ceilometer.image.notifications:Image
|
image = ceilometer.image.notifications:Image
|
||||||
image_size = ceilometer.image.notifications:ImageSize
|
image_size = ceilometer.image.notifications:ImageSize
|
||||||
|
Loading…
x
Reference in New Issue
Block a user