openstack
/
cinder
Code Issues Proposed changes

Merge "LioAdm: Delete initiator from targets on terminate_connection"

This commit is contained in:
Jenkins 2014-10-28 21:01:01 +00:00 committed by Gerrit Code Review
parent 32235ffda0 641a44eb17
commit 8fef1b7b3e
4 changed files with 62 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bin/cinder-rtstool
View File

@ -81,7 +81,7 @@ def create(backing_device, name, userid, password, initiator_iqns=None):
pass
def add_initiator(target_iqn, initiator_iqn, userid, password):
def _lookup_target(target_iqn, initiator_iqn):
try:
rtsroot = rtslib.root.RTSRoot()
except rtslib.utils.RTSLibError:
@ -89,14 +89,14 @@ def add_initiator(target_iqn, initiator_iqn, userid, password):
raise
# Look for the target
target = None
for t in rtsroot.targets:
if t.dump()['wwn'] == target_iqn:
target = t
break
if target is None:
raise RtstoolError(_('Could not find target %s') % target_iqn)
return t
raise RtstoolError(_('Could not find target %s') % target_iqn)
def add_initiator(target_iqn, initiator_iqn, userid, password):
target = _lookup_target(target_iqn, initiator_iqn)
tpg = target.tpgs.next() # get the first one
for acl in tpg.dump()['node_acls']:
# See if this ACL configuration already exists
@ -111,6 +111,17 @@ def add_initiator(target_iqn, initiator_iqn, userid, password):
rtslib.MappedLUN(acl_new, 0, tpg_lun=0)
def delete_initiator(target_iqn, initiator_iqn):
target = _lookup_target(target_iqn, initiator_iqn)
tpg = target.tpgs.next() # get the first one
for acl in tpg.node_acls:
if acl.node_wwn == initiator_iqn:
acl.delete()
return
raise RtstoolError(_('Could not find ACL %(acl)s in target %(target)s')
% {'target': target_iqn, 'acl': initiator_iqn})
def get_targets():
rtsroot = rtslib.root.RTSRoot()
for x in rtsroot.targets:
@ -147,6 +158,8 @@ def usage():
" <initiator_iqn,iqn2,iqn3,...>")
print(sys.argv[0] +
" add-initiator [target_iqn] [userid] [password] [initiator_iqn]")
print(sys.argv[0] +
" delete-initiator [target_iqn] [initiator_iqn]")
print(sys.argv[0] + " get-targets")
print(sys.argv[0] + " delete [iqn]")
print(sys.argv[0] + " verify")
@ -189,6 +202,15 @@ def main(argv=None):
add_initiator(target_iqn, initiator_iqn, userid, password)
elif argv[1] == 'delete-initiator':
if len(argv) < 4:
usage()
target_iqn = argv[2]
initiator_iqn = argv[3]
delete_initiator(target_iqn, initiator_iqn)
elif argv[1] == 'get-targets':
get_targets()

16
cinder/brick/iscsi/iscsi.py
View File

@ -594,7 +594,21 @@ class LioAdm(TargetAdmin):
connector['initiator'],
run_as_root=True)
except putils.ProcessExecutionError:
LOG.error(_("Failed to add initiator iqn %s to target") %
LOG.error(_("Failed to add initiator iqn %s to target.") %
connector['initiator'])
raise exception.ISCSITargetAttachFailed(volume_id=volume['id'])
def terminate_connection(self, volume, connector):
volume_iqn = volume['provider_location'].split(' ')[1]
# Delete initiator iqns from target ACL
try:
self._execute('cinder-rtstool', 'delete-initiator',
volume_iqn,
connector['initiator'],
run_as_root=True)
except putils.ProcessExecutionError:
LOG.error(_("Failed to delete initiator iqn %s to target.") %
connector['initiator'])
raise exception.ISCSITargetAttachFailed(volume_id=volume['id'])

18
cinder/tests/test_iscsi.py
View File

@ -18,6 +18,8 @@ import shutil
import string
import tempfile
from oslo.config import cfg
from cinder.brick.iscsi import iscsi
from cinder import test
from cinder.volume import driver
@ -34,6 +36,8 @@ class TargetAdminTestCase(object):
self.path = '/foo'
self.vol_id = 'blaa'
self.vol_name = 'volume-blaa'
self.portal = 'portal:3260,1'
self.initiator = 'iqn.1994-05.org.foo.bar:test'
self.chap_username = 'test_id'
self.chap_password = 'test_pass'
self.write_cache = 'off'
@ -50,7 +54,6 @@ class TargetAdminTestCase(object):
self.driver = driver.ISCSIDriver()
self.stubs.Set(iscsi.TgtAdm, '_verify_backing_lun',
self.fake_verify_backing_lun)
self.driver = driver.ISCSIDriver()
self.flags(iscsi_target_prefix='iqn.2011-09.org.foo.bar:')
self.persist_tempdir = tempfile.mkdtemp()
self.addCleanup(self._cleanup, self.persist_tempdir)
@ -69,6 +72,7 @@ class TargetAdminTestCase(object):
'target_name': self.target_name,
'lun': self.lun,
'path': self.path,
'initiator': self.initiator,
'username': self.chap_username,
'password': self.chap_password}
@ -110,6 +114,15 @@ class TargetAdminTestCase(object):
self.lun, self.path, chap_auth,
write_cache=self.write_cache)
target_helper.show_target(self.tid, iqn=self.target_name)
if cfg.CONF.iscsi_helper == 'lioadm':
volume = {'provider_location': ' '.join([self.portal,
self.target_name]),
'provider_auth': ' '.join(['CHAP',
self.chap_username,
self.chap_password])}
connector = {'initiator': self.initiator}
target_helper.initialize_connection(volume, connector)
target_helper.terminate_connection(volume, connector)
target_helper.remove_iscsi_target(self.tid, self.lun, self.vol_id,
self.vol_name)
@ -226,6 +239,9 @@ class LioAdmTestCase(test.TestCase, TargetAdminTestCase):
self.script_template = "\n".join([
'cinder-rtstool create '
'%(path)s %(target_name)s %(username)s %(password)s',
'cinder-rtstool add-initiator '
'%(target_name)s %(username)s %(password)s %(initiator)s',
'cinder-rtstool delete-initiator %(target_name)s %(initiator)s',
'cinder-rtstool delete %(target_name)s'])

3
cinder/volume/driver.py
View File

@ -1056,7 +1056,8 @@ class ISCSIDriver(VolumeDriver):
raise exception.VolumeBackendAPIException(data=err_msg)
def terminate_connection(self, volume, connector, **kwargs):
pass
if CONF.iscsi_helper == 'lioadm':
self.target_helper.terminate_connection(volume, connector)
def get_volume_stats(self, refresh=False):
"""Get volume stats.