diff options
| author | Brian Waldon <bcwaldon@gmail.com> | 2012-01-16 15:28:49 -0800 |
|---|---|---|
| committer | Brian Waldon <bcwaldon@gmail.com> | 2012-01-16 16:07:40 -0800 |
| commit | 85518a93ef01ae997ecfc0687d89ba87f7607f54 (patch) | |
| tree | 9d7928af887d05d8b1052ea5c9cabee82247f4bb /nova/volume | |
| parent | 1fd26203b29d6432325ae1365e3dcbecc9d97864 (diff) | |
| download | nova-85518a93ef01ae997ecfc0687d89ba87f7607f54.tar.gz nova-85518a93ef01ae997ecfc0687d89ba87f7607f54.tar.xz nova-85518a93ef01ae997ecfc0687d89ba87f7607f54.zip | |
Add default policy rule
If a specific rule is not found, we will check the rule defined in FLAGS.policy_default_action.
Change-Id: Ib1b1aa4bbeec74bdb1562d0fc649d33838076f01
Diffstat (limited to 'nova/volume')
| -rw-r--r-- | nova/volume/api.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/volume/api.py b/nova/volume/api.py index 6f5921f7c..cc9cac019 100644 --- a/nova/volume/api.py +++ b/nova/volume/api.py @@ -146,9 +146,10 @@ class API(base.Base): self.db.volume_update(context, volume['id'], fields) def get(self, context, volume_id): - check_policy(context, 'get', {'id': volume_id}) rv = self.db.volume_get(context, volume_id) - return dict(rv.iteritems()) + volume = dict(rv.iteritems()) + check_policy(context, 'get', volume) + return volume def get_all(self, context, search_opts={}): check_policy(context, 'get_all') @@ -262,7 +263,7 @@ class API(base.Base): def _create_snapshot(self, context, volume, name, description, force=False): - check_policy(context, 'create_snapshot') + check_policy(context, 'create_snapshot', volume) if ((not force) and (volume['status'] != "available")): raise exception.ApiError(_("Volume status must be available")) |