From: Anil-Kumar Vengalil <Anil-Kumar.Vengalil@sophia.inria.fr>
Date: Thu, 8 Oct 2009 11:40:50 +0000 (+0000)
Subject: modifications realted to special account
X-Git-Tag: tests-4.3-5~2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3f6cdb521c9cf2a7db1c9123c89f99f1e92a63f9;p=tests.git

modifications realted to special account
---

diff --git a/system/TestPlc.py b/system/TestPlc.py
index e04325e..377c4a4 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -1169,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)
 
diff --git a/system/TestSlice.py b/system/TestSlice.py
index 5b89b08..be8ad58 100644
--- a/system/TestSlice.py
+++ b/system/TestSlice.py
@@ -114,8 +114,8 @@ class TestSlice:
                     # nm restart after first failure, if requested 
                     if options.forcenm and hostname not in restarted:
                         utils.header ("forcenm option : restarting nm on %s"%hostname)
-                        restart_test_ssh=TestSsh(hostname,key="/etc/planetlab/root_ssh_key.rsa")
-                        access=self.test_plc.run_in_guest(restart_test_ssh.actual_command('service nm restart'))
+                        restart_test_ssh=TestSsh(hostname,key="keys/key1.rsa")
+                        access=restart_test_ssh.actual_command('service nm restart')
                         if (access==0):
                             utils.header('nm restarted on %s'%hostname)
                         else:
diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py
index a4ad875..1a1397d 100644
--- a/system/TestSliceSfa.py
+++ b/system/TestSliceSfa.py
@@ -89,8 +89,8 @@ class TestSliceSfa:
                     # nm restart after first failure, if requested 
                     if options.forcenm and hostname not in restarted:
                         utils.header ("forcenm option : restarting nm on %s"%hostname)
-                        restart_test_ssh=TestSsh(hostname,key="/etc/planetlab/root_ssh_key.rsa")
-                        access=self.test_plc.run_in_guest(restart_test_ssh.actual_command('service nm restart'))
+                        restart_test_ssh=TestSsh(hostname,key="keys/key1.rsa")
+                        access=restart_test_ssh.actual_command('service nm restart')
                         if (access==0):
                             utils.header('nm restarted on %s'%hostname)
                         else: