From 9df1f3cfaaa3fb1de35ed729cc7548da19392255 Mon Sep 17 00:00:00 2001 From: hsiang41 Date: Fri, 22 Mar 2019 15:41:43 +0800 Subject: [PATCH] mgr/diskprediction_cloud: Correct base64 encode translate table Correct base64 encode/decode string translate table Signed-off-by: Rick Chen --- .../agent/metrics/ceph_mon_osd.py | 2 +- src/pybind/mgr/diskprediction_cloud/module.py | 15 ++++----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/pybind/mgr/diskprediction_cloud/agent/metrics/ceph_mon_osd.py b/src/pybind/mgr/diskprediction_cloud/agent/metrics/ceph_mon_osd.py index 07f0c8a6102..4b4d8fa851a 100644 --- a/src/pybind/mgr/diskprediction_cloud/agent/metrics/ceph_mon_osd.py +++ b/src/pybind/mgr/diskprediction_cloud/agent/metrics/ceph_mon_osd.py @@ -172,7 +172,7 @@ class CephMonOsdAgent(MetricsAgent): elif key_name == 'stat_bytes_used': stat_bytes_used = value else: - d_osd.fields[key_name] = value + d_osd.fields[key_name] = float(value) if stat_bytes and stat_bytes_used: d_osd.fields['stat_bytes_used_percentage'] = \ diff --git a/src/pybind/mgr/diskprediction_cloud/module.py b/src/pybind/mgr/diskprediction_cloud/module.py index c595e027b5e..151b2bc9c8f 100644 --- a/src/pybind/mgr/diskprediction_cloud/module.py +++ b/src/pybind/mgr/diskprediction_cloud/module.py @@ -27,12 +27,12 @@ ORIGIN_ALPHABET = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz012345678 def get_transtable(): - transtable = maketrans(CUSTOMER_ALPHABET, ORIGIN_ALPHABET) + transtable = maketrans(ORIGIN_ALPHABET, CUSTOMER_ALPHABET) return transtable def get_reverse_transtable(): - transtable = maketrans(ORIGIN_ALPHABET, CUSTOMER_ALPHABET) + transtable = maketrans(CUSTOMER_ALPHABET, ORIGIN_ALPHABET) return transtable @@ -40,18 +40,11 @@ def encode_string(value): if len(value) == 0: return "" transtable = get_transtable() - e = str((base64.b64encode(str(value).encode())).decode("utf-8")[:-1]) + e = str((base64.b64encode(str(value).encode())).decode("utf-8")) + e = e.rstrip("=") return e.translate(transtable) -def decode_string(value): - if len(value) == 0: - return "" - transtable = get_reverse_transtable() - e = str(value).translate(transtable) + "=" - return base64.b64decode(e).decode("utf-8") - - class Module(MgrModule): MODULE_OPTIONS = [ -- 2.39.5