From be1eb1161e69740fbe06e3d84a4827fd2d4afaa7 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 3 Mar 2008 07:52:37 +0000 Subject: [PATCH] knows its hostname and uses new locality --- system/TestPlc.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/system/TestPlc.py b/system/TestPlc.py index 7671459..8345b32 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -53,8 +53,11 @@ class TestPlc: else: return name+"[chroot]" + def hostname(self): + return self.plc_spec['hostname'] + def is_local (self): - return self.plc_spec['hostname'] == 'localhost' + return utils.is_local(self.hostname()) # define the API methods on this object through xmlrpc # would help, but not strictly necessary @@ -73,7 +76,7 @@ class TestPlc: if self.is_local(): return command else: - return "ssh %s %s"%(self.plc_spec['hostname'],utils.backslash_shell_specials(command)) + return "ssh %s %s"%(self.hostname(),utils.backslash_shell_specials(command)) def full_command(self,command): return self.to_host(self.host_to_guest(command)) @@ -100,9 +103,9 @@ class TestPlc: utils.system("cp %s /vservers/%s/%s"%(localfile,self.vservername,remotefile)) else: if not self.vserver: - utils.system("scp %s %s:%s/%s"%(localfile,self.plc_spec['hostname'],chroot_dest,remotefile)) + utils.system("scp %s %s:%s/%s"%(localfile,self.hostname(),chroot_dest,remotefile)) else: - utils.system("scp %s %s@/vservers/%s/%s"%(localfile,self.plc_spec['hostname'],self.vservername,remotefile)) + utils.system("scp %s %s@/vservers/%s/%s"%(localfile,self.hostname(),self.vservername,remotefile)) def auth_root (self): return {'Username':self.plc_spec['PLC_ROOT_USER'], -- 2.47.0