obsolete stuff for vmplayer

[tests.git] / system / TestPlc.py

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 6c2195b..9192f89 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -16,6 +16,7 @@ from TestKey import TestKey
 from TestSlice import TestSlice
 from TestSliver import TestSliver
 from TestBox import TestBox
+from TestSsh import TestSsh
 
 # step methods must take (self, options) and return a boolean
 
@@ -35,6 +36,7 @@ class TestPlc:
     def __init__ (self,plc_spec):
        self.plc_spec=plc_spec
        self.path=os.path.dirname(sys.argv[0])
+       self.test_ssh=TestSsh(self.plc_spec['hostname'],self.path)
         try:
             self.vserverip=plc_spec['vserverip']
             self.vservername=plc_spec['vservername']
@@ -57,39 +59,29 @@ class TestPlc:
         return self.plc_spec['hostname']
 
     def is_local (self):
-        return utils.is_local(self.hostname())
+        return self.test_ssh.is_local()
 
     # define the API methods on this object through xmlrpc
     # would help, but not strictly necessary
     def connect (self):
        pass
-    
-    # command gets run in the chroot/vserver
-    def host_to_guest(self,command):
-        if self.vserver:
-            return "vserver %s exec %s"%(self.vservername,command)
-        else:
-            return "chroot /plc/root %s"%utils.backslash_shell_specials(command)
-
-    # command gets run on the right box
-    def to_host(self,command):
-        if self.is_local():
-            return command
-        else:
-            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))
+        return self.test_ssh.to_host(self.host_to_guest(command))
 
     def run_in_guest (self,command):
         return utils.system(self.full_command(command))
+    
     def run_in_host (self,command):
-        return utils.system(self.to_host(command))
-
-    # xxx quick n dirty
-    def run_in_guest_piped (self,local,remote):
-        return utils.system(local+" | "+self.full_command(remote))
+        return utils.system(self.test_ssh.to_host(command))
 
+    #command gets run in the chroot/vserver
+    def host_to_guest(self,command):
+        if self.vserver:
+            return "vserver %s exec %s"%(self.vservername,command)
+        else:
+            return "chroot /plc/root %s"%TestSsh.backslash_shell_specials(command)
+    
     # copy a file to the myplc root image - pass in_data=True if the file must go in /plc/data
     def copy_in_guest (self, localfile, remotefile, in_data=False):
         if in_data:
@@ -107,6 +99,12 @@ class TestPlc:
             else:
                 utils.system("scp %s %s@/vservers/%s/%s"%(localfile,self.hostname(),self.vservername,remotefile))
 
+
+        # xxx quick n dirty
+    def run_in_guest_piped (self,local,remote):
+        return utils.system(local+" | "+self.full_command(remote))
+       
+
     def auth_root (self):
        return {'Username':self.plc_spec['PLC_ROOT_USER'],
                'AuthMethod':'password',
@@ -177,7 +175,7 @@ class TestPlc:
         return True
 
     # kill only the right qemus
-    def kill_qemus(self,options):
+    def force_kill_qemus(self,options):
         for (box,nodes) in self.gather_hostBoxes().iteritems():
            # push the script
            TestBox(box,options.buildname).copy("qemu_kill.sh") 
@@ -205,17 +203,14 @@ class TestPlc:
         self.run_in_host('rpm -e myplc')
         ##### Clean up the /plc directory
         self.run_in_host('rm -rf  /plc/data')
+        ##### stop any running vservers
+        self.run_in_host('for vserver in $(ls /vservers/* | sed -e s,/vservers/,,) ; do vserver $vserver stop ; done')
         return True
 
     def uninstall_vserver(self,options):
         self.run_in_host("vserver --silent %s delete"%self.vservername)
         return True
 
-    def stop_all_vservers (self,options):
-        ##### stop any running vservers
-        self.run_in_host('for vserver in $(ls -d /vservers/* | sed -e s,/vservers/,,) ; do echo Stopping $vserver; vserver $vserver stop ; done')
-       return True
-
     def uninstall(self,options):
         # if there's a chroot-based myplc running, and then a native-based myplc is being deployed
         # it sounds safer to have the former uninstalled too
@@ -225,7 +220,6 @@ class TestPlc:
             self.uninstall_chroot(options)
         else:
             self.uninstall_chroot(options)
-           self.stop_all_vservers(options)
         return True
 
     ### install
@@ -233,7 +227,6 @@ class TestPlc:
         # nothing to do
         return True
 
-    # xxx this would not work with hostname != localhost as mylc-init-vserver was extracted locally
     def install_vserver(self,options):
         # we need build dir for vtest-init-vserver
         if self.is_local():
@@ -241,15 +234,16 @@ class TestPlc:
             build_dir=self.path+"/build"
         else:
             # use a standard name - will be relative to HOME 
-            build_dir="tests-system-build"
+            build_dir="options.buildname"
+       # run checkout in any case - would do an update if already exists
         build_checkout = "svn checkout %s %s"%(options.build_url,build_dir)
         if self.run_in_host(build_checkout) != 0:
             raise Exception,"Cannot checkout build dir"
         # the repo url is taken from myplc-url 
         # with the last two steps (i386/myplc...) removed
         repo_url = options.myplc_url
-        repo_url = os.path.dirname(repo_url)
-        repo_url = os.path.dirname(repo_url)
+        for level in [ 'rpmname','arch' ]:
+           repo_url = os.path.dirname(repo_url)
         create_vserver="%s/vtest-init-vserver.sh %s %s -- --interface eth0:%s"%\
             (build_dir,self.vservername,repo_url,self.vserverip)
         if self.run_in_host(create_vserver) != 0:
@@ -333,7 +327,7 @@ class TestPlc:
     # could use a TestKey class
     def store_keys(self, options):
         for key_spec in self.plc_spec['keys']:
-            TestKey(self,key_spec).store_key()
+               TestKey(self,key_spec).store_key()
         return True
 
     def clean_keys(self, options):