Merge "Fix thin provisioning flags in NetApp drivers"

This commit is contained in:
Jenkins 2016-01-28 20:05:34 +00:00 committed by Gerrit Code Review
commit c9457d1452
5 changed files with 12 additions and 12 deletions

View File

@ -231,8 +231,8 @@ FAKE_CMODE_POOLS = [
'pool_name': 'open123',
'reserved_percentage': 0,
'total_capacity_gb': 4.65,
'thin_provisioned_support': True,
'thick_provisioned_support': False,
'thin_provisioning_support': True,
'thick_provisioning_support': False,
'provisioned_capacity_gb': 0.93,
'max_over_subscription_ratio': 20.0,
}
@ -334,8 +334,8 @@ FAKE_7MODE_POOLS = [
'total_capacity_gb': 0.0,
'free_capacity_gb': 0.0,
'max_over_subscription_ratio': 20.0,
'thin_provisioned_support': False,
'thick_provisioned_support': True,
'thin_provisioning_support': False,
'thick_provisioning_support': True,
'provisioned_capacity_gb': 0.0,
}
]

View File

@ -518,8 +518,8 @@ class NetAppBlockStorage7modeLibraryTestCase(test.TestCase):
expected = [{
'pool_name': 'vol1',
'QoS_support': False,
'thin_provisioned_support': not thick,
'thick_provisioned_support': thick,
'thin_provisioning_support': not thick,
'thick_provisioning_support': thick,
'provisioned_capacity_gb': 2.94,
'free_capacity_gb': 1339.27,
'total_capacity_gb': 1342.21,

View File

@ -362,8 +362,8 @@ class NetAppBlockStorageCmodeLibraryTestCase(test.TestCase):
expected = [{'pool_name': 'vola',
'netapp_unmirrored': 'true',
'QoS_support': True,
'thin_provisioned_support': not thick,
'thick_provisioned_support': thick,
'thin_provisioning_support': not thick,
'thick_provisioning_support': thick,
'provisioned_capacity_gb': 8.0,
'netapp_thick_provisioned': netapp_thick,
'netapp_nocompression': 'true',

View File

@ -307,8 +307,8 @@ class NetAppBlockStorage7modeLibrary(block_base.NetAppBlockStorageLibrary):
thick = (
self.configuration.netapp_lun_space_reservation == 'enabled')
pool['thick_provisioned_support'] = thick
pool['thin_provisioned_support'] = not thick
pool['thick_provisioning_support'] = thick
pool['thin_provisioning_support'] = not thick
pools.append(pool)

View File

@ -247,8 +247,8 @@ class NetAppBlockStorageCmodeLibrary(block_base.NetAppBlockStorageLibrary):
thick = (not thin and
self.configuration.netapp_lun_space_reservation
== 'enabled')
pool['thick_provisioned_support'] = thick
pool['thin_provisioned_support'] = not thick
pool['thick_provisioning_support'] = thick
pool['thin_provisioning_support'] = not thick
pools.append(pool)