X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fmethods%2Fget_key.py;h=5e3f3fd63108ae02f30a635202b33bcd16e2f53e;hb=dbce495b6f2e7d8dccbfb18c5507907d784c143b;hp=c641985b6b71f31e62e02859434b95e44c9852b7;hpb=3d7237fa0b5f2b4a60cb97c7fb3b6aecfd94558a;p=sfa.git diff --git a/sfa/methods/get_key.py b/sfa/methods/get_key.py index c641985b..5e3f3fd6 100644 --- a/sfa/methods/get_key.py +++ b/sfa/methods/get_key.py @@ -4,12 +4,13 @@ import os import tempfile import commands from sfa.util.faults import * -from sfa.util.namespace import * +from sfa.util.namespace 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.table import SfaTable from sfa.trust.certificate import Keypair +from sfa.trust.gid import create_uuid class get_key(Method): """ @@ -45,7 +46,8 @@ class get_key(Method): # 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) @@ -64,6 +66,7 @@ class get_key(Method): key_dest="/etc/sfa/node.key" gid_dest="/etc/sfa/node.gid" scp = "/usr/bin/scp" + #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()