From: Yaarit Hatuka <yaarit@redhat.com>
Date: Mon, 2 Mar 2020 14:36:10 +0000 (-0500)
Subject: nautilus: mgr/telemetry: fix UUID and STR concat
X-Git-Tag: v14.2.10~192^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F33666%2Fhead;p=ceph.git

nautilus: mgr/telemetry: fix UUID and STR concat

Cast UUID object to string when anonymizing device's serial, otherwise
Python2 throws a TypeError.

Fixes: https://tracker.ceph.com/issues/44376
Signed-off-by: Yaarit Hatuka <yaarit@redhat.com>
---

diff --git a/src/pybind/mgr/telemetry/module.py b/src/pybind/mgr/telemetry/module.py
index c2f9657e686e..ef89e3507022 100644
--- a/src/pybind/mgr/telemetry/module.py
+++ b/src/pybind/mgr/telemetry/module.py
@@ -402,7 +402,7 @@ class Module(MgrModule):
             # anonymize device id
             anon_devid = self.get_store('devid-id/%s' % devid)
             if not anon_devid:
-                anon_devid = devid[:devid.rfind('_')] + '_' + uuid.uuid1()
+                anon_devid = devid[:devid.rfind('_')] + '_' + str(uuid.uuid1())
                 self.set_store('devid-id/%s' % devid, anon_devid)
             self.log.info('devid %s / %s, host %s / %s' % (devid, anon_devid,
                                                            host, anon_host))