more robust reservation module

[nodemanager.git] / plugins / sfagids.py

diff --git a/plugins/sfagids.py b/plugins/sfagids.py
index 5c2394b..2723a7a 100644 (file)
--- a/plugins/sfagids.py
+++ b/plugins/sfagids.py
@@ -15,7 +15,7 @@ import traceback
 import tempfile
 try:
     from sfa.util.namespace import *
-    from sfa.util.config import Config
+    from sfa.util.config import Config as SfaConfig
     import sfa.util.xmlrpcprotocol as xmlrpcprotocol
     from sfa.trust.certificate import Keypair, Certificate
     from sfa.trust.credential import Credential
@@ -34,7 +34,7 @@ def start():
         keyfile, certfile = get_keypair(None)
         api = ComponentAPI(key_file=keyfile, cert_file=certfile)
         api.get_node_key()
-    except AttributeError:
+    except:
         return
 
 def GetSlivers(data, config=None, plc=None):
@@ -128,7 +128,7 @@ def install_trusted_certs(api):
 
 def get_keypair(config = None):
     if not config:
-        config = Config()
+        config = SfaConfig()
     hierarchy = Hierarchy()
     key_dir= hierarchy.basedir
     data_dir = config.data_path