fixing the logic for r14697 and adding a clarifying note.

[nodemanager.git] / plugins / sliverauth.py

diff --git a/plugins/sliverauth.py b/plugins/sliverauth.py
index 2207dbe..8bb03a2 100644 (file)
--- a/plugins/sliverauth.py
+++ b/plugins/sliverauth.py
@@ -17,6 +17,9 @@ import logger
 import tools
 
 def start(options, conf):
+    # XXX REMOVE ME
+    return
+
     logger.log("sliverauth plugin starting up...")
 
 def SetSliverTag(plc, slice, tagname, value):
@@ -28,7 +31,7 @@ def SetSliverTag(plc, slice, tagname, value):
         slivertag_id=slivertags[0]['slice_tag_id']
         plc.UpdateSliceTag(slivertag_id,value)
 
-def GetSlivers(plc, data, conf):
+def GetSlivers(data, config, plc):
     if 'slivers' not in data:
         logger.log("sliverauth: getslivers data lack's sliver information. IGNORING!")
         return
@@ -37,7 +40,7 @@ def GetSlivers(plc, data, conf):
     for sliver in data['slivers']:
         found_hmac = False
         for attribute in sliver['attributes']:
-           name = attribute.get('tagname',attribute.get('name',''))
+            name = attribute.get('tagname',attribute.get('name',''))
             if name == 'hmac':
                 found_hmac = True
                 hmac = attribute['value']