From c816be897e7ab1c95b38979b2cc94ecf179e44e7 Mon Sep 17 00:00:00 2001
From: Ryan Liang <ryan.liang@emc.com>
Date: Wed, 28 Mar 2018 07:30:39 +0000
Subject: [PATCH] Unity: fail to detach lun when auto zone enabled

When the lun is the last one attached to the host and it is detached,
the attribute `host.host_luns` is None. Use `not` in if statement which
is pythonic in checking None and empty list of `host.host_luns`.

Change-Id: I5d8f63f9a78d001bc699af538f586aab8d73a5cf
Closes-bug: #1759175
---
 .../volume/drivers/dell_emc/unity/test_adapter.py   | 13 +++++++++++++
 .../volume/drivers/dell_emc/unity/test_client.py    |  2 ++
 cinder/volume/drivers/dell_emc/unity/adapter.py     |  2 +-
 ...lun-when-auto-zone-enabled-9c87b18a3acac9d1.yaml |  7 +++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 releasenotes/notes/fail-detach-lun-when-auto-zone-enabled-9c87b18a3acac9d1.yaml

diff --git a/cinder/tests/unit/volume/drivers/dell_emc/unity/test_adapter.py b/cinder/tests/unit/volume/drivers/dell_emc/unity/test_adapter.py
index ac273c9c471..956a690d026 100644
--- a/cinder/tests/unit/volume/drivers/dell_emc/unity/test_adapter.py
+++ b/cinder/tests/unit/volume/drivers/dell_emc/unity/test_adapter.py
@@ -795,6 +795,19 @@ class FCAdapterTest(test.TestCase):
         target_wwn = ['100000051e55a100', '100000051e55a121']
         self.assertListEqual(target_wwn, data['target_wwn'])
 
+    def test_terminate_connection_auto_zone_enabled_none_host_luns(self):
+        connector = {'host': 'host-no-host_luns', 'wwpns': 'abcdefg'}
+        volume = MockOSResource(provider_location='id^lun_41', id='id_41')
+        ret = self.adapter.terminate_connection(volume, connector)
+        self.assertEqual('fibre_channel', ret['driver_volume_type'])
+        data = ret['data']
+        target_map = {
+            '200000051e55a100': ('100000051e55a100', '100000051e55a121'),
+            '200000051e55a121': ('100000051e55a100', '100000051e55a121')}
+        self.assertDictEqual(target_map, data['initiator_target_map'])
+        target_wwn = ['100000051e55a100', '100000051e55a121']
+        self.assertListEqual(target_wwn, data['target_wwn'])
+
     def test_validate_ports_whitelist_none(self):
         ports = self.adapter.validate_ports(None)
         self.assertEqual(set(('spa_iom_0_fc0', 'spa_iom_0_fc1')), set(ports))
diff --git a/cinder/tests/unit/volume/drivers/dell_emc/unity/test_client.py b/cinder/tests/unit/volume/drivers/dell_emc/unity/test_client.py
index 8b0da9b9d0c..db7d78df5a1 100644
--- a/cinder/tests/unit/volume/drivers/dell_emc/unity/test_client.py
+++ b/cinder/tests/unit/volume/drivers/dell_emc/unity/test_client.py
@@ -161,6 +161,8 @@ class MockResource(object):
 
     @property
     def host_luns(self):
+        if self.name == 'host-no-host_luns':
+            return None
         return []
 
     @property
diff --git a/cinder/volume/drivers/dell_emc/unity/adapter.py b/cinder/volume/drivers/dell_emc/unity/adapter.py
index 0bdb759b0e2..0d501d17bc9 100644
--- a/cinder/volume/drivers/dell_emc/unity/adapter.py
+++ b/cinder/volume/drivers/dell_emc/unity/adapter.py
@@ -755,7 +755,7 @@ class FCAdapter(CommonAdapter):
                 'data': {}
             }
             host = self.client.create_host(connector['host'])
-            if len(host.host_luns) == 0:
+            if not host.host_luns:
                 targets = self.client.get_fc_target_info(
                     logged_in_only=True, allowed_ports=self.allowed_ports)
                 ret['data'] = self._get_fc_zone_info(connector['wwpns'],
diff --git a/releasenotes/notes/fail-detach-lun-when-auto-zone-enabled-9c87b18a3acac9d1.yaml b/releasenotes/notes/fail-detach-lun-when-auto-zone-enabled-9c87b18a3acac9d1.yaml
new file mode 100644
index 00000000000..be3b59cb7f4
--- /dev/null
+++ b/releasenotes/notes/fail-detach-lun-when-auto-zone-enabled-9c87b18a3acac9d1.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Dell EMC Unity Driver: Fixes `bug 1759175
+    <https://bugs.launchpad.net/cinder/+bug/1759175>`__
+    to detach the lun correctly when auto zone was enabled and the lun was the
+    last one attached to the host.