From 87d90616df651787f52a59be37457335eb881ed7 Mon Sep 17 00:00:00 2001 From: Johannes Erdfelt Date: Wed, 15 Jun 2011 22:57:05 +0000 Subject: Workaround windows agent bugs where some responses have trailing \\r\\n --- nova/virt/xenapi/vmops.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'nova') diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 190bf7c20..5ca041059 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -526,7 +526,9 @@ class VMOps(object): # No response from the agent return resp_dict = json.loads(resp) - return resp_dict['message'] + # Some old versions of the windows agent have a trailing \\r\\n + # (ie CRLF escaped) for some reason. Strip that off + return resp_dict['message'].replace('\\r\\n', '') if timeout: vm_ref = self._get_vm_opaque_ref(instance) @@ -592,7 +594,9 @@ class VMOps(object): # There was some sort of error; the message will contain # a description of the error. raise RuntimeError(resp_dict['message']) - agent_pub = int(resp_dict['message']) + # Some old versions of the windows agent have a trailing \\r\\n + # (ie CRLF escaped) for some reason. Strip that off + agent_pub = int(resp_dict['message'].replace('\\r\\n', '')) dh.compute_shared(agent_pub) enc_pass = dh.encrypt(new_pass) # Send the encrypted password -- cgit From 46e016348ff4303310af328fa1af8fab513632c9 Mon Sep 17 00:00:00 2001 From: Johannes Erdfelt Date: Wed, 15 Jun 2011 23:11:00 +0000 Subject: Add trailing LF (\n) to password for compatibility with old agents --- nova/virt/xenapi/vmops.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'nova') diff --git a/nova/virt/xenapi/vmops.py b/nova/virt/xenapi/vmops.py index 5ca041059..24e293a7b 100644 --- a/nova/virt/xenapi/vmops.py +++ b/nova/virt/xenapi/vmops.py @@ -526,8 +526,8 @@ class VMOps(object): # No response from the agent return resp_dict = json.loads(resp) - # Some old versions of the windows agent have a trailing \\r\\n - # (ie CRLF escaped) for some reason. Strip that off + # Some old versions of the Windows agent have a trailing \\r\\n + # (ie CRLF escaped) for some reason. Strip that off. return resp_dict['message'].replace('\\r\\n', '') if timeout: @@ -594,11 +594,13 @@ class VMOps(object): # There was some sort of error; the message will contain # a description of the error. raise RuntimeError(resp_dict['message']) - # Some old versions of the windows agent have a trailing \\r\\n - # (ie CRLF escaped) for some reason. Strip that off + # Some old versions of the Windows agent have a trailing \\r\\n + # (ie CRLF escaped) for some reason. Strip that off. agent_pub = int(resp_dict['message'].replace('\\r\\n', '')) dh.compute_shared(agent_pub) - enc_pass = dh.encrypt(new_pass) + # Some old versions of Linux and Windows agent expect trailing \n + # on password to work correctly. + enc_pass = dh.encrypt(new_pass + '\n') # Send the encrypted password password_transaction_id = str(uuid.uuid4()) password_args = {'id': password_transaction_id, 'enc_pass': enc_pass} -- cgit