From: S.Çağlar Onur <caglar@cs.princeton.edu>
Date: Mon, 11 Oct 2010 21:02:55 +0000 (-0400)
Subject: handle AttributeError instead of disabling sfa plugin
X-Git-Tag: nodemanager-2.0-22~4
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=7ae55ee113468d66caa497f6466a229ce3f84dc5

handle AttributeError instead of disabling sfa plugin
---

diff --git a/plugins/sfagids.py b/plugins/sfagids.py
index 7c16a54..81c7b1e 100644
--- a/plugins/sfagids.py
+++ b/plugins/sfagids.py
@@ -27,14 +27,15 @@ except:
     sfa = None
 
 def start():
-    #FIXME: disabled by caglar 
-    return
     logger.log("sfagid: plugin starting up ...")
     if not sfa:
         return
     keyfile, certfile = get_keypair(None)
     api = ComponentAPI(key_file=keyfile, cert_file=certfile)
-    api.get_node_key()
+    try:
+        api.get_node_key()
+    except AttributeError:
+        return
 
 def GetSlivers(data, config=None, plc=None):
     if not sfa: