fix xmlrpcprotocol import

[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 bd8059f..67ca9e8 100755 (executable)
--- a/sfa/server/sfa_component_setup.py
+++ b/sfa/server/sfa_component_setup.py
@@ -1,17 +1,19 @@
 #!/usr/bin/python
 import sys
 import os
+import tempfile
 from optparse import OptionParser
 from sfa.util.config import Config
-from sfa.util.xmlrpcprotocol import *
+import sfa.util.xmlrpcprotocol as xmlrpcprotocol
 from sfa.trust.certificate import Keypair, Certificate
 from sfa.trust.credential import Credential
 
+CONFIG_DIR='/etc/sfa'
+TRUSTED_CERTS_DIR = '/etc/sfa/trusted_roots'
+DATA_DIR = '/var/lib/sfa'
+
 def create_default_dirs():
-    config_dir = '/etc/sfa'
-    trusted_certs_dir = '/etc/sfa/trusted_certs'
-    data_dir = '/var/lib/sfa'
-    all_dirs = [config_dir, trusted_certs_dir, data_dir]
+    all_dirs = [CONFIG_DIR, TRUSTED_CERTS_DIR, DATA_DIR]
     for dir in all_dirs:
         if not os.path.exists(dir):
             os.mkdir(dir)
@@ -26,7 +28,7 @@ def get_node_key(options):
     certfile = tempfile.mktemp()
     key = Keypair(create=True)
     key.save_to_file(keyfile)
-    cert = Certificate(subject=component)
+    cert = Certificate(subject=subject)
     cert.set_issuer(key=key, subject=subject)
     cert.set_pubkey(key)
     cert.sign()
@@ -88,7 +90,7 @@ def main():
 
     create_default_dirs()
     if options.key:
-        get_key(options)
+        get_node_key(options)
     if options.certs:
         get_certs(options)
     if options.gids: