reguire gnupg1 on f>=31; sense the system to use gpg1 when installed

[nodemanager.git] / plugins / sfagids.py

diff --git a/plugins/sfagids.py b/plugins/sfagids.py
index 81c7b1e..ac8be79 100644 (file)
--- a/plugins/sfagids.py
+++ b/plugins/sfagids.py
@@ -1,9 +1,6 @@
-#!/usr/bin/python -tt
+#!/usr/bin/python3 -tt

 # vim:set ts=4 sw=4 expandtab:
 #
 # vim:set ts=4 sw=4 expandtab:
 #

-# $Id$
-# $URL$
-#

 # NodeManager plugin for installing SFA GID's in slivers
 # 
 
 # NodeManager plugin for installing SFA GID's in slivers
 # 
 


@@ -15,7 +12,7 @@ import traceback
 import tempfile
 try:
     from sfa.util.namespace import *
 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
     import sfa.util.xmlrpcprotocol as xmlrpcprotocol
     from sfa.trust.certificate import Keypair, Certificate
     from sfa.trust.credential import Credential


@@ -30,11 +27,11 @@ def start():
     logger.log("sfagid: plugin starting up ...")
     if not sfa:
         return
     logger.log("sfagid: plugin starting up ...")
     if not sfa:
         return

-    keyfile, certfile = get_keypair(None)
-    api = ComponentAPI(key_file=keyfile, cert_file=certfile)

     try:
     try:

+        keyfile, certfile = get_keypair(None)
+        api = ComponentAPI(key_file=keyfile, cert_file=certfile)

         api.get_node_key()
         api.get_node_key()

-    except AttributeError:
+    except:

         return
 
 def GetSlivers(data, config=None, plc=None):
         return
 
 def GetSlivers(data, config=None, plc=None):


@@ -112,7 +109,7 @@ def install_trusted_certs(api):
         trusted_gid_names.append(relative_filename)
         gid_filename = trusted_certs_dir + os.sep + relative_filename
         if verbose:
         trusted_gid_names.append(relative_filename)
         gid_filename = trusted_certs_dir + os.sep + relative_filename
         if verbose:

-            print "Writing GID for %s as %s" % (gid.get_hrn(), gid_filename)
+            print("Writing GID for %s as %s" % (gid.get_hrn(), gid_filename))

         gid.save_to_file(gid_filename, save_parents=True)
 
     # remove old certs
         gid.save_to_file(gid_filename, save_parents=True)
 
     # remove old certs


@@ -120,7 +117,7 @@ def install_trusted_certs(api):
     for gid_name in all_gids_names:
         if gid_name not in trusted_gid_names:
             if verbose:
     for gid_name in all_gids_names:
         if gid_name not in trusted_gid_names:
             if verbose:

-                print "Removing old gid ", gid_name
+                print("Removing old gid ", gid_name)

             os.unlink(trusted_certs_dir + os.sep + gid_name)
     
 
             os.unlink(trusted_certs_dir + os.sep + gid_name)
     
 


@@ -128,7 +125,7 @@ def install_trusted_certs(api):
 
 def get_keypair(config = None):
     if not config:
 
 def get_keypair(config = None):
     if not config:

-        config = Config()
+        config = SfaConfig()

     hierarchy = Hierarchy()
     key_dir= hierarchy.basedir
     data_dir = config.data_path
     hierarchy = Hierarchy()
     key_dir= hierarchy.basedir
     data_dir = config.data_path