summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorDan Smith <danms@us.ibm.com>2012-09-14 07:43:35 -0700
committerDan Smith <danms@us.ibm.com>2012-09-14 09:02:25 -0700
commitd68d2fba65528b1d60f42817b2043cfbf1fea7ef (patch)
tree4d8e6933c48e7df3ab43f3bab0de86e9d2153d0c /nova/api
parent423dbafd08ac3bb970bcb842fa6e7812d42ceb4e (diff)
downloadnova-d68d2fba65528b1d60f42817b2043cfbf1fea7ef.tar.gz
nova-d68d2fba65528b1d60f42817b2043cfbf1fea7ef.tar.xz
nova-d68d2fba65528b1d60f42817b2043cfbf1fea7ef.zip
Fix XML deserialization of rebuild parameters
This picks up the following attributes which are currently ignored when poking this via XML: - accessIPv4 - accessIPv6 - adminPass Change-Id: I947aa2f942022d839919ae7516759955e5b06668
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/servers.py9
1 files changed, 9 insertions, 0 deletions
diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py
index ba23cb50b..66e30de75 100644
--- a/nova/api/openstack/compute/servers.py
+++ b/nova/api/openstack/compute/servers.py
@@ -282,6 +282,15 @@ class ActionDeserializer(CommonDeserializer):
raise AttributeError("No imageRef was specified in request")
rebuild["imageRef"] = node.getAttribute("imageRef")
+ if node.hasAttribute("adminPass"):
+ rebuild["adminPass"] = node.getAttribute("adminPass")
+
+ if node.hasAttribute("accessIPv4"):
+ rebuild["accessIPv4"] = node.getAttribute("accessIPv4")
+
+ if node.hasAttribute("accessIPv6"):
+ rebuild["accessIPv6"] = node.getAttribute("accessIPv6")
+
return rebuild
def _action_resize(self, node):