openstack
/
cinder
Code Issues Proposed changes

Merge "Hash password displays in debug log"

This commit is contained in:
Jenkins 2017-03-14 12:02:12 +00:00 committed by Gerrit Code Review
parent 1133f8e656 f085569be1
commit d4395bb538
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cinder/tests/unit/volume/drivers/dell_emc/test_xtremio.py
View File

@ -27,7 +27,6 @@ from cinder.tests.unit import fake_snapshot
from cinder.tests.unit.fake_volume import fake_volume_obj
from cinder.volume.drivers.dell_emc import xtremio
typ2id = {'volumes': 'vol-id',
'snapshots': 'vol-id',
'initiators': 'initiator-id',
@ -672,6 +671,14 @@ class XtremIODriverISCSITestCase(BaseXtremIODriverTestCase):
self.driver.initialize_connection(self.data.test_volume2,
self.data.connector)
@mock.patch('oslo_utils.strutils.mask_dict_password')
def test_initialize_connection_masks_password(self, mask_dict, req):
req.side_effect = xms_request
self.driver.create_volume(self.data.test_volume)
self.driver.initialize_connection(self.data.test_volume,
self.data.connector)
self.assertTrue(mask_dict.called)
def test_add_auth(self, req):
req.side_effect = xms_request
data = {}

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

@ -38,6 +38,7 @@ import string
from oslo_config import cfg
from oslo_log import log as logging
from oslo_utils import strutils
from oslo_utils import units
import six
@ -1015,7 +1016,8 @@ class XtremIOISCSIDriver(XtremIOVolumeDriver, driver.ISCSIDriver):
properties['discovery_auth_method'] = 'CHAP'
properties['discovery_auth_username'] = 'chap_user'
properties['discovery_auth_password'] = discovery_passwd
LOG.debug('init conn params:\n%s', properties)
LOG.debug('init conn params:\n%s',
strutils.mask_dict_password(properties))
return {
'driver_volume_type': 'iscsi',
'data': properties