X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestPlc.py;h=377c4a4ca8dac4ebd5747affa9644b67f9c906d1;hb=3f6cdb521c9cf2a7db1c9123c89f99f1e92a63f9;hp=ddd322780a35954d94531f1fd1a1208954e04184;hpb=7cecf13207bab1c156efd81c3eb2d92080c34c88;p=tests.git

diff --git a/system/TestPlc.py b/system/TestPlc.py
index ddd3227..377c4a4 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -540,11 +540,6 @@ class TestPlc:
             os.mkdir(dir)
         vservername=self.vservername
         overall=True
-        prefix = 'root_ssh_key'
-        for ext in [ 'pub', 'rsa' ] :
-            src="/vservers/%(vservername)s/etc/planetlab/%(prefix)s.%(ext)s"%locals()
-            dst="keys/%(vservername)s.%(ext)s"%locals()
-            if self.test_ssh.fetch(src,dst) != 0: overall=False
         prefix = 'debug_ssh_key'
         for ext in [ 'pub', 'rsa' ] :
             src="/vservers/%(vservername)s/etc/planetlab/%(prefix)s.%(ext)s"%locals()
@@ -1174,9 +1169,9 @@ class TestPlc:
             test_site = TestSite (self,site_spec)
             for node_spec in site_spec['nodes']:
                 test_node=TestNode(self,test_site,node_spec)
-                test_ssh = TestSsh (test_node.name(),key="/etc/planetlab/root_ssh_key.rsa")
-                to_plc = self.actual_command_in_guest ( test_ssh.actual_command("tar -C /var/log -cf - ."))
-                command = to_plc + "| tar -C logs/node.var-log.%s -xf -"%test_node.name()
+                test_ssh = TestSsh (test_node.name(),key="keys/key1.rsa")
+                command = test_ssh.actual_command("tar -C /var/log -cf - .")
+                command = command + "| tar -C logs/node.var-log.%s -xf -"%test_node.name()
                 utils.system("mkdir -p logs/node.var-log.%s"%test_node.name())
                 utils.system(command)