git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
166f790
)
fix some name errors
author
Tony Mack
<tmack@cs.princeton.edu>
Wed, 9 Dec 2009 17:46:19 +0000
(17:46 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Wed, 9 Dec 2009 17:46:19 +0000
(17:46 +0000)
sfa/server/sfa_component_setup.py
patch
|
blob
|
history
diff --git
a/sfa/server/sfa_component_setup.py
b/sfa/server/sfa_component_setup.py
index
fdc60f4
..
9c06889
100755
(executable)
--- a/
sfa/server/sfa_component_setup.py
+++ b/
sfa/server/sfa_component_setup.py
@@
-9,6
+9,7
@@
import sfa.util.misc as misc
from sfa.trust.certificate import Keypair, Certificate
from sfa.trust.credential import Credential
from sfa.trust.gid import GID
from sfa.trust.certificate import Keypair, Certificate
from sfa.trust.credential import Credential
from sfa.trust.gid import GID
+from sfa.trust.hierarchy import Hierarchy
def get_server(url=None, port=None, keyfile=None, certfile=None,verbose=False):
"""
def get_server(url=None, port=None, keyfile=None, certfile=None,verbose=False):
"""
@@
-59,7
+60,7
@@
def get_node_key(registry=None, verbose=False):
cert.sign()
cert.save_to_file(certfile)
cert.sign()
cert.save_to_file(certfile)
- registry = get_server(
service_url = options.
registry, keyfile=keyfile, certfile=certfile)
+ registry = get_server(
url =
registry, keyfile=keyfile, certfile=certfile)
registry.get_key()
def create_server_keypair(keyfile=None, certfile=None, hrn="component", verbose=False):
registry.get_key()
def create_server_keypair(keyfile=None, certfile=None, hrn="component", verbose=False):
@@
-74,7
+75,7
@@
def create_server_keypair(keyfile=None, certfile=None, hrn="component", verbose=
cert.sign()
cert.save_to_file(certfile, save_parents=True)
cert.sign()
cert.save_to_file(certfile, save_parents=True)
-def get_credential(registry=
registry
, verbose=False):
+def get_credential(registry=
None
, verbose=False):
config = Config()
hierarchy = Hierarchy()
key_dir= hierarchy.basedir
config = Config()
hierarchy = Hierarchy()
key_dir= hierarchy.basedir
@@
-213,17
+214,17
@@
def dispatch(options, args):
create_default_dirs()
if options.key:
create_default_dirs()
if options.key:
- if verbose:
+ if
options.
verbose:
print "Getting the component's pkey"
print "Getting the component's pkey"
- get_node_key(
options.registry,
options.verbose)
+ get_node_key(
registry=options.registry, verbose=
options.verbose)
if options.certs:
if options.verbose:
print "Getting the component's trusted certs"
if options.certs:
if options.verbose:
print "Getting the component's trusted certs"
- get_certs(options.verbose)
+ get_certs(
verbose=
options.verbose)
if options.gids:
if options.verbose:
print "Geting the component's GIDs"
if options.gids:
if options.verbose:
print "Geting the component's GIDs"
- get_gids(options.verbose)
+ get_gids(
verbose=
options.verbose)
def main():
args = sys.argv
def main():
args = sys.argv