cleanup slice-fs-* steps, nicer output, and shows contents when it's wrong

[tests.git] / system / TestKey.py

diff --git a/system/TestKey.py b/system/TestKey.py
index 69520ad..4ff08ff 100644 (file)
--- a/system/TestKey.py
+++ b/system/TestKey.py
@@ -1,20 +1,37 @@
+# Thierry Parmentelat <thierry.parmentelat@inria.fr>
+# Copyright (C) 2010 INRIA 
+#
 import utils
 import os, os.path
+from TestSsh import TestSsh
 
 class TestKey:
 
     def __init__ (self,test_plc,key_spec):
        self.test_plc=test_plc
        self.key_spec=key_spec
+        self.test_ssh=TestSsh(self.test_plc.test_ssh)
         
     def name(self):
-        return self.key_spec['name']
+        return self.key_spec['key_name']
 
     def publicpath(self):
         return "keys/%s.pub"%(self.name())
     def privatepath(self):
         return "keys/%s.rsa"%(self.name())
 
+#Not tested yet, don't know if needed
+#    def store_remote_key(self,hostname):
+#        pub=self.publicpath()
+#        priv=self.privatepath()
+#        utils.header("Storing key %s in %s into %s "%(self.name(),pub,hostname))
+#        dir=os.path.dirname(pub)
+#        self.test_ssh.run("mkdir %s"%dir)
+#        self.test_ssh.run("cat %s >> %s"%(self.key_spec['key_fields']['key'],pub))
+#        self.test_ssh.run("cat %s >> %s"%(self.key_spec['private'],priv))
+#        self.test_ssh.run("chmod %s 0400"%priv)
+#        self.test_ssh.run("chmod %s 0444"%pub)
+            
     def store_key(self):
         pub=self.publicpath()
         priv=self.privatepath()