summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorAlex Meade <alex.meade@rackspace.com>2012-04-18 18:22:16 -0400
committerAlex Meade <alex.meade@rackspace.com>2012-04-18 18:22:16 -0400
commit090bef6ce12ba83706dd328e697d4794c23f2572 (patch)
treee2cc3f97ec8112911bc27c936a7a4db05573ef0e /nova/api
parentab7e5907ff0fdad759d5e00a351c757c1e5de452 (diff)
downloadnova-090bef6ce12ba83706dd328e697d4794c23f2572.tar.gz
nova-090bef6ce12ba83706dd328e697d4794c23f2572.tar.xz
nova-090bef6ce12ba83706dd328e697d4794c23f2572.zip
Do not allow blank adminPass attribute on set password
Fixes bug 985263 Change-Id: I846248a4b8cb22fcaca9e51cc477813f80f6d602
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/servers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index 2e7b184c4..dbdcf8112 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -259,7 +259,7 @@ class ActionDeserializer(CommonDeserializer):
return self._deserialize_image_action(node, ('name',))
def _action_change_password(self, node):
- if not node.hasAttribute("adminPass"):
+ if not node.getAttribute("adminPass"):
raise AttributeError("No adminPass was specified in request")
return {"adminPass": node.getAttribute("adminPass")}