-### $Id: $
-### $URL: $
import os
import tempfile
import commands
from sfa.util.faults import *
-from sfa.util.misc import *
+from sfa.util.xrn import hrn_to_urn
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
+from sfa.trust.gid import create_uuid
class get_key(Method):
"""
node = nodes[0]
# look up the sfa record
- table = GeniTable()
+ table = SfaTable()
records = table.findObjects({'type': 'node', 'pointer': node['node_id']})
if not records:
raise RecordNotFound("pointer:" + str(node['node_id']))
# generate a new keypair and gid
uuid = create_uuid()
pkey = Keypair(create=True)
- gid_object = self.api.auth.hierarchy.create_gid(record['hrn'], uuid, pkey)
+ urn = hrn_to_urn(record['hrn'], record['type'])
+ gid_object = self.api.auth.hierarchy.create_gid(urn, uuid, pkey)
gid = gid_object.save_to_string(save_parents=True)
record['gid'] = gid
record.set_gid(gid)
# attempt the scp the key
# and gid onto the node
- # this will only work for planetlab based compoenents
+ # this will only work for planetlab based components
(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/nodekey.key"
- gid_dest="/etc/sfa/nodegid.gid"
+ key_dest="/etc/sfa/node.key"
+ gid_dest="/etc/sfa/node.gid"
scp = "/usr/bin/scp"
- identity = "/etc/planetlab/root_ssh_key.rsa"
- scp_options=" -i %(identity)s %(filename)s " % locals()
+ #identity = "/etc/planetlab/root_ssh_key.rsa"
+ identity = "/etc/sfa/root_ssh_key"
+ scp_options=" -i %(identity)s " % 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()
- 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]