Merge "xenapi: wait for agent resetnetwork response"

2 files changed, 12 insertions, 9 deletions

diff --git a/nova/virt/xenapi/agent.py b/nova/virt/xenapi/agent.py
index 577e6fcf5..7204185c3 100644
--- a/nova/virt/xenapi/agent.py
+++ b/nova/virt/xenapi/agent.py
@@ -193,8 +193,13 @@ def inject_file(session, instance, vm_ref, path, contents):
 
 
 def resetnetwork(session, instance, vm_ref):
-    """Calls resetnetwork method in agent."""
-    _call_agent(session, instance, vm_ref, 'resetnetwork')
+    resp = _call_agent(session, instance, vm_ref, 'resetnetwork')
+    if resp['returncode'] != '0':
+        LOG.error(_('Failed to reset network: %(resp)r'), locals(),
+                  instance=instance)
+        return None
+
+    return resp['message']
 
 
 class SimpleDH(object):
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
index fa1558bd7..07122ba88 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
@@ -43,12 +43,6 @@ import xenstore
 AGENT_TIMEOUT = 30
 
 
-def jsonify(fnc):
-    def wrapper(*args, **kwargs):
-        return json.dumps(fnc(*args, **kwargs))
-    return wrapper
-
-
 class TimeoutError(StandardError):
     pass
 
@@ -105,7 +99,6 @@ def password(self, arg_dict):
     return resp
 
 
-@jsonify
 def resetnetwork(self, arg_dict):
     """Writes a resquest to xenstore that tells the agent
     to reset networking.
@@ -114,6 +107,11 @@ def resetnetwork(self, arg_dict):
     request_id = arg_dict['id']
     arg_dict['path'] = "data/host/%s" % request_id
     xenstore.write_record(self, arg_dict)
+    try:
+        resp = _wait_for_agent(self, request_id, arg_dict)
+    except TimeoutError, e:
+        raise PluginError(e)
+    return resp
 
 
 def inject_file(self, arg_dict):