Merge "Zfssaiscsi driver should return target_lun as int"

This commit is contained in:
Jenkins 2016-02-09 21:54:23 +00:00 committed by Gerrit Code Review
commit e88f0a486a
2 changed files with 2 additions and 2 deletions

View File

@ -456,7 +456,7 @@ class TestZFSSAISCSIDriver(test.TestCase):
self.assertEqual(lcfg.zfssa_target_portal,
props['data']['target_portal'])
self.assertEqual(test_target_iqn, props['data']['target_iqn'])
self.assertEqual('0', props['data']['target_lun'])
self.assertEqual(0, props['data']['target_lun'])
self.assertFalse(props['data']['target_discovered'])
self.drv.terminate_connection(self.test_vol, '')

View File

@ -713,7 +713,7 @@ class ZFSSAISCSIDriver(driver.ISCSIDriver):
iscsi_properties['target_discovered'] = False
iscsi_properties['target_portal'] = target_portal
iscsi_properties['target_iqn'] = iqn
iscsi_properties['target_lun'] = lun
iscsi_properties['target_lun'] = int(lun)
iscsi_properties['volume_id'] = volume['id']
if 'provider_auth' in provider: