From: Avishay Traeger <avishay@il.ibm.com>
Date: Sun, 25 Aug 2013 07:45:14 +0000 (+0300)
Subject: Test WWNs with basestring
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=88975f197b1731cc991c9cfcd826d24c1e0d2d44;p=openstack-build%2Fcinder-build.git

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 cb7434e1e..256e95f13 100644
--- 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