X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sfa%2Fplanetlab%2Fplcomponentdriver.py;h=39788bb50b5225e9add22d76eff74b87464ae4fd;hb=3e6097e2d50ff322b45f53fcb22d07fc16adbdb6;hp=25f9b7af62167b3ae8335097070202313d23ce83;hpb=d4fdf5099eff793459ad956b6a40ff85003cecc0;p=sfa.git

diff --git a/sfa/planetlab/plcomponentdriver.py b/sfa/planetlab/plcomponentdriver.py
index 25f9b7af..39788bb5 100644
--- a/sfa/planetlab/plcomponentdriver.py
+++ b/sfa/planetlab/plcomponentdriver.py
@@ -9,6 +9,8 @@ from sfa.trust.certificate import Certificate, Keypair
 from sfa.trust.gid import GID
 
 ####################
+
+
 class PlComponentDriver:
     """
     This class is the type for the toplevel 'api' object 
@@ -18,12 +20,12 @@ class PlComponentDriver:
     some tweaks as compared with a service running in the infrastructure.
     """
 
-    def __init__ (self, config):
+    def __init__(self, config):
         self.nodemanager = NodeManager(config)
 
     def sliver_exists(self):
         sliver_dict = self.nodemanager.GetXIDs()
-        ### xxx slicename is undefined
+        # xxx slicename is undefined
         if slicename in sliver_dict.keys():
             return True
         else:
@@ -32,14 +34,14 @@ class PlComponentDriver:
     def get_registry(self):
         addr, port = self.config.SFA_REGISTRY_HOST, self.config.SFA_REGISTRY_PORT
         url = "http://%(addr)s:%(port)s" % locals()
-        ### xxx this would require access to the api...
+        # xxx this would require access to the api...
         server = SfaServerProxy(url, self.key_file, self.cert_file)
         return server
 
     def get_node_key(self):
         # this call requires no authentication,
         # so we can generate a random keypair here
-        subject="component"
+        subject = "component"
         (kfd, keyfile) = tempfile.mkstemp()
         (cfd, certfile) = tempfile.mkstemp()
         key = Keypair(create=True)
@@ -51,7 +53,7 @@ class PlComponentDriver:
         cert.save_to_file(certfile)
         registry = self.get_registry()
         # the registry will scp the key onto the node
-        registry.get_key_from_incoming_ip()        
+        registry.get_key_from_incoming_ip()
 
     # override the method in SfaApi
     def getCredential(self):
@@ -62,7 +64,7 @@ class PlComponentDriver:
         config_dir = self.config.config_path
         cred_filename = path + os.sep + 'node.cred'
         try:
-            credential = Credential(filename = cred_filename)
+            credential = Credential(filename=cred_filename)
             return credential.save_to_string(save_parents=True)
         except IOError:
             node_pkey_file = config_dir + os.sep + "node.key"
@@ -76,11 +78,12 @@ class PlComponentDriver:
             gid = GID(filename=node_gid_file)
             hrn = gid.get_hrn()
             # get credential from registry
-            cert_str = Certificate(filename=cert_filename).save_to_string(save_parents=True)
+            cert_str = Certificate(
+                filename=cert_filename).save_to_string(save_parents=True)
             registry = self.get_registry()
             cred = registry.GetSelfCredential(cert_str, hrn, 'node')
             # xxx credfile is undefined
-            Credential(string=cred).save_to_file(credfile, save_parents=True)            
+            Credential(string=cred).save_to_file(credfile, save_parents=True)
 
             return cred
 
@@ -90,7 +93,8 @@ class PlComponentDriver:
         """
         files = ["server.key", "server.cert", "node.cred"]
         for f in files:
-            # xxx KEYDIR is undefined, could be meant to be "/var/lib/sfa/" from sfa_component_setup.py
+            # xxx KEYDIR is undefined, could be meant to be "/var/lib/sfa/"
+            # from sfa_component_setup.py
             filepath = KEYDIR + os.sep + f
             if os.path.isfile(filepath):
                 os.unlink(f)