Merge "NetApp: Report multiattach as enabled"

This commit is contained in:
Jenkins 2016-08-25 21:17:09 +00:00 committed by Gerrit Code Review
commit 4e178ba3af
10 changed files with 14 additions and 0 deletions

@ -376,6 +376,7 @@ FAKE_7MODE_POOLS = [
'total_capacity_gb': 0.0,
'free_capacity_gb': 0.0,
'max_over_subscription_ratio': 20.0,
'multiattach': True,
'thin_provisioning_support': False,
'thick_provisioning_support': True,
'provisioned_capacity_gb': 0.0,

@ -560,6 +560,7 @@ class NetAppBlockStorage7modeLibraryTestCase(test.TestCase):
'total_capacity_gb': 1342.21,
'reserved_percentage': 5,
'max_over_subscription_ratio': 10.0,
'multiattach': True,
'utilization': 30.0,
'filter_function': 'filter',
'goodness_function': 'goodness',

@ -397,6 +397,7 @@ class NetAppBlockStorageCmodeLibraryTestCase(test.TestCase):
'consistencygroup_support': True,
'reserved_percentage': 5,
'max_over_subscription_ratio': 10.0,
'multiattach': True,
'total_capacity_gb': 10.0,
'free_capacity_gb': 2.0,
'provisioned_capacity_gb': 8.0,

@ -123,6 +123,7 @@ class NetApp7modeNfsDriverTestCase(test.TestCase):
'total_capacity_gb': 4468.0,
'reserved_percentage': 7,
'max_over_subscription_ratio': 19.0,
'multiattach': True,
'provisioned_capacity_gb': 4456.0,
'utilization': 30.0,
'filter_function': 'filter',

@ -206,6 +206,7 @@ class NetAppCmodeNfsDriverTestCase(test.TestCase):
'QoS_support': True,
'reserved_percentage': fake.RESERVED_PERCENTAGE,
'max_over_subscription_ratio': fake.MAX_OVER_SUBSCRIPTION_RATIO,
'multiattach': True,
'total_capacity_gb': total_capacity_gb,
'free_capacity_gb': free_capacity_gb,
'provisioned_capacity_gb': provisioned_capacity_gb,

@ -301,6 +301,7 @@ class NetAppBlockStorage7modeLibrary(block_base.NetAppBlockStorageLibrary):
pool = dict()
pool['pool_name'] = volume_name
pool['QoS_support'] = False
pool['multiattach'] = True
pool['reserved_percentage'] = (
self.reserved_percentage)
pool['max_over_subscription_ratio'] = (

@ -271,6 +271,7 @@ class NetAppBlockStorageCmodeLibrary(block_base.NetAppBlockStorageLibrary,
# Add driver capabilities and config info
pool['QoS_support'] = True
pool['multiattach'] = True
pool['consistencygroup_support'] = True
pool['reserved_percentage'] = self.reserved_percentage
pool['max_over_subscription_ratio'] = (

@ -132,6 +132,7 @@ class NetApp7modeNfsDriver(nfs_base.NetAppNfsDriver):
pool = dict()
pool['pool_name'] = nfs_share
pool['QoS_support'] = False
pool['multiattach'] = True
pool.update(capacity)
thick = not self.configuration.nfs_sparsed_volumes

@ -239,6 +239,7 @@ class NetAppCmodeNfsDriver(nfs_base.NetAppNfsDriver,
# Add driver capabilities and config info
pool['QoS_support'] = True
pool['consistencygroup_support'] = True
pool['multiattach'] = True
# Add up-to-date capacity info
nfs_share = ssc_vol_info['pool_name']

@ -0,0 +1,5 @@
---
fixes:
- Volumes created on NetApp cDOT and 7mode storage systems now
report 'multiattach' capability. They have always supported such a
capability, but not reported it to Cinder.