diff options
| author | Chris Behrens <cbehrens@codestud.com> | 2011-07-18 02:49:42 -0700 |
|---|---|---|
| committer | Chris Behrens <cbehrens@codestud.com> | 2011-07-18 02:49:42 -0700 |
| commit | 68ca0a6e770eadf1ed56aa9d0bef14c5ca16e172 (patch) | |
| tree | 8af270bf05251013ee25bfa2b22aa68cbcaa0c1c | |
| parent | 102a0e5b9d6ce22a5fc5a00fc260bbe1e3592222 (diff) | |
| download | nova-68ca0a6e770eadf1ed56aa9d0bef14c5ca16e172.tar.gz nova-68ca0a6e770eadf1ed56aa9d0bef14c5ca16e172.tar.xz nova-68ca0a6e770eadf1ed56aa9d0bef14c5ca16e172.zip | |
add image and flavor searching to v1.0 api
fixed missing updates from cut n paste in some doc strings
| -rw-r--r-- | nova/api/openstack/servers.py | 3 | ||||
| -rw-r--r-- | nova/compute/api.py | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py index fb1ce2529..b9347a014 100644 --- a/nova/api/openstack/servers.py +++ b/nova/api/openstack/servers.py @@ -472,7 +472,8 @@ class ControllerV10(Controller): search_opts.update(req.str_GET) user_api = ['project_id', 'fixed_ip', 'recurse_zones', - 'reservation_id', 'name', 'fresh', 'status'] + 'reservation_id', 'name', 'fresh', 'status', + 'image', 'flavor'] admin_api = ['ip', 'ip6', 'instance_name'] context = req.environ['nova.context'] diff --git a/nova/compute/api.py b/nova/compute/api.py index cd2aaed96..c4d6f8b8b 100644 --- a/nova/compute/api.py +++ b/nova/compute/api.py @@ -677,16 +677,12 @@ class API(base.Base): context, column, column_regexp) def _get_all_by_column(column_data, column): - """Get instances by regular expression matching - Instance.<column> - """ + """Get instances by exact matching Instance.<column>""" return self.db.instance_get_all_by_column( context, column, column_data) def _get_all_by_flavor(flavor_id): - """Get instances by regular expression matching - Instance.<column> - """ + """Get instances by flavor ID""" try: instance_type = self.db.instance_type_get_by_flavor_id( context, flavor_id) |