openstack/cinder
Code Issues Proposed changes

Merge "Dell EMC Ps: Report discard support"

Browse Source
This commit is contained in:
Jenkins 2017-02-12 19:17:00 +00:00 committed by Gerrit Code Review
commit 9f9085e488
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinder/tests/unit/volume/drivers/dell_emc/test_ps.py
View File

@ -89,7 +89,8 @@ class PSSeriesISCSIDriverTestCase(test.TestCase):
'target_discovered': True,
'target_portal': '%s:3260' % self.driver._group_ip,
'target_iqn': self.fake_iqn,
'volume_id': 1}
'volume_id': 1,
'discard': True}
self._model_update = {
'provider_location': "%s:3260,1 %s 0" % (self.driver._group_ip,
self.fake_iqn),
@ -332,6 +333,7 @@ class PSSeriesISCSIDriverTestCase(test.TestCase):
volume, self.connector)
self.assertEqual(self._fake_get_iscsi_properties(volume),
iscsi_properties['data'])
self.assertTrue(iscsi_properties['data']['discard'])
def test_terminate_connection(self):
def my_side_effect(*args, **kwargs):

4
cinder/volume/drivers/dell_emc/ps.py
View File

@ -134,10 +134,11 @@ class PSSeriesISCSIDriver(san.SanISCSIDriver):
1.4.0 - Removed deprecated options eqlx_cli_timeout, eqlx_use_chap,
eqlx_chap_login, and eqlx_chap_password.
1.4.1 - Rebranded driver to Dell EMC.
1.4.2 - Enable report discard support.
"""
VERSION = "1.4.1"
VERSION = "1.4.2"
# ThirdPartySytems wiki page
CI_WIKI_NAME = "Dell_Storage_CI"
@ -540,6 +541,7 @@ class PSSeriesISCSIDriver(san.SanISCSIDriver):
self.configuration.chap_username])
self._eql_execute(*cmd)
iscsi_properties = self._get_iscsi_properties(volume)
iscsi_properties['discard'] = True
return {
'driver_volume_type': 'iscsi',
'data': iscsi_properties