mgr/diskprediction_cloud: Correct base64 encode translate table

Correct base64 encode/decode string translate table

Signed-off-by: Rick Chen <rick.chen@prophetstor.com>
(cherry picked from commit 9df1f3cfaaa3fb1de35ed729cc7548da19392255)

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 07f0c8a6102301cb402673055ab9679879c983c9..4b4d8fa851ae7c37a9a9d2c601e80aaa86ca520f 100644 (file)
--- 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':\r
                 stat_bytes_used = value\r
             else:\r
-                d_osd.fields[key_name] = value\r
+                d_osd.fields[key_name] = float(value)\r
 \r
         if stat_bytes and stat_bytes_used:\r
             d_osd.fields['stat_bytes_used_percentage'] = \\r

diff --git a/src/pybind/mgr/diskprediction_cloud/module.py b/src/pybind/mgr/diskprediction_cloud/module.py
index c595e027b5ed37449d4d03d0949fbaaedf920a25..151b2bc9c8fd71b0404b790def4e8484ad5aee28 100644 (file)
--- 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 = [