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 (parent:
dced55d
)
fix NameError in ComponentAPI.get_credential
author
Tony Mack
<tmack@cs.princeton.edu>
Tue, 7 Sep 2010 21:35:41 +0000
(21:35 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Tue, 7 Sep 2010 21:35:41 +0000
(21:35 +0000)
sfa/plc/api.py
patch
|
blob
|
history
diff --git
a/sfa/plc/api.py
b/sfa/plc/api.py
index
ddca04d
..
800ac3f
100644
(file)
--- a/
sfa/plc/api.py
+++ b/
sfa/plc/api.py
@@
-643,6
+643,7
@@
class ComponentAPI(BaseAPI):
except IOError:
node_pkey_file = config_dir + os.sep + "node.key"
node_gid_file = config_dir + os.sep + "node.gid"
except IOError:
node_pkey_file = config_dir + os.sep + "node.key"
node_gid_file = config_dir + os.sep + "node.gid"
+ cert_filename = path + os.sep + 'server.cert'
if not os.path.exists(node_pkey_file) or \
not os.path.exists(node_gid_file):
self.get_node_key()
if not os.path.exists(node_pkey_file) or \
not os.path.exists(node_gid_file):
self.get_node_key()
@@
-651,6
+652,7
@@
class ComponentAPI(BaseAPI):
gid = GID(filename=node_gid_file)
hrn = gid.get_hrn()
# get credential from registry
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)
registry = self.get_registry()
cred = registry.get_self_credential(cert_str, 'node', hrn)
Credential(string=cred).save_to_file(credfile, save_parents=True)
registry = self.get_registry()
cred = registry.get_self_credential(cert_str, 'node', hrn)
Credential(string=cred).save_to_file(credfile, save_parents=True)