summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorChris Behrens <cbehrens@codestud.com>2011-07-18 02:49:42 -0700
committerChris Behrens <cbehrens@codestud.com>2011-07-18 02:49:42 -0700
commit68ca0a6e770eadf1ed56aa9d0bef14c5ca16e172 (patch)
tree8af270bf05251013ee25bfa2b22aa68cbcaa0c1c /nova/api
parent102a0e5b9d6ce22a5fc5a00fc260bbe1e3592222 (diff)
downloadnova-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
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/servers.py3
1 files changed, 2 insertions, 1 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']