projects
/
ganeti-local
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add support for classic queries
[ganeti-local]
/
lib
/
errors.py
diff --git
a/lib/errors.py
b/lib/errors.py
index
1812886
..
ca3050f
100644
(file)
--- a/
lib/errors.py
+++ b/
lib/errors.py
@@
-1,7
+1,7
@@
#
#
#
#
-# Copyright (C) 2006, 2007, 2008, 2009, 2010 Google Inc.
+# Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Google Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-61,25
+61,20
@@
class GenericError(Exception):
"""Base exception for Ganeti.
"""
"""Base exception for Ganeti.
"""
- pass
-class LVMError(GenericError):
- """LVM-related exception.
+class LockError(GenericError):
+ """Lock error exception.
- This exception codifies problems with LVM setup.
+ This signifies problems in the locking subsystem.
"""
"""
- pass
-class LockError(GenericError):
- """Lock error exception.
-
- This signifies problems in the locking subsystem.
+class PidFileLockError(LockError):
+ """PID file is already locked by another process.
"""
"""
- pass
class HypervisorError(GenericError):
class HypervisorError(GenericError):
@@
-89,7
+84,6
@@
class HypervisorError(GenericError):
properly.
"""
properly.
"""
- pass
class ProgrammerError(GenericError):
class ProgrammerError(GenericError):
@@
-100,7
+94,6
@@
class ProgrammerError(GenericError):
parts of our code. It signifies a real programming bug.
"""
parts of our code. It signifies a real programming bug.
"""
- pass
class BlockDeviceError(GenericError):
class BlockDeviceError(GenericError):
@@
-110,7
+103,6
@@
class BlockDeviceError(GenericError):
properly.
"""
properly.
"""
- pass
class ConfigurationError(GenericError):
class ConfigurationError(GenericError):
@@
-120,7
+112,6
@@
class ConfigurationError(GenericError):
exist in the config or such raise this exception.
"""
exist in the config or such raise this exception.
"""
- pass
class ConfigVersionMismatch(ConfigurationError):
class ConfigVersionMismatch(ConfigurationError):
@@
-130,7
+121,6
@@
class ConfigVersionMismatch(ConfigurationError):
version.
"""
version.
"""
- pass
class ReservationError(GenericError):
class ReservationError(GenericError):
@@
-146,7
+136,6
@@
class RemoteError(GenericError):
remote node. It usually signifies a real programming bug.
"""
remote node. It usually signifies a real programming bug.
"""
- pass
class SignatureError(GenericError):
class SignatureError(GenericError):
@@
-157,7
+146,6
@@
class SignatureError(GenericError):
because of spurious traffic.
"""
because of spurious traffic.
"""
- pass
class ParameterError(GenericError):
class ParameterError(GenericError):
@@
-170,7
+158,12
@@
class ParameterError(GenericError):
The argument to this exception should be the parameter name.
"""
The argument to this exception should be the parameter name.
"""
- pass
+
+
+class ResultValidationError(GenericError):
+ """The iallocation results fails validation.
+
+ """
class OpPrereqError(GenericError):
class OpPrereqError(GenericError):
@@
-271,8
+264,10
@@
class TypeEnforcementError(GenericError):
"""
"""
-class SshKeyError(GenericError):
- """Invalid SSH key.
+class X509CertError(GenericError):
+ """Invalid X509 certificate.
+
+ This error has two arguments: the certificate filename and the error cause.
"""
"""
@@
-348,15
+343,6
@@
class JobQueueFull(JobQueueError):
"""
"""
-class ConfdRequestError(GenericError):
- """A request error in Ganeti confd.
-
- Events that should make confd abort the current request and proceed serving
- different ones.
-
- """
-
-
class ConfdMagicError(GenericError):
"""A magic fourcc error in Ganeti confd.
class ConfdMagicError(GenericError):
"""A magic fourcc error in Ganeti confd.
@@
-415,6
+401,18
@@
class QueryFilterParseError(ParseError):
str(inner)]
str(inner)]
+class RapiTestResult(GenericError):
+ """Exception containing results from RAPI test utilities.
+
+ """
+
+
+class FileStoragePathError(GenericError):
+ """Error from file storage path validation.
+
+ """
+
+
# errors should be added above
# errors should be added above
@@
-482,4
+480,5
@@
def MaybeRaise(result):
error = GetEncodedError(result)
if error:
(errcls, args) = error
error = GetEncodedError(result)
if error:
(errcls, args) = error
- raise errcls(args)
+ # pylint: disable=W0142
+ raise errcls(*args)