Merge branch 'upstreammaster'

[sfa.git] / sfa / methods / get_key.py

diff --git a/sfa/methods/get_key.py b/sfa/methods/get_key.py
index f84c5fe..4bb6587 100644 (file)
--- a/sfa/methods/get_key.py
+++ b/sfa/methods/get_key.py
@@ -1,13 +1,10 @@
-### $Id:  $
-### $URL:  $
 import os
 import tempfile
 import commands
-from sfa.util.faults import *
-from sfa.util.namespace import *
+from sfa.util.faults import NonExistingRecord, RecordNotFound
+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.parameter import Parameter
 from sfa.util.table import SfaTable
 from sfa.trust.certificate import Keypair
 from sfa.trust.gid import create_uuid
@@ -66,6 +63,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()