From 1392d885e650e06937846d536ebb11b91d0adc75 Mon Sep 17 00:00:00 2001
From: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date: Thu, 9 Jun 2011 20:10:02 +0000
Subject: Add version and agentupdate commands

---
 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent | 37 +++++++++++++++++++++--
 1 file changed, 35 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
index 9e761f264..0aab7c2eb 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
@@ -53,6 +53,19 @@ class TimeoutError(StandardError):
     pass
 
 
+def version(self, arg_dict):
+    """Get version of agent."""
+    arg_dict["value"] = json.dumps({"name": "version", "value": ""})
+    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 key_init(self, arg_dict):
     """Handles the Diffie-Hellman key exchange with the agent to
     establish the shared secret key used to encrypt/decrypt sensitive
@@ -144,6 +157,24 @@ def inject_file(self, arg_dict):
     return resp
 
 
+@jsonify
+def agent_update(self, arg_dict):
+    """Expects an URL and md5sum of the contents, then directs the agent to
+    update itself."""
+    request_id = arg_dict["id"]
+    url = arg_dict["url"]
+    md5sum = arg_dict["md5sum"]
+    arg_dict["value"] = json.dumps({"name": "agentupdate",
+                "value": {"url": url, "md5sum": md5sum}})
+    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 _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
@@ -201,7 +232,9 @@ def _wait_for_agent(self, request_id, arg_dict):
 
 if __name__ == "__main__":
     XenAPIPlugin.dispatch(
-        {"key_init": key_init,
+        {"version": version,
+        "key_init": key_init,
         "password": password,
         "resetnetwork": resetnetwork,
-        "inject_file": inject_file})
+        "inject_file": inject_file,
+        "agentupdate": agent_update})
-- 
cgit 


From 00eae759e8b3d0d35af513471d7d2d43a18ba215 Mon Sep 17 00:00:00 2001
From: Johannes Erdfelt <johannes.erdfelt@rackspace.com>
Date: Fri, 17 Jun 2011 20:34:43 +0000
Subject: Result is already in JSON format from _wait_for_agent

---
 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent | 1 -
 1 file changed, 1 deletion(-)

(limited to 'plugins')

diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
index 0aab7c2eb..b8a1b936a 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent
@@ -157,7 +157,6 @@ def inject_file(self, arg_dict):
     return resp
 
 
-@jsonify
 def agent_update(self, arg_dict):
     """Expects an URL and md5sum of the contents, then directs the agent to
     update itself."""
-- 
cgit