From 3bfaf0a0720fc8713fb77fddd8f1b2dffa0eabfc Mon Sep 17 00:00:00 2001
From: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date: Thu, 11 Aug 2011 18:28:15 +0000
Subject: v1.0 and v1.1 API differs for PUT, so split them out Update tests to
 match API

---
 nova/api/openstack/servers.py            | 72 ++++++++++++++++++++------------
 nova/tests/api/openstack/test_servers.py |  4 +-
 2 files changed, 48 insertions(+), 28 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 0f8e8e461..90b6e684b 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -161,32 +161,6 @@ class Controller(object):
         server['server']['adminPass'] = extra_values['password']
         return server
 
-    @scheduler_api.redirect_handler
-    def update(self, req, id, body):
-        """ Updates the server name or password """
-        if len(req.body) == 0:
-            raise exc.HTTPUnprocessableEntity()
-
-        if not body:
-            raise exc.HTTPUnprocessableEntity()
-
-        ctxt = req.environ['nova.context']
-        update_dict = {}
-
-        if 'name' in body['server']:
-            name = body['server']['name']
-            self.helper._validate_server_name(name)
-            update_dict['display_name'] = name.strip()
-
-        self._parse_update(ctxt, id, body, update_dict)
-
-        try:
-            self.compute_api.update(ctxt, id, **update_dict)
-        except exception.NotFound:
-            raise exc.HTTPNotFound()
-
-        return webob.Response()		# 200 response
-
     def _parse_update(self, context, id, inst_dict, update_dict):
         pass
 
@@ -545,6 +519,29 @@ class Controller(object):
 class ControllerV10(Controller):
     """v1.0 OpenStack API controller"""
 
+    @scheduler_api.redirect_handler
+    def update(self, req, id, body):
+        """ Updates the server name or password """
+        if len(req.body) == 0 or not body:
+            raise exc.HTTPUnprocessableEntity()
+
+        ctxt = req.environ['nova.context']
+        update_dict = {}
+
+        if 'name' in body['server']:
+            name = body['server']['name']
+            self.helper._validate_server_name(name)
+            update_dict['display_name'] = name.strip()
+
+        self._parse_update(ctxt, id, body, update_dict)
+
+        try:
+            self.compute_api.update(ctxt, id, **update_dict)
+        except exception.NotFound:
+            raise exc.HTTPNotFound()
+
+        return exc.HTTPNoContent()
+
     @scheduler_api.redirect_handler
     def delete(self, req, id):
         """ Destroys a server """
@@ -614,6 +611,29 @@ class ControllerV10(Controller):
 class ControllerV11(Controller):
     """v1.1 OpenStack API controller"""
 
+    @scheduler_api.redirect_handler
+    def update(self, req, id, body):
+        """ Updates the server name or password """
+        if len(req.body) == 0 or not body:
+            raise exc.HTTPUnprocessableEntity()
+
+        ctxt = req.environ['nova.context']
+        update_dict = {}
+
+        if 'name' in body['server']:
+            name = body['server']['name']
+            self.helper._validate_server_name(name)
+            update_dict['display_name'] = name.strip()
+
+        self._parse_update(ctxt, id, body, update_dict)
+
+        try:
+            self.compute_api.update(ctxt, id, **update_dict)
+        except exception.NotFound:
+            raise exc.HTTPNotFound()
+
+        # v1.1 API returns 200, which differs from v1.0
+
     @scheduler_api.redirect_handler
     def delete(self, req, id):
         """ Destroys a server """
diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py
index b6342ae2f..b732d2972 100644
--- a/nova/tests/api/openstack/test_servers.py
+++ b/nova/tests/api/openstack/test_servers.py
@@ -1869,7 +1869,7 @@ class ServersTest(test.TestCase):
         req.content_type = 'application/json'
         req.body = json.dumps({'server': {'name': 'new-name'}})
         res = req.get_response(fakes.wsgi_app())
-        self.assertEqual(res.status_int, 204)
+        self.assertEqual(res.status_int, 200)
         self.assertEqual(res.body, '')
 
     def test_update_server_adminPass_ignored_v1_1(self):
@@ -1889,7 +1889,7 @@ class ServersTest(test.TestCase):
         req.content_type = "application/json"
         req.body = self.body
         res = req.get_response(fakes.wsgi_app())
-        self.assertEqual(res.status_int, 204)
+        self.assertEqual(res.status_int, 200)
         self.assertEqual(res.body, '')
 
     def test_create_backup_schedules(self):
-- 
cgit