From 615530e7b0cd263c75d03d536a3a3b49129dba09 Mon Sep 17 00:00:00 2001
From: wanghongxu <wang19930902@gmail.com>
Date: Wed, 6 Dec 2017 15:42:08 +0800
Subject: [PATCH] VMAX driver - Fix AttributeError of dell emc driver
initiator_check is defined as a type of bool,
but is used as a str type.
Change-Id: Ib01deaa222c2ee2d16256bf2e8540af782f5dbf8
Closes-Bug: #1736661
---
.../unit/volume/drivers/dell_emc/vmax/test_vmax.py | 10 ++++++++++
cinder/volume/drivers/dell_emc/vmax/common.py | 8 +-------
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/cinder/tests/unit/volume/drivers/dell_emc/vmax/test_vmax.py b/cinder/tests/unit/volume/drivers/dell_emc/vmax/test_vmax.py
index 10ab8d488de..d4c4d5ad143 100644
--- a/cinder/tests/unit/volume/drivers/dell_emc/vmax/test_vmax.py
+++ b/cinder/tests/unit/volume/drivers/dell_emc/vmax/test_vmax.py
@@ -5010,6 +5010,16 @@ class VMAXCommonTest(test.TestCase):
mock_revert.assert_called_once_with(
array, device_id, snap_name, extra_specs)
+ def test_get_initiator_check_flag(self):
+ self.common.configuration.initiator_check = False
+ initiator_check = self.common._get_initiator_check_flag()
+ self.assertFalse(initiator_check)
+
+ def test_get_initiator_check_flag_true(self):
+ self.common.configuration.initiator_check = True
+ initiator_check = self.common._get_initiator_check_flag()
+ self.assertTrue(initiator_check)
+
class VMAXFCTest(test.TestCase):
def setUp(self):
diff --git a/cinder/volume/drivers/dell_emc/vmax/common.py b/cinder/volume/drivers/dell_emc/vmax/common.py
index b2cab11cf57..cdbea9cf0fe 100644
--- a/cinder/volume/drivers/dell_emc/vmax/common.py
+++ b/cinder/volume/drivers/dell_emc/vmax/common.py
@@ -164,13 +164,7 @@ class VMAXCommon(object):
:returns: flag
"""
- conf_string = (self.configuration.safe_get('initiator_check'))
- ret_val = False
- string_true = "True"
- if conf_string:
- if conf_string.lower() == string_true.lower():
- ret_val = True
- return ret_val
+ return self.configuration.safe_get('initiator_check')
def _get_replication_info(self):
"""Gather replication information, if provided."""