diff options
| author | Ed Leafe <ed@leafe.com> | 2011-01-07 10:23:48 -0600 |
|---|---|---|
| committer | Ed Leafe <ed@leafe.com> | 2011-01-07 10:23:48 -0600 |
| commit | eaa5b5994891eee0280b750dff221a4b54932eb9 (patch) | |
| tree | 806a0911d288421933003ca22c8ee81ee9a38662 /plugins | |
| parent | b024dcf6f0c1e5a2735e84d21d6edef5ff38d1cf (diff) | |
| download | nova-eaa5b5994891eee0280b750dff221a4b54932eb9.tar.gz nova-eaa5b5994891eee0280b750dff221a4b54932eb9.tar.xz nova-eaa5b5994891eee0280b750dff221a4b54932eb9.zip | |
getting ready to push for merge prop
Diffstat (limited to 'plugins')
| -rwxr-xr-x | plugins/xenserver/xenapi/etc/xapi.d/plugins/agent | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent index 244509f3f..ab5b98d1c 100755 --- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent +++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent @@ -161,7 +161,7 @@ def key_init(self, arg_dict): pretend = SimpleDH(secret=PRETEND_SECRET) shared = pretend.compute_shared(pub) # Simulate the agent's response - ret = {"returncode": "D0", "message": "%s", "shared": "%s"} % (pretend.get_public(), shared) + ret = {"returncode": "D0", "message": pretend.get_public(), "shared": shared} return ret arg_dict["path"] = "data/host/%s" % request_id xenstore.write_record(self, arg_dict) @@ -187,7 +187,7 @@ def password(self, arg_dict): pretend = SimpleDH(secret=PRETEND_SECRET) pretend.compute_shared(pub) pw = pretend.decrypt(enc_pass) - ret = {"returncode": "0", "message": "%s"} % pw + ret = {"returncode": "0", "message": pw} return ret arg_dict["value"] = json.dumps({"name": "password", "value": enc_pass}) request_id = arg_dict["id"] |