Test WWNs with basestring

Change to match Nova commit 52c0668548eb4a7e3536c241c9551cdf89f2d696

Change-Id: I96844ab293003e605412410969f8f26f5e9ac075

diff --git a/cinder/brick/initiator/connector.py b/cinder/brick/initiator/connector.py
index cb7434e1ea25a2c64e2c3240a2291908dee311c6..256e95f1360b21f1c0c6adab9fa21dc6a88c44ff 100644 (file)
--- a/cinder/brick/initiator/connector.py
+++ b/cinder/brick/initiator/connector.py
@@ -518,7 +518,7 @@ class FibreChannelConnector(InitiatorConnector):
         if isinstance(ports, list):
             for wwn in ports:
                 wwns.append(str(wwn))
-        elif isinstance(ports, str) or isinstance(ports, unicode):
+        elif isinstance(ports, basestring):
             wwns.append(str(ports))
 
         # We need to look for wwns on every hba