summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-04-27 20:48:27 +0000
committerGerrit Code Review <review@openstack.org>2012-04-27 20:48:27 +0000
commitf8343bb3c2592404197c0d56fc987fd8b779a307 (patch)
tree9afc341fcb3f925b2addb73d712b1390831c79e6 /nova/api
parentcd57400a21cabb3c10bb02184145fe4704859be2 (diff)
parent090bef6ce12ba83706dd328e697d4794c23f2572 (diff)
Merge "Do not allow blank adminPass attribute on set password"
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 251ab769f..3715f2593 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")}