upstream/oracle/userland-gate: comparison components/openstack/cinder/files/solaris/zfs.py

equal deleted inserted replaced

-:531789214c7c
+:26bcbec7afce
 # vim: tabstop=4 shiftwidth=4 softtabstop=4
 # Copyright (c) 2012 OpenStack LLC.
 # All Rights Reserved.
 #
-# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2017, Oracle and/or its affiliates. All rights reserved.
 #
 #    Licensed under the Apache License, Version 2.0 (the "License"); you may
 #    not use this file except in compliance with the License. You may obtain
 #    a copy of the License at
 #
 'zfs_volume_base': self.configuration.zfs_volume_base,
 'san_info': san_info})
 return status
-def check_for_setup_error(self):
+def do_setup(self, context):
-"""Check the setup error."""
+"""Check wwns and setup the target group."""
-wwns = self._get_wwns()
+self.wwns = self._get_wwns()
-if not wwns:
+if not self.wwns:
 msg = (_("Could not determine fibre channel world wide "
 "node names."))
 raise exception.VolumeBackendAPIException(data=msg)
+self.tg = 'tg-wwn-%s' % self.wwns[0]
+if not self._check_tg(self.tg):
+self._setup_tg(self.tg)
 def _get_wwns(self):
 """Get the FC port WWNs of the host."""
 (out, _err) = self._execute('/usr/sbin/fcinfo', 'hba-port', '-t')
 LOG.debug(_("Got the FC port WWN '%s'") % wwn)
 wwns.append(wwn)
 return wwns
-def _check_wwn_tg(self, wwn):
+def _get_target_wwns(self, tg):
-"""Check if the target group 'tg-wwn-xxx' exists."""
+"""Get the target members in the tg."""
-(out, _err) = self._execute('/usr/sbin/stmfadm', 'list-tg')
+(out, _err) = self._execute('/usr/sbin/stmfadm', 'list-tg',
+'-v', tg)
+wwns = []
 for line in [l.strip() for l in out.splitlines()]:
-if line.startswith("Target Group:") and wwn in line:
+if line.startswith("Member:"):
-tg = line.split()[-1]
+wwn = line.split()[-1]
-break
+target_wwn = wwn.split('.')[-1]
-else:
+wwns.append(target_wwn)
-LOG.debug(_("The target group 'tg-wwn-%s' doesn't exist.") % wwn)
+return wwns
-tg = None
+def _setup_tg(self, tg):
-return tg
+"""Setup the target group."""
+self._stmf_execute('/usr/sbin/stmfadm', 'create-tg', tg)
+# Add free target wwns into the target group
+for wwn in self.wwns:
+if not self._target_in_tg(wwn, None):
+target_wwn = 'wwn.%s' % wwn
+try:
+self._stmf_execute('/usr/sbin/stmfadm', 'offline-target',
+target_wwn)
+self._stmf_execute('/usr/sbin/stmfadm', 'add-tg-member',
+'-g', tg, target_wwn)
+self._stmf_execute('/usr/sbin/stmfadm', 'online-target',
+target_wwn)
+assert self._check_target(wwn, 'Channel') == 'Online'
+except:
+LOG.error(_LE("Failed to add and online the target '%s'.")
+% (target_wwn))
+target_wwns = self._get_target_wwns(tg)
+if not target_wwns:
+msg = (_("No target members exist in the target group '%s'.")
+% tg)
+raise exception.VolumeBackendAPIException(data=msg)
 def _only_lu(self, lu):
 """Check if the LU is the only one."""
 (out, _err) = self._execute('/usr/sbin/stmfadm', 'list-lu', '-v')
 linecount = 0
 if tg is not None:
 (out, _err) = self._execute('/usr/sbin/stmfadm', 'list-tg',
 '-v', tg)
 else:
 (out, _err) = self._execute('/usr/sbin/stmfadm', 'list-tg', '-v')
 for line in [l.strip() for l in out.splitlines()]:
 if line.startswith("Member:") and target in line:
 return True
-LOG.debug(_("The target '%s' is not in any target group.") % target)
+LOG.debug(_("The target '%s' is not in %s target group.") %
+(target, tg if tg else 'any'))
 return False
+def _force_lip_wwn(self):
+"""Force the link to reinitialize."""
+target_wwns = self._get_target_wwns(self.tg)
+for target_wwn in target_wwns:
+self._stmf_execute('/usr/sbin/fcadm', 'force-lip', target_wwn)
 def create_export(self, context, volume):
 """Export the volume."""
 # If the volume is already exported there is nothing to do, as we
 # simply export volumes and they are universally available.
 msg = (_("Failed to create logical unit for volume '%s' due "
 "to an existing LU id but no view.") % volume['name'])
 raise exception.VolumeBackendAPIException(data=msg)
 zvol = self._get_zvol_path(volume)
 # Create a Logical Unit (LU)
 self._stmf_execute('/usr/sbin/stmfadm', 'create-lu', zvol)
 luid = self._get_luid(volume)
 if not luid:
 msg = (_("Failed to create logic unit for volume '%s'")
 % volume['name'])
 raise exception.VolumeBackendAPIException(data=msg)
-wwns = self._get_wwns()
+# setup the target group if it doesn't exist.
-wwn = wwns[0]
+if not self._check_tg(self.tg):
-target_group = self._check_wwn_tg(wwn)
+self._setup_tg(self.tg)
-if target_group is None:
-target_group = 'tg-wwn-%s' % wwn
-if self._target_in_tg(wwn, None):
-msg = (_("Target WWN '%s' has been found in another"
-"target group, so it will not be added "
-"into the expected target group '%s'.") %
-(wwn, target_group))
-raise exception.VolumeBackendAPIException(data=msg)
-# Create a target group for the wwn
-self._stmf_execute('/usr/sbin/stmfadm', 'create-tg', target_group)
-# Enable the target and add it to the 'tg-wwn-xxx' group
-self._stmf_execute('/usr/sbin/stmfadm', 'offline-target',
-'wwn.%s' % wwn)
-self._stmf_execute('/usr/sbin/stmfadm', 'add-tg-member', '-g',
-target_group, 'wwn.%s' % wwn)
 # Add a logical unit view entry
-# TODO(Strony): replace the auto assigned LUN with '-n' option
+self._stmf_execute('/usr/sbin/stmfadm', 'add-view', '-t',
-if luid is not None:
+self.tg, luid)
-self._stmf_execute('/usr/sbin/stmfadm', 'add-view', '-t',
+self._force_lip_wwn()
-target_group, luid)
-self._stmf_execute('/usr/sbin/stmfadm', 'online-target',
-'wwn.%s' % wwn)
-assert self._target_in_tg(wwn, target_group)
 def remove_export(self, context, volume):
 """Remove an export for a volume."""
 luid = self._get_luid(volume)
 if luid is not None:
-wwns = self._get_wwns()
+target_group = self.tg
-wwn = wwns[0]
-target_wwn = 'wwn.%s' % wwn
-target_group = 'tg-wwn-%s' % wwn
 view_lun = self._get_view_and_lun(luid)
 if view_lun['view']:
 self._stmf_execute('/usr/sbin/stmfadm', 'remove-view', '-l',
 luid, view_lun['view'])
-# Remove the target group when only one LU exists.
+# Remove the target group when the LU to be deleted is last one
+# exposed by the target group.
 if self._only_lu(luid):
-if self._check_target(target_wwn, 'Channel') == 'Online':
-self._stmf_execute('/usr/sbin/stmfadm', 'offline-target',
-target_wwn)
 if self._check_tg(target_group):
 self._stmf_execute('/usr/sbin/stmfadm', 'delete-tg',
 target_group)
 # Remove the LU
 :target_discovered:    boolean indicating whether discovery was used
 :target_wwn:           the world wide name of the FC port target
 :target_lun:           the lun assigned to the LU for the view entry
 """
-wwns = self._get_wwns()
-if not wwns:
-msg = (_("Could not determine fibre channel world wide "
-"node names."))
-raise exception.VolumeBackendAPIException(data=msg)
 luid = self._get_luid(volume)
 if not luid:
 msg = (_("Failed to get logic unit for volume '%s'")
 % volume['name'])
 raise exception.VolumeBackendAPIException(data=msg)
 properties = {}
 properties['target_discovered'] = True
-properties['target_wwn'] = wwns
+properties['target_wwn'] = self._get_target_wwns(self.tg)
 view_lun = self._get_view_and_lun(luid)
 if view_lun['lun'] is not None:
 properties['target_lun'] = view_lun['lun']
 return properties

branch	s11u3-sru
changeset 7787	26bcbec7afce
parent 6035	c9748fcc32de