Merge from trunk and merge conflict resolution

2 files changed, 11 insertions, 4 deletions

diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
index f99ea4082..94eaabe73 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
@@ -93,9 +93,8 @@ def password(self, arg_dict):
 
 @jsonify
 def resetnetwork(self, arg_dict):
-    """
-    Writes a resquest to xenstore that tells the agent to reset networking.
-
+    """Writes a resquest to xenstore that tells the agent
+    to reset networking.
     """
     arg_dict['value'] = json.dumps({'name': 'resetnetwork', 'value': ''})
     request_id = arg_dict['id']
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py
index 695bf3448..a35ccd6ab 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py
@@ -36,7 +36,15 @@ pluginlib.configure_logging("xenstore")
 
 def jsonify(fnc):
     def wrapper(*args, **kwargs):
-        return json.dumps(fnc(*args, **kwargs))
+        ret = fnc(*args, **kwargs)
+        try:
+            json.loads(ret)
+        except ValueError:
+            # Value should already be JSON-encoded, but some operations
+            # may write raw sting values; this will catch those and
+            # properly encode them.
+            ret = json.dumps(ret)
+        return ret
     return wrapper