openstack
/
cinder
Code Issues Proposed changes

Fixes the use of exception.InvalidInput with the wrong arguments 

A mapping key of 'message' in exception.InvalidInput is 'reason'.
cinder/volume/drivers/netapp/iscsi.py and
cinder/volume/drivers/netapp/utils.py had used 'data'.

Change-Id: Ie40fc2f954984350827414edee9226adc80c8033
Closes-Bug: #1224790
This commit is contained in:
KIYOHIRO ADACHI 2013-09-13 14:13:53 +09:00
parent ae75e3f835
commit 996f7f9490
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/volume/drivers/netapp/iscsi.py
View File

@ -129,7 +129,7 @@ class NetAppDirectISCSIDriver(driver.ISCSIDriver):
for flag in required_flags:
if not getattr(self.configuration, flag, None):
msg = _('%s is not set') % flag
raise exception.InvalidInput(data=msg)
raise exception.InvalidInput(reason=msg)
def do_setup(self, context):
"""Setup the NetApp Volume driver.

2
cinder/volume/drivers/netapp/utils.py
View File

@ -146,7 +146,7 @@ def invoke_api(na_server, api_name, api_family='cm', query=None,
record_step = 50
if not (na_server or isinstance(na_server, NaServer)):
msg = _("Requires an NaServer instance.")
raise exception.InvalidInput(data=msg)
raise exception.InvalidInput(reason=msg)
server = copy.copy(na_server)
if api_family == 'cm':
server.set_vserver(tunnel)