summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-07-13 20:35:35 +0000
committerGerrit Code Review <review@openstack.org>2018-07-13 20:35:35 +0000
commit829fdc89169d1401714693323972f31675045041 (patch)
tree923fef312aff0fd44f3c8c08d01344e07d38c2e1
parent098c8acf71ac6733cdd1dc18be78ee63a3df3d42 (diff)
parent40d50eccdef9cc1b42bb8e24e6b641b20213720d (diff)
Merge "NetApp ONTAP: Remove NFS driver online volume extending support"
-rw-r--r--cinder/tests/unit/volume/drivers/netapp/dataontap/test_nfs_cmode.py1
-rw-r--r--cinder/volume/drivers/netapp/dataontap/nfs_cmode.py1
-rw-r--r--releasenotes/notes/bug-1765182-de132ba52167800b.yaml5
3 files changed, 7 insertions, 0 deletions
diff --git a/cinder/tests/unit/volume/drivers/netapp/dataontap/test_nfs_cmode.py b/cinder/tests/unit/volume/drivers/netapp/dataontap/test_nfs_cmode.py
index a93d2ad..9e99806 100644
--- a/cinder/tests/unit/volume/drivers/netapp/dataontap/test_nfs_cmode.py
+++ b/cinder/tests/unit/volume/drivers/netapp/dataontap/test_nfs_cmode.py
@@ -246,6 +246,7 @@ class NetAppCmodeNfsDriverTestCase(test.TestCase):
246 'consistencygroup_support': True, 246 'consistencygroup_support': True,
247 'consistent_group_snapshot_enabled': True, 247 'consistent_group_snapshot_enabled': True,
248 'replication_enabled': False, 248 'replication_enabled': False,
249 'online_extend_support': False,
249 }] 250 }]
250 251
251 expected[0].update({'QoS_support': cluster_credentials}) 252 expected[0].update({'QoS_support': cluster_credentials})
diff --git a/cinder/volume/drivers/netapp/dataontap/nfs_cmode.py b/cinder/volume/drivers/netapp/dataontap/nfs_cmode.py
index 0163d5e..deea4e0 100644
--- a/cinder/volume/drivers/netapp/dataontap/nfs_cmode.py
+++ b/cinder/volume/drivers/netapp/dataontap/nfs_cmode.py
@@ -274,6 +274,7 @@ class NetAppCmodeNfsDriver(nfs_base.NetAppNfsDriver,
274 pool['consistencygroup_support'] = True 274 pool['consistencygroup_support'] = True
275 pool['consistent_group_snapshot_enabled'] = True 275 pool['consistent_group_snapshot_enabled'] = True
276 pool['multiattach'] = True 276 pool['multiattach'] = True
277 pool['online_extend_support'] = False
277 278
278 # Add up-to-date capacity info 279 # Add up-to-date capacity info
279 nfs_share = ssc_vol_info['pool_name'] 280 nfs_share = ssc_vol_info['pool_name']
diff --git a/releasenotes/notes/bug-1765182-de132ba52167800b.yaml b/releasenotes/notes/bug-1765182-de132ba52167800b.yaml
new file mode 100644
index 0000000..6c2d472
--- /dev/null
+++ b/releasenotes/notes/bug-1765182-de132ba52167800b.yaml
@@ -0,0 +1,5 @@
1---
2fixes:
3 - |
4 NetApp ONTAP (bug 1765182): Make ONTAP NetApp NFS driver report to the
5 Cinder scheduler that it doesn't support online volume extending.