fix spelling error

[sfa.git] / sfa / server / sfa_component_setup.py

diff --git a/sfa/server/sfa_component_setup.py b/sfa/server/sfa_component_setup.py
index 67fe52a..79fe780 100755 (executable)
--- a/sfa/server/sfa_component_setup.py
+++ b/sfa/server/sfa_component_setup.py
@@ -108,9 +108,10 @@ def get_credential(registry=None, verbose=False):
 
         # get credential from registry 
         registry = get_server(url=registry, keyfile=keyfile, certfile=certfile)
+        cert = Certificate(filename=certfile)
         cert_str = cert.save_to_string(save_parents=True)
         cred = registry.get_self_credential(cert_str, 'node', hrn)    
-        Credential(string=cred).save_to_file(credfile)
+        Credential(string=cred).save_to_file(credfile, save_parents=True)
     
     return cred
 
@@ -120,7 +121,8 @@ def get_trusted_certs(registry=None, verbose=False):
     """
     # define useful variables
     config = Config()
-    data_dir = config.data_path
+    data_dir = config.SFA_DATA_DIR
+    config_dir = config.SFA_CONFIG_DIR
     trusted_certs_dir = config.get_trustedroots_dir()
     keyfile = data_dir + os.sep + "server.key"
     certfile = data_dir + os.sep + "server.cert"
@@ -150,6 +152,8 @@ def get_trusted_certs(registry=None, verbose=False):
     all_gids_names = os.listdir(trusted_certs_dir)
     for gid_name in all_gids_names:
         if gid_name not in trusted_gid_names:
+            if verbose:
+                print "Removing old gid ", gid_name
             os.unlink(trusted_certs_dir + os.sep + gid_name)                     
 
 def get_gids(registry=None, verbose=False):
@@ -160,6 +164,7 @@ def get_gids(registry=None, verbose=False):
     # define useful variables
     config = Config()
     data_dir = config.data_path
+    config_dir = config.SFA_CONFIG_DIR
     trusted_certs_dir = config.get_trustedroots_dir()
     keyfile = data_dir + os.sep + "server.key"
     certfile = data_dir + os.sep + "server.cert"
@@ -178,7 +183,7 @@ def get_gids(registry=None, verbose=False):
     # get a list of slices on this node
     from sfa.plc.api import ComponentAPI
     api = ComponentAPI()
-    slicenames = api.nodemanger.GetXIDs().keys()   
+    slicenames = api.nodemanager.GetXIDs().keys()   
     slicename_to_hrn = lambda name: ".".join([interface_hrn, name.replace('_', '.')])
     hrns = map(slicename_to_hrn, slicenames)