From 77a285b813638e7b8c651df57d3119543ceb685f Mon Sep 17 00:00:00 2001
From: Peng Wang <wangpww@cn.ibm.com>
Date: Mon, 9 Dec 2019 02:22:45 -0700
Subject: [PATCH] DS8k Cinder Driver support Python3

Change IBM DS8K Cinder Driver code to support python3

Change-Id: I864c8984109574680032be6f797855a49d835fe3
Closes-Bug: 1855657
---
 cinder/volume/drivers/ibm/ibm_storage/ds8k_restclient.py | 4 ++--
 cinder/volume/drivers/ibm/ibm_storage/ibm_storage.py     | 3 ---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/cinder/volume/drivers/ibm/ibm_storage/ds8k_restclient.py b/cinder/volume/drivers/ibm/ibm_storage/ds8k_restclient.py
index 742aeeb6caa..231e9d95e9d 100644
--- a/cinder/volume/drivers/ibm/ibm_storage/ds8k_restclient.py
+++ b/cinder/volume/drivers/ibm/ibm_storage/ds8k_restclient.py
@@ -203,8 +203,8 @@ class RESTScheduler(object):
         self.token = ''
         self.host = host
         self.port = '8452'
-        self.user = user
-        self.passw = passw
+        self.user = user if isinstance(user, str) else user.decode()
+        self.passw = passw if isinstance(passw, str) else passw.decode()
         self.connector = connector_obj or DefaultRESTConnector(verify)
         self.connect()
 
diff --git a/cinder/volume/drivers/ibm/ibm_storage/ibm_storage.py b/cinder/volume/drivers/ibm/ibm_storage/ibm_storage.py
index 222688da85f..8b28cac0ff7 100644
--- a/cinder/volume/drivers/ibm/ibm_storage/ibm_storage.py
+++ b/cinder/volume/drivers/ibm/ibm_storage/ibm_storage.py
@@ -85,9 +85,6 @@ class IBMStorageDriver(san.SanDriver,
     # ThirdPartySystems wiki page
     CI_WIKI_NAME = "IBM_STORAGE_CI"
 
-    # TODO(jsbryant) Remove driver in the 'U' release if CI is not fixed.
-    SUPPORTED = False
-
     def __init__(self, *args, **kwargs):
         """Initialize the driver."""