X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Futil%2Ffaults.py;h=ca375a1b9d3cc83fafc9f00c4618abb262c53f3c;hp=b8dee9e3aef55a0807d6f2849ca3669153dbc7db;hb=3d7237fa0b5f2b4a60cb97c7fb3b6aecfd94558a;hpb=7c1cf48e3a60344e3c381d1edac89d81659655f3

diff --git a/sfa/util/faults.py b/sfa/util/faults.py
index b8dee9e3..ca375a1b 100644
--- a/sfa/util/faults.py
+++ b/sfa/util/faults.py
@@ -1,5 +1,5 @@
 #
-# GeniAPI XML-RPC faults
+# SFA API faults
 #
 #
 
@@ -8,20 +8,20 @@
 
 import xmlrpclib
 
-class GeniFault(xmlrpclib.Fault):
+class SfaFault(xmlrpclib.Fault):
     def __init__(self, faultCode, faultString, extra = None):
         if extra:
             faultString += ": " + extra
         xmlrpclib.Fault.__init__(self, faultCode, faultString)
 
-class GeniInvalidAPIMethod(GeniFault):
+class SfaInvalidAPIMethod(SfaFault):
     def __init__(self, method, interface = None, extra = None):
         faultString = "Invalid method " + method
         if interface:
             faultString += " for interface " + interface
-        GeniFault.__init__(self, 100, faultString, extra)
+        SfaFault.__init__(self, 100, faultString, extra)
 
-class GeniInvalidArgumentCount(GeniFault):
+class SfaInvalidArgumentCount(SfaFault):
     def __init__(self, got, min, max = min, extra = None):
         if min != max:
             expected = "%d-%d" % (min, max)
@@ -29,208 +29,208 @@ class GeniInvalidArgumentCount(GeniFault):
             expected = "%d" % min
         faultString = "Expected %s arguments, got %d" % \
                       (expected, got)
-        GeniFault.__init__(self, 101, faultString, extra)
+        SfaFault.__init__(self, 101, faultString, extra)
 
-class GeniInvalidArgument(GeniFault):
+class SfaInvalidArgument(SfaFault):
     def __init__(self, extra = None, name = None):
         if name is not None:
             faultString = "Invalid %s value" % name
         else:
             faultString = "Invalid argument"
-        GeniFault.__init__(self, 102, faultString, extra)
+        SfaFault.__init__(self, 102, faultString, extra)
 
-class GeniAuthenticationFailure(GeniFault):
+class SfaAuthenticationFailure(SfaFault):
     def __init__(self, extra = None):
         faultString = "Failed to authenticate call"
-        GeniFault.__init__(self, 103, faultString, extra)
+        SfaFault.__init__(self, 103, faultString, extra)
 
-class GeniDBError(GeniFault):
+class SfaDBError(SfaFault):
     def __init__(self, extra = None):
         faultString = "Database error"
-        GeniFault.__init__(self, 106, faultString, extra)
+        SfaFault.__init__(self, 106, faultString, extra)
 
-class GeniPermissionDenied(GeniFault):
+class SfaPermissionDenied(SfaFault):
     def __init__(self, extra = None):
         faultString = "Permission denied"
-        GeniFault.__init__(self, 108, faultString, extra)
+        SfaFault.__init__(self, 108, faultString, extra)
 
-class GeniNotImplemented(GeniFault):
+class SfaNotImplemented(SfaFault):
     def __init__(self, extra = None):
         faultString = "Not fully implemented"
-        GeniFault.__init__(self, 109, faultString, extra)
+        SfaFault.__init__(self, 109, faultString, extra)
 
-class GeniAPIError(GeniFault):
+class SfaAPIError(SfaFault):
     def __init__(self, extra = None):
         faultString = "Internal API error"
-        GeniFault.__init__(self, 111, faultString, extra)
+        SfaFault.__init__(self, 111, faultString, extra)
 
-class MalformedHrnException(GeniFault):
+class MalformedHrnException(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Malformed HRN: %(value)s" % locals()
-        GeniFault.__init__(self, 102, faultString, extra)
+        SfaFault.__init__(self, 102, faultString, extra)
     def __str__(self):
         return repr(self.value)
 
-class TreeException(GeniFault):
+class TreeException(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Tree Exception: %(value)s, " % locals()
-        GeniFault.__init__(self, 111, faultString, extra)
+        SfaFault.__init__(self, 111, faultString, extra)
     def __str__(self):
         return repr(self.value)
 
-class NonexistingRecord(GeniFault):
+class NonexistingRecord(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Non exsiting record %(value)s, " % locals()
-        GeniFault.__init__(self, 111, faultString, extra)
+        SfaFault.__init__(self, 111, faultString, extra)
     def __str__(self):
         return repr(self.value)
 
-class ExistingRecord(GeniFault):
+class ExistingRecord(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Existing record: %(value)s, " % locals()
-        GeniFault.__init__(self, 111, faultString, extra)
+        SfaFault.__init__(self, 111, faultString, extra)
     def __str__(self):
         return repr(self.value)
         
-class NonexistingCredType(GeniFault):
+class NonexistingCredType(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Non existing record: %(value)s, " % locals()
-        GeniFault.__init__(self, 111, faultString, extra)
+        SfaFault.__init__(self, 111, faultString, extra)
     def __str__(self):
         return repr(self.value)
 
-class NonexistingFile(GeniFault):
+class NonexistingFile(SfaFault):
     def __init__(self, value):
         self.value = value
         faultString = "Non existing file: %(value)s, " % locals()
-        GeniFault.__init__(self, 111, faultString, extra)
+        SfaFault.__init__(self, 111, faultString, extra)
     def __str__(self):
         return repr(self.value)
 
-class InvalidRPCParams(GeniFault):
+class InvalidRPCParams(SfaFault):
     def __init__(self, value):
         self.value = value
         faultString = "Invalid RPC Params: %(value)s, " % locals()
-        GeniFault.__init__(self, 102, faultString, extra)
+        SfaFault.__init__(self, 102, faultString, extra)
     def __str__(self):
         return repr(self.value)
 
 # SMBAKER exceptions follow
 
-class ConnectionKeyGIDMismatch(GeniFault):
+class ConnectionKeyGIDMismatch(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Connection Key GID mismatch: %(value)s" % locals()
-        GeniFault.__init__(self, 102, faultString, extra) 
+        SfaFault.__init__(self, 102, faultString, extra) 
     def __str__(self):
         return repr(self.value)
 
-class MissingCallerGID(GeniFault):
+class MissingCallerGID(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Missing Caller GID: %(value)s" % locals()
-        GeniFault.__init__(self, 102, faultString, extra) 
+        SfaFault.__init__(self, 102, faultString, extra) 
     def __str__(self):
         return repr(self.value)
 
-class RecordNotFound(GeniFault):
+class RecordNotFound(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Record not found: %(value)s" % locals()
-        GeniFault.__init__(self, 102, faultString, extra)
+        SfaFault.__init__(self, 102, faultString, extra)
     #def __str__(self):
     #    return repr(self.value)
 
-class UnknownGeniType(GeniFault):
+class UnknownSfaType(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
-        faultString = "Unknown Geni Type: %(value)s" % locals()
-        GeniFault.__init__(self, 102, faultString, extra)
+        faultString = "Unknown SFA Type: %(value)s" % locals()
+        SfaFault.__init__(self, 102, faultString, extra)
     def __str__(self):
         return repr(self.value)
 
-class MissingAuthority(GeniFault):
+class MissingAuthority(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Missing authority: %(value)s" % locals()
-        GeniFault.__init__(self, 102, faultString, extra)
+        SfaFault.__init__(self, 102, faultString, extra)
     def __str__(self):
         return repr(self.value)
 
-class PlanetLabRecordDoesNotExist(GeniFault):
+class PlanetLabRecordDoesNotExist(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "PlanetLab record does not exist : %(value)s" % locals()
-        GeniFault.__init__(self, 102, faultString, extra)
+        SfaFault.__init__(self, 102, faultString, extra)
     def __str__(self):
         return repr(self.value)
 
-class PermissionError(GeniFault):
+class PermissionError(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Permission error: %(value)s" % locals()
-        GeniFault.__init__(self, 108, faultString, extra)
+        SfaFault.__init__(self, 108, faultString, extra)
     def __str__(self):
         return repr(self.value)
 
-class InsufficientRights(GeniFault):
+class InsufficientRights(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Insufficient rights: %(value)s" % locals()
-        GeniFault.__init__(self, 108, faultString, extra)
+        SfaFault.__init__(self, 108, faultString, extra)
     def __str__(self):
         return repr(self.value)
 
-class MissingDelegateBit(GeniFault):
+class MissingDelegateBit(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Missing delegate bit: %(value)s" % locals()
-        GeniFault.__init__(self, 108, faultString, extra)
+        SfaFault.__init__(self, 108, faultString, extra)
     def __str__(self):
         return repr(self.value)
 
-class ChildRightsNotSubsetOfParent(GeniFault):
+class ChildRightsNotSubsetOfParent(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Child rights not subset of parent: %(value)s" % locals()
-        GeniFault.__init__(self, 103, faultString, extra)
+        SfaFault.__init__(self, 103, faultString, extra)
     def __str__(self):
         return repr(self.value)
 
-class CertMissingParent(GeniFault):
+class CertMissingParent(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Cert missing parent: %(value)s" % locals()
-        GeniFault.__init__(self, 103, faultString, extra)
+        SfaFault.__init__(self, 103, faultString, extra)
     def __str__(self):
         return repr(self.value)
 
-class CertNotSignedByParent(GeniFault):
+class CertNotSignedByParent(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Cert not signed by parent: %(value)s" % locals()
-        GeniFault.__init__(self, 103, faultString, extra)
+        SfaFault.__init__(self, 103, faultString, extra)
     def __str__(self):
         return repr(self.value)
 
-class GidInvalidParentHrn(GeniFault):
+class GidInvalidParentHrn(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "GID invalid parent hrn: %(value)s" % locals()
-        GeniFault.__init__(self, 102, faultString, extra)
+        SfaFault.__init__(self, 102, faultString, extra)
     def __str__(self):
         return repr(self.value)
 
-class SliverDoesNotExist(GeniFault):
+class SliverDoesNotExist(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Sliver does not exist : %(value)s" % locals()
-        GeniFault.__init__(self, 102, faultString, extra)
+        SfaFault.__init__(self, 102, faultString, extra)
     def __str__(self):
         return repr(self.value)
 
@@ -239,10 +239,19 @@ class BadRequestHash(xmlrpclib.Fault):
         faultString = "bad request hash: " + str(hash)
         xmlrpclib.Fault.__init__(self, 902, faultString)
 
-class MissingTrustedRoots(GeniFault):
+class MissingTrustedRoots(SfaFault):
     def __init__(self, value, extra = None):
         self.value = value
         faultString = "Trusted root directory does not exist: %(value)s" % locals()
-        GeniFault.__init__(self, 102, faultString, extra) 
+        SfaFault.__init__(self, 102, faultString, extra) 
     def __str__(self):
         return repr(self.value)
+
+class MissingSfaInfo(SfaFault):
+    def __init__(self, value, extra = None):
+        self.value = value
+        faultString = "Missing information: %(value)s" % locals()
+        SfaFault.__init__(self, 102, faultString, extra) 
+    def __str__(self):
+        return repr(self.value)
+