Merge trunk

6 files changed, 25 insertions, 30 deletions

diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
index b8a1b936a..d609a88ab 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
@@ -37,7 +37,7 @@ import time
 import XenAPIPlugin
 
 from pluginlib_nova import *
-configure_logging("xenstore")
+configure_logging("agent")
 import xenstore
 
 AGENT_TIMEOUT = 30
@@ -72,7 +72,9 @@ def key_init(self, arg_dict):
     info to be passed, such as passwords. Returns the shared
     secret key value.
     """
-    pub = int(arg_dict["pub"])
+    # WARNING: Some older Windows agents will crash if the public key isn't
+    # a string
+    pub = arg_dict["pub"]
     arg_dict["value"] = json.dumps({"name": "keyinit", "value": pub})
     request_id = arg_dict["id"]
     arg_dict["path"] = "data/host/%s" % request_id
@@ -114,7 +116,6 @@ def resetnetwork(self, arg_dict):
     xenstore.write_record(self, arg_dict)
 
 
-@jsonify
 def inject_file(self, arg_dict):
     """Expects a file path and the contents of the file to be written. Both
     should be base64-encoded in order to eliminate errors as they are passed
@@ -127,20 +128,21 @@ def inject_file(self, arg_dict):
     been disabled, and raise a NotImplemented error if that is the case.
     """
     b64_path = arg_dict["b64_path"]
-    b64_file = arg_dict["b64_file"]
+    b64_file = arg_dict["b64_contents"]
     request_id = arg_dict["id"]
-    if self._agent_has_method("file_inject"):
+    agent_features = _get_agent_features(self, arg_dict)
+    if "file_inject" in agent_features:
         # New version of the agent.  Agent should receive a 'value'
         # key whose value is a dictionary containing 'b64_path' and
         # 'b64_file'.  See old version below.
         arg_dict["value"] = json.dumps({"name": "file_inject",
                 "value": {"b64_path": b64_path, "b64_file": b64_file}})
-    elif self._agent_has_method("injectfile"):
+    elif "injectfile" in agent_features:
         # Old agent requires file path and file contents to be
         # combined into one base64 value.
         raw_path = base64.b64decode(b64_path)
         raw_file = base64.b64decode(b64_file)
-        new_b64 = base64.b64encode("%s,%s") % (raw_path, raw_file)
+        new_b64 = base64.b64encode("%s,%s" % (raw_path, raw_file))
         arg_dict["value"] = json.dumps({"name": "injectfile",
                 "value": new_b64})
     else:
@@ -174,30 +176,23 @@ def agent_update(self, arg_dict):
     return resp
 
 
-def _agent_has_method(self, method):
-    """Check that the agent has a particular method by checking its
-    features.  Cache the features so we don't have to query the agent
-    every time we need to check.
-    """
+def _get_agent_features(self, arg_dict):
+    """Return an array of features that an agent supports."""
+    tmp_id = commands.getoutput("uuidgen")
+    dct = {}
+    dct.update(arg_dict)
+    dct["value"] = json.dumps({"name": "features", "value": ""})
+    dct["path"] = "data/host/%s" % tmp_id
+    xenstore.write_record(self, dct)
     try:
-        self._agent_methods
-    except AttributeError:
-        self._agent_methods = []
-    if not self._agent_methods:
-        # Haven't been defined
-        tmp_id = commands.getoutput("uuidgen")
-        dct = {}
-        dct["value"] = json.dumps({"name": "features", "value": ""})
-        dct["path"] = "data/host/%s" % tmp_id
-        xenstore.write_record(self, dct)
-        try:
-            resp = _wait_for_agent(self, tmp_id, dct)
-        except TimeoutError, e:
-            raise PluginError(e)
-        response = json.loads(resp)
-        # The agent returns a comma-separated list of methods.
-        self._agent_methods = response.split(",")
-    return method in self._agent_methods
+        resp = _wait_for_agent(self, tmp_id, dct)
+    except TimeoutError, e:
+        raise PluginError(e)
+    response = json.loads(resp)
+    if response['returncode'] != 0:
+        return response["message"].split(",")
+    else:
+        return {}
 
 
 def _wait_for_agent(self, request_id, arg_dict):
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
index fbe080b22..fbe080b22 100644..100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
index ac1c50ad9..ac1c50ad9 100644..100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/migration
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/objectstore b/plugins/xenserver/xenapi/etc/xapi.d/plugins/objectstore
index d0313b4ed..d0313b4ed 100644..100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/objectstore
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/objectstore
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py b/plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py
index f51f5fce4..f51f5fce4 100755..100644
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost
index 292bbce12..292bbce12 100644..100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenhost