openstack/nova
Code Issues Proposed changes

Merge "Make rebuilds with an emtpy name raise BadRequest."

Browse Source
This commit is contained in:
Jenkins
2012-04-28 12:10:18 +00:00
committed by Gerrit Code Review
parent 33ab99a1af 98b8001407
commit 76bb37e049
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
nova/api/openstack/compute/servers.py
View File

@@ -271,7 +271,10 @@ class ActionDeserializer(CommonDeserializer):
def _action_rebuild(self, node): def _action_rebuild(self, node):
rebuild = {} rebuild = {}
if node.hasAttribute("name"): if node.hasAttribute("name"):
rebuild['name'] = node.getAttribute("name") name = node.getAttribute("name")
if not name:
raise AttributeError("Name cannot be blank")
rebuild['name'] = name
if node.hasAttribute("auto_disk_config"): if node.hasAttribute("auto_disk_config"):
rebuild['auto_disk_config'] = node.getAttribute("auto_disk_config") rebuild['auto_disk_config'] = node.getAttribute("auto_disk_config")

11
nova/tests/api/openstack/compute/test_server_actions.py
View File

@@ -887,3 +887,14 @@ class TestServerActionXMLDeserializer(test.TestCase):
self.deserializer.deserialize, self.deserializer.deserialize,
serial_request, serial_request,
'action') 'action')
def test_rebuild_blank_name(self):
serial_request = """<?xml version="1.0" encoding="UTF-8"?>
<rebuild
xmlns="http://docs.openstack.org/compute/api/v1.1"
imageRef="http://localhost/images/1"
name=""/>"""
self.assertRaises(AttributeError,
self.deserializer.deserialize,
serial_request,
'action')