sustaining/oi_151a/slim_source: comparison usr/src/cmd/auto-install/checkpoints/target

equal deleted inserted replaced

-:93f99ab36b2c
+:4ecf733307ad
 ''' target_selection.py - Select Install Target(s)
 '''
 import copy
 import os
-import os.path
 import platform
 import re
 import traceback
 from operator import attrgetter
 from solaris_install.target.controller import TargetController, \
 DEFAULT_VDEV_NAME, SwapDumpGeneralError, SwapDumpSpaceError
 from solaris_install.target.logical import Logical, Zpool, Vdev, BE, Zvol, \
 Filesystem, DatasetOptions, PoolOptions
 from solaris_install.target.physical import Disk, Partition, Slice
-from solaris_install.target.shadow.physical import ShadowPhysical
 from solaris_install.target.size import Size
 DISK_RE = "c\d+(?:t\d+)?d\d+"
 new_fs = self.__handle_filesystem(child)
 if new_fs is not None:
 if new_fs.action == "preserve" and \
 new_zpool.action not in self.PRESERVED:
 raise SelectionError("Filesystem '%s' cannot be "
-"preserved in non-preserved zpool '%s'."
+"preserved in non-preserved zpool '%s'." % \
 (new_fs.name, new_zpool.name))
 fs_key = new_zpool.name + ":" + new_fs.name
 # Filesystem name must be unique within each pool
 if fs_key not in self._fs_map and \
 new_zvol = self.__handle_zvol(child)
 if new_zvol is not None:
 if new_zvol.action in self.PRESERVED and \
 new_zpool.action not in self.PRESERVED:
 raise SelectionError("Zvol '%s' cannot be "
-"preserved in non-preserved zpool '%s'."
+"preserved in non-preserved zpool '%s'." % \
 (new_zvol.name, zpool.name))
 zvol_key = new_zpool.name + ":" + new_zvol.name
 # Zvol name must be unique within each pool
 if zvol_key not in self._zvol_map and \
 zvol_key not in self._fs_map:
 if new_fs is not None:
 fs_key = zpool.name + ":" + new_fs.name
 # Check if this filesystem already exists as zvol
 if fs_key in self._zvol_map:
 raise SelectionError("Filesystem '%s' specified on "
-"preserved zpool '%s' exists as Zvol."
+"preserved zpool '%s' exists as Zvol." % \
 (new_fs.name, zpool.name))
 elif fs_key in self._fs_map:
 # Only preserve and delete are allowed for existing
 if new_fs.action not in ["preserve", "delete"]:
 raise SelectionError("Filesystem '%s' specified on"
 " preserved zpool '%s' contains invalid action"
-" of '%s'."
+" of '%s'." % \
 (new_fs.name, zpool.name, new_fs.action))
 # Remove discovered item in order to add user specified
 discovered_zpool.delete_children(new_fs)
 else:
 # Only create allowed for new filesystems
 if new_fs.action != "create":
 raise SelectionError("Filesystem '%s' specified on"
 " preserved zpool '%s' contains invalid action"
-" of '%s'."
+" of '%s'." % \
 (new_fs.name, zpool.name, new_fs.action))
 self._fs_map[fs_key] = new_fs
 self.logger.debug("Adding Filesystem '%s' to zpool" %
 (new_fs.name))
 zvol_key = zpool.name + ":" + new_zvol.name
 # Check if This Zvol already exists as filesystem
 if zvol_key in self._fs_map:
 raise SelectionError("Zvol '%s' specified on "
-"preserved zpool '%s' exists as Filesystem."
+"preserved zpool '%s' exists as Filesystem." % \
 (new_zvol.name, zpool.name))
 elif zvol_key in self._zvol_map:
 # Only preserve, delete, use_existing are allowed
 if new_zvol.action not in \
 ["preserve", "delete", "use_existing"]:
 raise SelectionError("Zvol '%s' specified on "
 "preserved zpool '%s' contains invalid action "
-"of '%s'."
+"of '%s'." % \
 (new_zvol.name, zpool.name, new_zvol.action))
 discovered_zvol = discovered_zpool.get_first_child(
 new_zvol.name, Zvol)
 (new_zvol.name))
 elif discovered_zvol.use == "dump":
 # Cannot delete a dump zvol
 self.__raise_dump_zvol_deletion_exception()
-elif new_zovl.use == "dump":
+elif new_zvol.use == "dump":
 # Can only specify one Dump Zvol
 if self._dump_zvol is not None:
 raise SelectionError(
 "Dump zvol specified twice.")
 else:
 # Only create allowed for new zvol
 if new_zvol.action != "create":
 raise SelectionError("Zvol '%s' specified on "
 "preserved zpool '%s' contains invalid action "
-"of '%s'."
+"of '%s'." % \
 (new_zvol.name, zpool.name, new_zvol.action))
 self._zvol_map[zvol_key] = new_zvol
 self._zvol_map[zvol_key] = new_zvol
 self.logger.debug("Adding Zvol '%s' to zpool" %
 if slc.in_zpool is not None and \
 slc.in_zpool == zpool.name:
 disk_found = True
 break
-elif isinstance(disk_kd, Slice):
+elif isinstance(disk_kid, Slice):
 if disk_kid.in_zpool is not None and \
 disk_kid.in_zpool == zpool.name:
 disk_found = True
 break
 else:
 if isinstance(parent_object, Disk):
 raise SelectionError(
 "Cannot %s slice %s that doesn't exist on disk %s"
 % (orig_slice.action, orig_slice.name,
-self.__pretty_print_disk(discovered_disk)))
+self.__pretty_print_disk(parent_object)))
 else:
 raise SelectionError(
 "Cannot %s slice %s that doesn't exist on "
 "partition %s, disk %s" % (orig_slice.action,
 orig_slice.name, parent_object.name,
 # Check error service for errors
 errors = errsvc.get_all_errors()
 # Found errors and they cannot be ignored
-if errors and not self.__can_ignore_errors(errors):
+if errors:
 # Print desired contents to log
 existing_desired = \
 self.doc.persistent.get_first_child(Target.DESIRED)
 if existing_desired:
 self.logger.debug("Desired =\n%s\n" % (str(existing_desired)))
 errstr = "Following errors occurred processing disks :\n%s" % \
 (str(errors[0]))
 raise SelectionError(errstr)
 return ret_disk
-def __can_ignore_errors(self, errors):
-'''
-Process list of errors found in error service, and make a
-judgement call on whether we can ignore them.
-Add errors being ignored and reasoning here.
-Errors to ignore for physical :
-- SliceInUseError() we are overriding this existing slice
-so we can ignore.
-'''
-return False
-can_ignore = True
-for error in errors:
-for key in error.error_data:
-if error.mod_id == "physical validation" and \
-isinstance(error.error_data[key], \
-ShadowPhysical.SliceInUseError):
-# We can ignore, just pass onto next error
-pass
-else:
-# Error does not match one we can ignore, so set return
-# value and break.
-can_ignore = False
-break
-return can_ignore
 def __create_temp_logical_tree(self, existing_logicals):
 '''Create a set of logicals that we will use should there be no other
 logicals defined in the manifest.
 '''

changeset 1227	4ecf733307ad
parent 1197	41dc6c86a4c3
child 1247	e93173cd968b