From 26cfe4b3d1b10834a72cacdaaa5ae089e94c4e19 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Fri, 8 Jan 2016 08:43:35 -0600 Subject: [PATCH] Report discard support for Dell SC connections Add reporting of discard in the properties returned from initialize_connection. Dell SC arrays support trim/discard with no special configuration needed, so this can always be set to true. Change-Id: Ib0136369e230b5219b2b3994d17b6b31a9aba69f --- cinder/tests/unit/test_dellfc.py | 3 ++- cinder/volume/drivers/dell/dell_storagecenter_fc.py | 6 +++--- cinder/volume/drivers/dell/dell_storagecenter_iscsi.py | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cinder/tests/unit/test_dellfc.py b/cinder/tests/unit/test_dellfc.py index 05f64b04a..991b7c121 100644 --- a/cinder/tests/unit/test_dellfc.py +++ b/cinder/tests/unit/test_dellfc.py @@ -204,7 +204,8 @@ class DellSCSanFCDriverTestCase(test.TestCase): connector = self.connector res = self.driver.initialize_connection(volume, connector) expected = {'data': - {'initiator_target_map': + {'discard': True, + 'initiator_target_map': {u'21000024FF30441C': [u'5000D31000FCBE35'], u'21000024FF30441D': [u'5000D31000FCBE3D']}, 'target_discovered': True, diff --git a/cinder/volume/drivers/dell/dell_storagecenter_fc.py b/cinder/volume/drivers/dell/dell_storagecenter_fc.py index 40853b073..0d273e7c3 100644 --- a/cinder/volume/drivers/dell/dell_storagecenter_fc.py +++ b/cinder/volume/drivers/dell/dell_storagecenter_fc.py @@ -98,9 +98,9 @@ class DellStorageCenterFCDriver(dell_storagecenter_common.DellCommonDriver, 'target_discovered': True, 'target_wwn': targets, 'initiator_target_map': - init_targ_map}} - LOG.debug('Return FC data:') - LOG.debug(data) + init_targ_map, + 'discard': True}} + LOG.debug('Return FC data: %s', data) return data LOG.error(_LE('Lun mapping returned null!')) diff --git a/cinder/volume/drivers/dell/dell_storagecenter_iscsi.py b/cinder/volume/drivers/dell/dell_storagecenter_iscsi.py index 0da98c9a6..434c01ee9 100644 --- a/cinder/volume/drivers/dell/dell_storagecenter_iscsi.py +++ b/cinder/volume/drivers/dell/dell_storagecenter_iscsi.py @@ -123,6 +123,7 @@ class DellStorageCenterISCSIDriver(dell_storagecenter_common.DellCommonDriver, port)) # Return our iscsi properties. + iscsiprops['discard'] = True return {'driver_volume_type': 'iscsi', 'data': iscsiprops} # Re-raise any backend exception. -- 2.45.2