From 792eea0a12bd97f69294ad0570ac330a3f1fe423 Mon Sep 17 00:00:00 2001
From: Lucio Seki <luciomitsuru.seki@fit-tecnologia.org.br>
Date: Thu, 24 May 2018 18:21:13 -0300
Subject: [PATCH] NetApp ONTAP: Remove iSCSI/FC driver online volume extend
 support

Cinder scheduler now checks backend capability online_extend_support
before performing an online volume extend operation. This patch makes
NetApp ONTAP iSCSI driver and FC driver report to the scheduler that
they don't support this feature, thus avoiding leaving a volume in
error_extending state after an online extending attempt.

Change-Id: Ifa248a0d3518aeffe2b6d12b064cbee9b8f48f94
Depends-On: I2c31b5c171574074a8fc7ba86f94f983fc9658f7
Related-Bug: #1765182
---
 .../volume/drivers/netapp/dataontap/test_block_cmode.py     | 1 +
 cinder/volume/drivers/netapp/dataontap/block_cmode.py       | 1 +
 releasenotes/notes/bug-1765182-34fdc4bb8482f8a5.yaml        | 6 ++++++
 3 files changed, 8 insertions(+)
 create mode 100644 releasenotes/notes/bug-1765182-34fdc4bb8482f8a5.yaml

diff --git a/cinder/tests/unit/volume/drivers/netapp/dataontap/test_block_cmode.py b/cinder/tests/unit/volume/drivers/netapp/dataontap/test_block_cmode.py
index b1f487c9992..b62ce499f1a 100644
--- a/cinder/tests/unit/volume/drivers/netapp/dataontap/test_block_cmode.py
+++ b/cinder/tests/unit/volume/drivers/netapp/dataontap/test_block_cmode.py
@@ -431,6 +431,7 @@ class NetAppBlockStorageCmodeLibraryTestCase(test.TestCase):
             'netapp_raid_type': 'raid_dp',
             'netapp_disk_type': 'SSD',
             'replication_enabled': False,
+            'online_extend_support': False,
         }]
 
         expected[0].update({'QoS_support': cluster_credentials})
diff --git a/cinder/volume/drivers/netapp/dataontap/block_cmode.py b/cinder/volume/drivers/netapp/dataontap/block_cmode.py
index 42c90201460..4d01e8fb632 100644
--- a/cinder/volume/drivers/netapp/dataontap/block_cmode.py
+++ b/cinder/volume/drivers/netapp/dataontap/block_cmode.py
@@ -296,6 +296,7 @@ class NetAppBlockStorageCmodeLibrary(block_base.NetAppBlockStorageLibrary,
             # Add driver capabilities and config info
             pool['QoS_support'] = self.using_cluster_credentials
             pool['multiattach'] = False
+            pool['online_extend_support'] = False
             pool['consistencygroup_support'] = True
             pool['consistent_group_snapshot_enabled'] = True
             pool['reserved_percentage'] = self.reserved_percentage
diff --git a/releasenotes/notes/bug-1765182-34fdc4bb8482f8a5.yaml b/releasenotes/notes/bug-1765182-34fdc4bb8482f8a5.yaml
new file mode 100644
index 00000000000..ade041f4e96
--- /dev/null
+++ b/releasenotes/notes/bug-1765182-34fdc4bb8482f8a5.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    NetApp ONTAP (bug 1765182): Make ONTAP NetApp iSCSI driver and FC driver
+    report to the Cinder scheduler that they don't support online volume
+    extending.