diff options
| author | Dolph Mathews <dolph.mathews@gmail.com> | 2012-08-30 05:37:26 -0500 |
|---|---|---|
| committer | Dolph Mathews <dolph.mathews@gmail.com> | 2012-11-20 14:05:45 -0600 |
| commit | 84cd8ff7f31a123a16114c8e1de963ede646d913 (patch) | |
| tree | 4bbbf91a6d88bb9ead9491f43b7a45302a8f7d4d /keystone/catalog | |
| parent | 715a17b71d065efe93a39721a40a4d58508d0cb6 (diff) | |
| download | keystone-84cd8ff7f31a123a16114c8e1de963ede646d913.tar.gz keystone-84cd8ff7f31a123a16114c8e1de963ede646d913.tar.xz keystone-84cd8ff7f31a123a16114c8e1de963ede646d913.zip | |
Wrap v3 API with RBAC (bug 1023943)
Change-Id: Ie77be83054ea88bb0860260e1750196ac5ded650
Diffstat (limited to 'keystone/catalog')
| -rw-r--r-- | keystone/catalog/core.py | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/keystone/catalog/core.py b/keystone/catalog/core.py index 2c396b5d..79b3df2a 100644 --- a/keystone/catalog/core.py +++ b/keystone/catalog/core.py @@ -278,46 +278,40 @@ class EndpointController(wsgi.Application): class ServiceControllerV3(controller.V3Controller): + @controller.protected def create_service(self, context, service): - self.assert_admin(context) - ref = self._assign_unique_id(self._normalize_dict(service)) self._require_attribute(ref, 'type') ref = self.catalog_api.create_service(context, ref['id'], ref) return {'service': ref} + @controller.protected def list_services(self, context): - self.assert_admin(context) - refs = self.catalog_api.list_services(context) refs = self._filter_by_attribute(context, refs, 'type') return {'services': self._paginate(context, refs)} + @controller.protected def get_service(self, context, service_id): - self.assert_admin(context) - ref = self.catalog_api.get_service(context, service_id) return {'service': ref} + @controller.protected def update_service(self, context, service_id, service): - self.assert_admin(context) - self._require_matching_id(service_id, service) ref = self.catalog_api.update_service(context, service_id, service) return {'service': ref} + @controller.protected def delete_service(self, context, service_id): - self.assert_admin(context) - return self.catalog_api.delete_service(context, service_id) class EndpointControllerV3(controller.V3Controller): + @controller.protected def create_endpoint(self, context, endpoint): - self.assert_admin(context) - ref = self._assign_unique_id(self._normalize_dict(endpoint)) self._require_attribute(ref, 'service_id') self._require_attribute(ref, 'interface') @@ -326,23 +320,20 @@ class EndpointControllerV3(controller.V3Controller): ref = self.catalog_api.create_endpoint(context, ref['id'], ref) return {'endpoint': ref} + @controller.protected def list_endpoints(self, context): - self.assert_admin(context) - refs = self.catalog_api.list_endpoints(context) refs = self._filter_by_attribute(context, refs, 'service_id') refs = self._filter_by_attribute(context, refs, 'interface') return {'endpoints': self._paginate(context, refs)} + @controller.protected def get_endpoint(self, context, endpoint_id): - self.assert_admin(context) - ref = self.catalog_api.get_endpoint(context, endpoint_id) return {'endpoint': ref} + @controller.protected def update_endpoint(self, context, endpoint_id, endpoint): - self.assert_admin(context) - self._require_matching_id(endpoint_id, endpoint) if 'service_id' in endpoint: @@ -351,6 +342,6 @@ class EndpointControllerV3(controller.V3Controller): ref = self.catalog_api.update_endpoint(context, endpoint_id, endpoint) return {'endpoint': ref} + @controller.protected def delete_endpoint(self, context, endpoint_id): - self.assert_admin(context) return self.catalog_api.delete_endpoint(context, endpoint_id) |