Correct a few changes in the VMAX driver

The following patch made a few wrong changes in the VMAX driver.
https://review.openstack.org/#/c/145780/

The following two files contain the wrong changes:
https://review.openstack.org/#/c/145780/15/cinder/tests/
test_emc_vmax.py line 604
https://review.openstack.org/#/c/145780/15/cinder/volume/drivers/
emc/emc_vmax_https.py

This patch fixed them.

Change-Id: I3f078ec7915c904ab910eb9ef9f07ac351282489

diff --git a/cinder/tests/test_emc_vmax.py b/cinder/tests/test_emc_vmax.py
index 0f233799c89751fac0c9212075bcf1293f655134..1a9506aed4bb42d64bc17543137a1b557027f55e 100644 (file)
--- a/cinder/tests/test_emc_vmax.py
+++ b/cinder/tests/test_emc_vmax.py
@@ -601,7 +601,7 @@ class FakeEcomConnection():
         result = None
         if ResultClass == 'EMC_StorageHardwareID':
             result = self._assoc_hdwid()
-        elif ResultClass == 'EMC_iSHEADCSIProtocolEndpoint':
+        elif ResultClass == 'EMC_iSCSIProtocolEndpoint':
             result = self._assoc_endpoint()
         elif ResultClass == 'EMC_StorageVolume':
             result = self._assoc_storagevolume(objectpath)

diff --git a/cinder/volume/drivers/emc/emc_vmax_https.py b/cinder/volume/drivers/emc/emc_vmax_https.py
index c44f5912b254599c13a56917cbea47e9ae13df49..7098c3d1abcd2fd59e880d787a7d86b129de27ee 100644 (file)
--- a/cinder/volume/drivers/emc/emc_vmax_https.py
+++ b/cinder/volume/drivers/emc/emc_vmax_https.py
@@ -80,7 +80,7 @@ class OpenSSLConnectionDelegator(object):
     a delegator must be used.
     """
     def __init__(self, *args, **kwargs):
-        self.connection = SSL.Connection(*args, **kwargs)
+        self.connection = SSL.GreenConnection(*args, **kwargs)
 
     def __getattr__(self, name):
         return getattr(self.connection, name)