git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed another bunch of references to geni
[sfa.git]
/
sfa
/
methods
/
get_key.py
diff --git
a/sfa/methods/get_key.py
b/sfa/methods/get_key.py
index
27969b8
..
c641985
100644
(file)
--- a/
sfa/methods/get_key.py
+++ b/
sfa/methods/get_key.py
@@
-4,11
+4,11
@@
import os
import tempfile
import commands
from sfa.util.faults import *
import tempfile
import commands
from sfa.util.faults import *
-from sfa.util.
misc
import *
+from sfa.util.
namespace
import *
from sfa.util.method import Method
from sfa.util.parameter import Parameter, Mixed
from sfa.trust.auth import Auth
from sfa.util.method import Method
from sfa.util.parameter import Parameter, Mixed
from sfa.trust.auth import Auth
-from sfa.util.
genitable import *
+from sfa.util.
table import SfaTable
from sfa.trust.certificate import Keypair
class get_key(Method):
from sfa.trust.certificate import Keypair
class get_key(Method):
@@
-36,7
+36,7
@@
class get_key(Method):
node = nodes[0]
# look up the sfa record
node = nodes[0]
# look up the sfa record
- table =
Geni
Table()
+ table =
Sfa
Table()
records = table.findObjects({'type': 'node', 'pointer': node['node_id']})
if not records:
raise RecordNotFound("pointer:" + str(node['node_id']))
records = table.findObjects({'type': 'node', 'pointer': node['node_id']})
if not records:
raise RecordNotFound("pointer:" + str(node['node_id']))
@@
-55,21
+55,21
@@
class get_key(Method):
# attempt the scp the key
# and gid onto the node
# attempt the scp the key
# and gid onto the node
- # this will only work for planetlab based compo
e
nents
+ # this will only work for planetlab based components
(kfd, key_filename) = tempfile.mkstemp()
(gfd, gid_filename) = tempfile.mkstemp()
pkey.save_to_file(key_filename)
(kfd, key_filename) = tempfile.mkstemp()
(gfd, gid_filename) = tempfile.mkstemp()
pkey.save_to_file(key_filename)
- gid_
str = gid.save_to_file(
save_parents=True)
+ gid_
object.save_to_file(gid_filename,
save_parents=True)
host = node['hostname']
key_dest="/etc/sfa/node.key"
gid_dest="/etc/sfa/node.gid"
scp = "/usr/bin/scp"
identity = "/etc/sfa/root_ssh_key"
host = node['hostname']
key_dest="/etc/sfa/node.key"
gid_dest="/etc/sfa/node.gid"
scp = "/usr/bin/scp"
identity = "/etc/sfa/root_ssh_key"
- scp_options=" -i %(identity)s
%(filename)s
" % locals()
+ scp_options=" -i %(identity)s " % locals()
scp_options+="-o StrictHostKeyChecking=no " % locals()
scp_options+="-o StrictHostKeyChecking=no " % locals()
- scp_key_command="%(scp)s %(scp_options)s root@%(host)s:%(key_dest)s" %\
+ scp_key_command="%(scp)s %(scp_options)s
%(key_filename)s
root@%(host)s:%(key_dest)s" %\
locals()
locals()
- scp_gid_command="%(scp)s %(scp_options)s root@%(host)s:%(gid_dest)s" %\
+ scp_gid_command="%(scp)s %(scp_options)s
%(gid_filename)s
root@%(host)s:%(gid_dest)s" %\
locals()
all_commands = [scp_key_command, scp_gid_command]
locals()
all_commands = [scp_key_command, scp_gid_command]