summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-07-13 20:35:32 +0000
committerGerrit Code Review <review@openstack.org>2018-07-13 20:35:32 +0000
commit098c8acf71ac6733cdd1dc18be78ee63a3df3d42 (patch)
tree2f46b9ea0936022049a73b1e3f7f127cd358cdb8
parentf67180d8b065b92f543b64ed3b92241a4b2fb04f (diff)
parent792eea0a12bd97f69294ad0570ac330a3f1fe423 (diff)
Merge "NetApp ONTAP: Remove iSCSI/FC driver online volume extend support"
-rw-r--r--cinder/tests/unit/volume/drivers/netapp/dataontap/test_block_cmode.py1
-rw-r--r--cinder/volume/drivers/netapp/dataontap/block_cmode.py1
-rw-r--r--releasenotes/notes/bug-1765182-34fdc4bb8482f8a5.yaml6
3 files changed, 8 insertions, 0 deletions
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 b1f487c..b62ce49 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):
431 'netapp_raid_type': 'raid_dp', 431 'netapp_raid_type': 'raid_dp',
432 'netapp_disk_type': 'SSD', 432 'netapp_disk_type': 'SSD',
433 'replication_enabled': False, 433 'replication_enabled': False,
434 'online_extend_support': False,
434 }] 435 }]
435 436
436 expected[0].update({'QoS_support': cluster_credentials}) 437 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 42c9020..4d01e8f 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,
296 # Add driver capabilities and config info 296 # Add driver capabilities and config info
297 pool['QoS_support'] = self.using_cluster_credentials 297 pool['QoS_support'] = self.using_cluster_credentials
298 pool['multiattach'] = False 298 pool['multiattach'] = False
299 pool['online_extend_support'] = False
299 pool['consistencygroup_support'] = True 300 pool['consistencygroup_support'] = True
300 pool['consistent_group_snapshot_enabled'] = True 301 pool['consistent_group_snapshot_enabled'] = True
301 pool['reserved_percentage'] = self.reserved_percentage 302 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 0000000..ade041f
--- /dev/null
+++ b/releasenotes/notes/bug-1765182-34fdc4bb8482f8a5.yaml
@@ -0,0 +1,6 @@
1---
2fixes:
3 - |
4 NetApp ONTAP (bug 1765182): Make ONTAP NetApp iSCSI driver and FC driver
5 report to the Cinder scheduler that they don't support online volume
6 extending.