From cbf9f1bef113d54be57e2bb9a79990226afcd90f Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh@jk0.org>
Date: Fri, 24 Jun 2011 11:55:43 -0500
Subject: Adding tests for backup no rotation, invalid image type

---
 nova/api/openstack/images.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'nova/api')

diff --git a/nova/api/openstack/images.py b/nova/api/openstack/images.py
index d8dbd2360..2287ca0f7 100644
--- a/nova/api/openstack/images.py
+++ b/nova/api/openstack/images.py
@@ -122,13 +122,17 @@ class Controller(object):
             image_name = get_param("name")
             image = self._compute_service.snapshot(context, server_id,
                     image_name)
-        else:
+        elif image_type in ("daily", "weekly"):
             if not FLAGS.allow_admin_api:
                 raise webob.exc.HTTPBadRequest()
 
             rotation = int(get_param("rotation"))
             image = self._compute_service.backup(context, server_id,
                     image_type, rotation)
+        else:
+            LOG.error(_("Invalid image_type '%s' passed" % image_type))
+            raise webob.exc.HTTPBadRequest()
+
 
         return dict(image=self.get_builder(req).build(image, detail=True))
 
-- 
cgit