From 7ce7ead127390f50ddceaaf393bd71e392b765f0 Mon Sep 17 00:00:00 2001 From: Radoslav Gerganov Date: Tue, 28 Mar 2017 10:56:33 +0300 Subject: [PATCH] Strip extra characters from uuid The VM uuid is sent with some extra characters like dash and spaces. Strip those characters so log file names will have well defined format. Change-Id: Ia41b6276851b363cd3b0aaa87d220c4e4425f8e9 --- vspc/server.py | 1 + vspc/tests/test_server.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/vspc/server.py b/vspc/server.py index 046140d..524e922 100755 --- a/vspc/server.py +++ b/vspc/server.py @@ -110,6 +110,7 @@ class VspcServer(object): uuid = data.decode('ascii') LOG.debug("<< %s VM-VC-UUID %s", peer, uuid) uuid = uuid.replace(' ', '') + uuid = uuid.replace('-', '') self.sock_to_uuid[socket] = uuid @asyncio.coroutine diff --git a/vspc/tests/test_server.py b/vspc/tests/test_server.py index 3220d89..7e220f5 100644 --- a/vspc/tests/test_server.py +++ b/vspc/tests/test_server.py @@ -23,7 +23,7 @@ class VspcServerTest(testtools.TestCase): def test_handle_vm_vc_uuid(self): mock_socket = mock.Mock() srv = server.VspcServer() - data = b'11 22 33 44 55' + data = b'68 4c 91 6c 5f 6c 4c 2f-aa 50 df d6 61 a2 2e 0d' srv.handle_vm_vc_uuid(mock_socket, data) actual_uuid = srv.sock_to_uuid[mock_socket] - self.assertEqual('1122334455', actual_uuid) + self.assertEqual('684c916c5f6c4c2faa50dfd661a22e0d', actual_uuid)