openstack
/
manila
Code Issues Proposed changes

Merge "Fix HP3PAR SMB extra-specs for ABE and CA"

This commit is contained in:
Jenkins 2015-08-14 22:15:13 +00:00 committed by Gerrit Code Review
parent 02f59958d9 a9bee6e464
commit 0301a92f0d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manila/share/drivers/hp/hp_3par_mediator.py
View File

@ -40,6 +40,11 @@ OPEN_STACK_MANILA_FSHARE = 'OpenStack Manila fshare'
CACHE = 'cache'
CONTINUOUS_AVAIL = 'continuous_avail'
ACCESS_BASED_ENUM = 'access_based_enum'
SMB_EXTRA_SPECS_MAP = {
CACHE: CACHE,
CONTINUOUS_AVAIL: 'ca',
ACCESS_BASED_ENUM: 'abe',
}
class HP3ParMediator(object):
@ -238,7 +243,8 @@ class HP3ParMediator(object):
for smb_opt in smb_opts:
opt_value = extra_specs.get('hp_3par:smb_%s' % smb_opt)
if opt_value:
createfshare_kwargs[smb_opt] = opt_value
opt_key = SMB_EXTRA_SPECS_MAP[smb_opt]
createfshare_kwargs[opt_key] = opt_value
return createfshare_kwargs
def create_share(self, project_id, share_id, share_proto, extra_specs,

3
manila/tests/share/drivers/hp/test_hp_3par_mediator.py
View File

@ -262,7 +262,8 @@ class HP3ParMediatorTestCase(test.TestCase):
for smb_opt in smb_opts:
opt_value = extra_specs.get('hp_3par:smb_%s' % smb_opt)
if opt_value:
createfshare_kwargs[smb_opt] = opt_value
opt_key = hp3parmediator.SMB_EXTRA_SPECS_MAP[smb_opt]
createfshare_kwargs[opt_key] = opt_value
expected_calls = [
mock.call.createfstore(expected_vfsname, expected_project_id,