openstack/deb-cinder
Code Issues Proposed changes

Allow rexports for targets with Datera

Browse Source 
Sometimes due to timing, rexporting a target would fail. This will
verify with Datera if a target already exists, or if it should recreate
an export.

Change-Id: I9c40603cbb525c23e010285bdc66efaaaf4be142
Closes-Bug: #1452838
This commit is contained in:
Mike Perez
2015-05-07 12:09:45 -07:00
parent daa751a62e
commit 76a7bd4bb5
2 changed files with 104 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
cinder/volume/drivers/datera.py
View File

@@ -166,22 +166,31 @@ class DateraDriver(san.SanISCSIDriver):
def _do_export(self, context, volume):
"""Gets the associated account, retrieves CHAP info and updates."""
if volume['provider_location']:
return {'provider_location': volume['provider_location']}
portal = None
iqn = None
datera_volume = self._issue_api_request('volumes',
resource=volume['id'])
if len(datera_volume['targets']) == 0:
export = self._issue_api_request(
'volumes', action='export', method='post',
body={'ctype': 'TC_BLOCK_ISCSI'}, resource=volume['id'])
export = self._issue_api_request(
'volumes', action='export', method='post',
body={'ctype': 'TC_BLOCK_ISCSI'}, resource=volume['id'])
portal = "%s:3260" % export['_ipColl'][0]
# NOTE(thingee): Refer to the Datera test for a stub of what this looks
# like. We're just going to pull the first IP that the Datera cluster
# makes available for the portal.
iscsi_portal = export['_ipColl'][0] + ':3260'
iqn = export['targetIds'].itervalues().next()['ids'][0]['id']
# NOTE(thingee): Refer to the Datera test for a stub of what this
# looks like. We're just going to pull the first IP that the Datera
# cluster makes available for the portal.
iqn = export['targetIds'].itervalues().next()['ids'][0]['id']
else:
export = self._issue_api_request(
'export_configs',
resource=datera_volume['targets'][0]
)
portal = export['endpoint_addrs'][0] + ':3260'
iqn = export['endpoint_idents'][0]
provider_location = '%s %s %s' % (iscsi_portal, iqn, 0)
model_update = {'provider_location': provider_location}
return model_update
provider_location = '%s %s %s' % (portal, iqn, 0)
return {'provider_location': provider_location}
def ensure_export(self, context, volume):
return self._do_export(context, volume)