From 938d92e8a9a2ee97fb7951ed232b58d614a27adf Mon Sep 17 00:00:00 2001 From: RongzeZhu Date: Wed, 22 Aug 2012 11:37:26 +0800 Subject: [PATCH] Remove unused exceptions from cinder/exception.py find cinder/ -type f -name "*pyc" -exec rm {} \; exceptions=`cat cinder/exception.py| grep -E '^class' |\ awk {'print $2'} | awk -F '(' {'print $1'}` for exc in $exceptions do i=`find cinder/ -type f -exec grep -R $exc {} \; |wc -l` if [ $i -eq 1 ] then echo $exc fi done First removed exceptions: DecryptionFailure ImagePaginationFailed VirtualInterfaceCreateException VirtualInterfaceMacAddressException MelangeConnectionFailed VolumeUnattached InvalidKeypair InvalidSignature InvalidInstanceType InvalidIpProtocol InvalidCidr InvalidAggregateAction InvalidGroup InstanceInvalidState InstanceNotRunning InstanceNotSuspended InstanceNotInRescueMode InstanceSuspendFailure InstanceResumeFailure InstanceRebootFailure InstanceTerminationFailure VolumeServiceUnavailable UnableToMigrateToSelf DestinationHostUnavailable SourceHostUnavailable InvalidHypervisorType DestinationHypervisorTooOld DestinationDiskExists InvalidDevicePath DeviceIsBusy InvalidCPUInfo InvalidIpAddressError InvalidVLANTag InvalidVLANPortGroup InvalidDiskFormat InstanceUnacceptable FlagNotSet NoVolumeTypesFound VolumeDriverNotFound ListingImageRefsNotSupported KernelNotFoundForImage ProjectNotFound ProjectMembershipNotFound UserRoleNotFound StorageRepositoryNotFound DatastoreNotFound FixedIpNotFoundForAddress FixedIpNotFoundForInstance FixedIpNotFoundForNetworkHost FixedIpNotFoundForSpecificInstance FixedIpNotFoundForHost FixedIpAlreadyInUse FixedIpInvalid NoMoreFixedIps NoFixedIpsDefined FloatingIpDNSExists FloatingIpNotFoundForAddress FloatingIpNotFoundForHost NoMoreFloatingIps FloatingIpAssociated FloatingIpNotAssociated NoFloatingIpsDefined NoFloatingIpInterface KeypairNotFound CertificateNotFound AuthTokenNotFound AccessKeyNotFound SecurityGroupNotFoundForProject SecurityGroupNotFoundForRule SecurityGroupExistsForInstance SecurityGroupNotExistsForInstance NoInstanceTypesFound InstanceTypeNotFoundByName FlavorNotFound CellNotFound SchedulerHostFilterNotFound SchedulerCostFunctionNotFound SchedulerWeightFlagNotFound InstanceMetadataNotFound InstanceTypeExtraSpecsNotFound LDAPUserNotFound LDAPGroupNotFound LDAPGroupMembershipNotFound NoFilesFound SwitchNotFoundForNetworkAdapter NetworkAdapterNotFound GlobalRoleNotAllowed ImageRotationNotAllowed RotationRequiredForBackup LDAPUserExists LDAPGroupExists LDAPMembershipExists ProjectExists InstanceExists InstanceTypeExists InvalidSharedStorage CannotResizeToSameSize ImageTooLarge ZoneRequestError InstanceTypeMemoryTooSmall InstanceTypeDiskTooSmall InsufficientFreeMemory CouldNotFetchMetrics AggregateError AggregateNotFound AggregateNameExists AggregateHostNotFound AggregateMetadataNotFound AggregateHostConflict AggregateHostExists InstanceTypeCreateFailed SolidFireAPIStatusException DuplicateVlan InvalidInstanceIDMalformed CouldNotFetchImage Search again, Second removed exceptions: UserNotFound FixedIpNotFoundForNetwork FloatingIpNotFound SecurityGroupNotFound InstanceTypeNotFound LDAPObjectNotFound UserExists Search again, Third removed exceptions: FixedIpNotFound Change-Id: I028122c6132340b2fef2c144da787b7c4efddccf --- cinder/exception.py | 517 -------------------------------------------- 1 file changed, 517 deletions(-) diff --git a/cinder/exception.py b/cinder/exception.py index d0b9b3ae4..f624173d5 100644 --- a/cinder/exception.py +++ b/cinder/exception.py @@ -127,31 +127,10 @@ class DeprecatedConfig(CinderException): message = _("Fatal call to deprecated config") + " %(msg)s" -class DecryptionFailure(CinderException): - message = _("Failed to decrypt text") - - -class ImagePaginationFailed(CinderException): - message = _("Failed to paginate through images from image service") - - -class VirtualInterfaceCreateException(CinderException): - message = _("Virtual Interface creation failed") - - -class VirtualInterfaceMacAddressException(CinderException): - message = _("5 attempts to create virtual interface" - "with unique mac address failed") - - class GlanceConnectionFailed(CinderException): message = _("Connection to glance failed") + ": %(reason)s" -class MelangeConnectionFailed(CinderException): - message = _("Connection to melange failed") + ": %(reason)s" - - class NotAuthorized(CinderException): message = _("Not authorized.") code = 403 @@ -178,18 +157,10 @@ class InvalidSnapshot(Invalid): message = _("Invalid snapshot") + ": %(reason)s" -class VolumeUnattached(Invalid): - message = _("Volume %(volume_id)s is not attached to anything") - - class VolumeAttached(Invalid): message = _("Volume %(volume_id)s is still attached, detach volume first.") -class InvalidKeypair(Invalid): - message = _("Keypair data is invalid") - - class SfJsonEncodeFailure(CinderException): message = _("Failed to load data into json format") @@ -202,18 +173,10 @@ class InvalidResults(Invalid): message = _("The results are invalid.") -class InvalidSignature(Invalid): - message = _("Invalid signature %(signature)s for user %(user)s.") - - class InvalidInput(Invalid): message = _("Invalid input received") + ": %(reason)s" -class InvalidInstanceType(Invalid): - message = _("Invalid instance type %(instance_type)s.") - - class InvalidVolumeType(Invalid): message = _("Invalid volume type") + ": %(reason)s" @@ -226,18 +189,10 @@ class InvalidPortRange(Invalid): message = _("Invalid port range %(from_port)s:%(to_port)s. %(msg)s") -class InvalidIpProtocol(Invalid): - message = _("Invalid IP protocol %(protocol)s.") - - class InvalidContentType(Invalid): message = _("Invalid content type %(content_type)s.") -class InvalidCidr(Invalid): - message = _("Invalid cidr %(cidr)s.") - - class InvalidUnicodeParameter(Invalid): message = _("Invalid Parameter: " "Unicode is not supported by the current database.") @@ -249,124 +204,14 @@ class InvalidParameterValue(Invalid): message = _("%(err)s") -class InvalidAggregateAction(Invalid): - message = _("Cannot perform action '%(action)s' on aggregate " - "%(aggregate_id)s. Reason: %(reason)s.") - - -class InvalidGroup(Invalid): - message = _("Group not valid. Reason: %(reason)s") - - -class InstanceInvalidState(Invalid): - message = _("Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot " - "%(method)s while the instance is in this state.") - - -class InstanceNotRunning(Invalid): - message = _("Instance %(instance_id)s is not running.") - - -class InstanceNotSuspended(Invalid): - message = _("Instance %(instance_id)s is not suspended.") - - -class InstanceNotInRescueMode(Invalid): - message = _("Instance %(instance_id)s is not in rescue mode") - - -class InstanceSuspendFailure(Invalid): - message = _("Failed to suspend instance") + ": %(reason)s" - - -class InstanceResumeFailure(Invalid): - message = _("Failed to resume server") + ": %(reason)s." - - -class InstanceRebootFailure(Invalid): - message = _("Failed to reboot instance") + ": %(reason)s" - - -class InstanceTerminationFailure(Invalid): - message = _("Failed to terminate instance") + ": %(reason)s" - - class ServiceUnavailable(Invalid): message = _("Service is unavailable at this time.") -class VolumeServiceUnavailable(ServiceUnavailable): - message = _("Volume service is unavailable at this time.") - - -class UnableToMigrateToSelf(Invalid): - message = _("Unable to migrate instance (%(instance_id)s) " - "to current host (%(host)s).") - - -class DestinationHostUnavailable(Invalid): - message = _("Destination compute host is unavailable at this time.") - - -class SourceHostUnavailable(Invalid): - message = _("Original compute host is unavailable at this time.") - - -class InvalidHypervisorType(Invalid): - message = _("The supplied hypervisor type of is invalid.") - - -class DestinationHypervisorTooOld(Invalid): - message = _("The instance requires a newer hypervisor version than " - "has been provided.") - - -class DestinationDiskExists(Invalid): - message = _("The supplied disk path (%(path)s) already exists, " - "it is expected not to exist.") - - -class InvalidDevicePath(Invalid): - message = _("The supplied device path (%(path)s) is invalid.") - - -class DeviceIsBusy(Invalid): - message = _("The supplied device (%(device)s) is busy.") - - -class InvalidCPUInfo(Invalid): - message = _("Unacceptable CPU info") + ": %(reason)s" - - -class InvalidIpAddressError(Invalid): - message = _("%(address)s is not a valid IP v4/6 address.") - - -class InvalidVLANTag(Invalid): - message = _("VLAN tag is not appropriate for the port group " - "%(bridge)s. Expected VLAN tag is %(tag)s, " - "but the one associated with the port group is %(pgroup)s.") - - -class InvalidVLANPortGroup(Invalid): - message = _("vSwitch which contains the port group %(bridge)s is " - "not associated with the desired physical adapter. " - "Expected vSwitch is %(expected)s, but the one associated " - "is %(actual)s.") - - -class InvalidDiskFormat(Invalid): - message = _("Disk format %(disk_format)s is not acceptable") - - class ImageUnacceptable(Invalid): message = _("Image %(image_id)s is unacceptable: %(reason)s") -class InstanceUnacceptable(Invalid): - message = _("Instance %(instance_id)s is unacceptable: %(reason)s") - - class InvalidUUID(Invalid): message = _("Expected a uuid but received %(uuid).") @@ -377,10 +222,6 @@ class NotFound(CinderException): safe = True -class FlagNotSet(NotFound): - message = _("Required flag %(flag)s not set.") - - class VolumeNotFound(NotFound): message = _("Volume %(volume_id)s could not be found.") @@ -399,10 +240,6 @@ class VolumeMetadataNotFound(NotFound): "key %(metadata_key)s.") -class NoVolumeTypesFound(NotFound): - message = _("Zero volume types found.") - - class VolumeTypeNotFound(NotFound): message = _("Volume type %(volume_type_id)s could not be found.") @@ -438,141 +275,14 @@ class DiskNotFound(NotFound): message = _("No disk at %(location)s") -class VolumeDriverNotFound(NotFound): - message = _("Could not find a handler for %(driver_type)s volume.") - - class InvalidImageRef(Invalid): message = _("Invalid image href %(image_href)s.") -class ListingImageRefsNotSupported(Invalid): - message = _("Some images have been stored via hrefs." - " This version of the api does not support displaying image hrefs.") - - class ImageNotFound(NotFound): message = _("Image %(image_id)s could not be found.") -class KernelNotFoundForImage(ImageNotFound): - message = _("Kernel not found for image %(image_id)s.") - - -class UserNotFound(NotFound): - message = _("User %(user_id)s could not be found.") - - -class ProjectNotFound(NotFound): - message = _("Project %(project_id)s could not be found.") - - -class ProjectMembershipNotFound(NotFound): - message = _("User %(user_id)s is not a member of project %(project_id)s.") - - -class UserRoleNotFound(NotFound): - message = _("Role %(role_id)s could not be found.") - - -class StorageRepositoryNotFound(NotFound): - message = _("Cannot find SR to read/write VDI.") - - -class DatastoreNotFound(NotFound): - message = _("Could not find the datastore reference(s) which the VM uses.") - - -class FixedIpNotFound(NotFound): - message = _("No fixed IP associated with id %(id)s.") - - -class FixedIpNotFoundForAddress(FixedIpNotFound): - message = _("Fixed ip not found for address %(address)s.") - - -class FixedIpNotFoundForInstance(FixedIpNotFound): - message = _("Instance %(instance_id)s has zero fixed ips.") - - -class FixedIpNotFoundForNetworkHost(FixedIpNotFound): - message = _("Network host %(host)s has zero fixed ips " - "in network %(network_id)s.") - - -class FixedIpNotFoundForSpecificInstance(FixedIpNotFound): - message = _("Instance %(instance_id)s doesn't have fixed ip '%(ip)s'.") - - -class FixedIpNotFoundForHost(FixedIpNotFound): - message = _("Host %(host)s has zero fixed ips.") - - -class FixedIpNotFoundForNetwork(FixedIpNotFound): - message = _("Fixed IP address (%(address)s) does not exist in " - "network (%(network_uuid)s).") - - -class FixedIpAlreadyInUse(CinderException): - message = _("Fixed IP address %(address)s is already in use.") - - -class FixedIpInvalid(Invalid): - message = _("Fixed IP address %(address)s is invalid.") - - -class NoMoreFixedIps(CinderException): - message = _("Zero fixed ips available.") - - -class NoFixedIpsDefined(NotFound): - message = _("Zero fixed ips could be found.") - - -class FloatingIpNotFound(NotFound): - message = _("Floating ip not found for id %(id)s.") - - -class FloatingIpDNSExists(Invalid): - message = _("The DNS entry %(name)s already exists in domain %(domain)s.") - - -class FloatingIpNotFoundForAddress(FloatingIpNotFound): - message = _("Floating ip not found for address %(address)s.") - - -class FloatingIpNotFoundForHost(FloatingIpNotFound): - message = _("Floating ip not found for host %(host)s.") - - -class NoMoreFloatingIps(FloatingIpNotFound): - message = _("Zero floating ips available.") - - -class FloatingIpAssociated(CinderException): - message = _("Floating ip %(address)s is associated.") - - -class FloatingIpNotAssociated(CinderException): - message = _("Floating ip %(address)s is not associated.") - - -class NoFloatingIpsDefined(NotFound): - message = _("Zero floating ips exist.") - - -class NoFloatingIpInterface(NotFound): - message = _("Interface %(interface)s not found.") - - -class KeypairNotFound(NotFound): - message = _("Keypair %(name)s not found for user %(user_id)s") - - -class CertificateNotFound(NotFound): - message = _("Certificate %(certificate_id)s not found.") - - class ServiceNotFound(NotFound): message = _("Service %(service_id)s could not be found.") @@ -585,14 +295,6 @@ class HostBinaryNotFound(NotFound): message = _("Could not find binary %(binary)s on host %(host)s.") -class AuthTokenNotFound(NotFound): - message = _("Auth token %(token)s could not be found.") - - -class AccessKeyNotFound(NotFound): - message = _("Access Key %(access_key)s could not be found.") - - class QuotaNotFound(NotFound): message = _("Quota could not be found") @@ -605,29 +307,6 @@ class QuotaClassNotFound(QuotaNotFound): message = _("Quota class %(class_name)s could not be found.") -class SecurityGroupNotFound(NotFound): - message = _("Security group %(security_group_id)s not found.") - - -class SecurityGroupNotFoundForProject(SecurityGroupNotFound): - message = _("Security group %(security_group_id)s not found " - "for project %(project_id)s.") - - -class SecurityGroupNotFoundForRule(SecurityGroupNotFound): - message = _("Security group with rule %(rule_id)s not found.") - - -class SecurityGroupExistsForInstance(Invalid): - message = _("Security group %(security_group_id)s is already associated" - " with the instance %(instance_id)s") - - -class SecurityGroupNotExistsForInstance(Invalid): - message = _("Security group %(security_group_id)s is not associated with" - " the instance %(instance_id)s") - - class MigrationNotFound(NotFound): message = _("Migration %(migration_id)s could not be found.") @@ -637,83 +316,10 @@ class MigrationNotFoundByStatus(MigrationNotFound): "with status %(status)s.") -class NoInstanceTypesFound(NotFound): - message = _("Zero instance types found.") - - -class InstanceTypeNotFound(NotFound): - message = _("Instance type %(instance_type_id)s could not be found.") - - -class InstanceTypeNotFoundByName(InstanceTypeNotFound): - message = _("Instance type with name %(instance_type_name)s " - "could not be found.") - - -class FlavorNotFound(NotFound): - message = _("Flavor %(flavor_id)s could not be found.") - - -class CellNotFound(NotFound): - message = _("Cell %(cell_id)s could not be found.") - - -class SchedulerHostFilterNotFound(NotFound): - message = _("Scheduler Host Filter %(filter_name)s could not be found.") - - -class SchedulerCostFunctionNotFound(NotFound): - message = _("Scheduler cost function %(cost_fn_str)s could" - " not be found.") - - -class SchedulerWeightFlagNotFound(NotFound): - message = _("Scheduler weight flag not found: %(flag_name)s") - - -class InstanceMetadataNotFound(NotFound): - message = _("Instance %(instance_id)s has no metadata with " - "key %(metadata_key)s.") - - -class InstanceTypeExtraSpecsNotFound(NotFound): - message = _("Instance Type %(instance_type_id)s has no extra specs with " - "key %(extra_specs_key)s.") - - -class LDAPObjectNotFound(NotFound): - message = _("LDAP object could not be found") - - -class LDAPUserNotFound(LDAPObjectNotFound): - message = _("LDAP user %(user_id)s could not be found.") - - -class LDAPGroupNotFound(LDAPObjectNotFound): - message = _("LDAP group %(group_id)s could not be found.") - - -class LDAPGroupMembershipNotFound(NotFound): - message = _("LDAP user %(user_id)s is not a member of group %(group_id)s.") - - class FileNotFound(NotFound): message = _("File %(file_path)s could not be found.") -class NoFilesFound(NotFound): - message = _("Zero files could be found.") - - -class SwitchNotFoundForNetworkAdapter(NotFound): - message = _("Virtual switch associated with the " - "network adapter %(adapter)s not found.") - - -class NetworkAdapterNotFound(NotFound): - message = _("Network adapter %(adapter)s could not be found.") - - class ClassNotFound(NotFound): message = _("Class %(class_name)s could not be found: %(exception)s") @@ -722,18 +328,6 @@ class NotAllowed(CinderException): message = _("Action not allowed.") -class GlobalRoleNotAllowed(NotAllowed): - message = _("Unable to use global role %(role_id)s") - - -class ImageRotationNotAllowed(CinderException): - message = _("Rotation is not allowed for snapshots") - - -class RotationRequiredForBackup(CinderException): - message = _("Rotation param is required for backup image_type") - - #TODO(bcwaldon): EOL this exception! class Duplicate(CinderException): pass @@ -743,43 +337,10 @@ class KeyPairExists(Duplicate): message = _("Key pair %(key_name)s already exists.") -class UserExists(Duplicate): - message = _("User %(user)s already exists.") - - -class LDAPUserExists(UserExists): - message = _("LDAP user %(user)s already exists.") - - -class LDAPGroupExists(Duplicate): - message = _("LDAP group %(group)s already exists.") - - -class LDAPMembershipExists(Duplicate): - message = _("User %(uid)s is already a member of " - "the group %(group_dn)s") - - -class ProjectExists(Duplicate): - message = _("Project %(project)s already exists.") - - -class InstanceExists(Duplicate): - message = _("Instance %(name)s already exists.") - - -class InstanceTypeExists(Duplicate): - message = _("Instance Type %(name)s already exists.") - - class VolumeTypeExists(Duplicate): message = _("Volume Type %(name)s already exists.") -class InvalidSharedStorage(CinderException): - message = _("%(path)s is on shared storage: %(reason)s") - - class MigrationError(CinderException): message = _("Migration error") + ": %(reason)s" @@ -796,34 +357,6 @@ class PasteAppNotFound(NotFound): message = _("Could not load paste app '%(name)s' from %(path)s") -class CannotResizeToSameSize(CinderException): - message = _("When resizing, instances must change size!") - - -class ImageTooLarge(CinderException): - message = _("Image is larger than instance type allows") - - -class ZoneRequestError(CinderException): - message = _("1 or more Zones could not complete the request") - - -class InstanceTypeMemoryTooSmall(CinderException): - message = _("Instance type's memory is too small for requested image.") - - -class InstanceTypeDiskTooSmall(CinderException): - message = _("Instance type's disk is too small for requested image.") - - -class InsufficientFreeMemory(CinderException): - message = _("Insufficient free memory on compute node to start %(uuid)s.") - - -class CouldNotFetchMetrics(CinderException): - message = _("Could not fetch bandwidth/cpu/disk metrics for this host.") - - class NoValidHost(CinderException): message = _("No valid host was found. %(reason)s") @@ -839,36 +372,6 @@ class QuotaError(CinderException): safe = True -class AggregateError(CinderException): - message = _("Aggregate %(aggregate_id)s: action '%(action)s' " - "caused an error: %(reason)s.") - - -class AggregateNotFound(NotFound): - message = _("Aggregate %(aggregate_id)s could not be found.") - - -class AggregateNameExists(Duplicate): - message = _("Aggregate %(aggregate_name)s already exists.") - - -class AggregateHostNotFound(NotFound): - message = _("Aggregate %(aggregate_id)s has no host %(host)s.") - - -class AggregateMetadataNotFound(NotFound): - message = _("Aggregate %(aggregate_id)s has no metadata with " - "key %(metadata_key)s.") - - -class AggregateHostConflict(Duplicate): - message = _("Host %(host)s already member of another aggregate.") - - -class AggregateHostExists(Duplicate): - message = _("Aggregate %(aggregate_id)s already has host %(host)s.") - - class DuplicateSfVolumeNames(Duplicate): message = _("Detected more than one volume with name %(vol_name)s") @@ -878,26 +381,14 @@ class VolumeTypeCreateFailed(CinderException): "name %(name)s and specs %(extra_specs)s") -class InstanceTypeCreateFailed(CinderException): - message = _("Unable to create instance type") - - class SolidFireAPIException(CinderException): message = _("Bad response from SolidFire API") -class SolidFireAPIStatusException(SolidFireAPIException): - message = _("Error in SolidFire API response: status=%(status)s") - - class SolidFireAPIDataException(SolidFireAPIException): message = _("Error in SolidFire API response: data=%(data)s") -class DuplicateVlan(Duplicate): - message = _("Detected existing vlan with id %(vlan)d") - - class UnknownCmd(Invalid): message = _("Unknown or unsupported command %(cmd)s") @@ -938,14 +429,6 @@ class InstanceNotFound(NotFound): message = _("Instance %(instance_id)s could not be found.") -class InvalidInstanceIDMalformed(Invalid): - message = _("Invalid id: %(val)s (expecting \"i-...\").") - - -class CouldNotFetchImage(CinderException): - message = _("Could not fetch image %(image)s") - - class VolumeBackendAPIException(CinderException): message = _("Bad or unexpected response from the storage volume " "backend API: %(data)s") -- 2.45.2