simpler arg passing to the start-qemu-node script
[tests.git] / system / TestNode.py
index 6ce35f7..b482d09 100644 (file)
@@ -3,6 +3,7 @@ import xmlrpclib
 
 import utils
 from TestUser import TestUser
+from TestBox import TestBox
 
 class TestNode:
 
@@ -13,20 +14,37 @@ class TestNode:
 
     def name(self):
         return self.node_spec['node_fields']['hostname']
-        
-    def is_vmware (self):
-        model=self.node_spec['node_fields']['model']
-        return model.find("vmware") >= 0
-
-    def is_qemu (self):
-        model=self.node_spec['node_fields']['model']
+    
+    @staticmethod
+    def is_qemu_model (model):
         return model.find("qemu") >= 0
+    def is_qemu (self):
+        return TestNode.is_qemu_model(self.node_spec['node_fields']['model'])
+
+    @staticmethod
+    def is_real_model (model):
+        return not TestNode.is_qemu_model(model)
+    def is_real (self):
+        return TestNode.is_real_model (self.node_spec['node_fields']['model'])
 
+    @staticmethod
+    def is_local(host_box):
+        if (host_box == "localhost"): return True
+        else: return False
+
+    def buildname(self):
+        return self.test_plc.options.buildname
+        
     def host_box (self):
-        try:
-            return self.node_spec['host_box']
-        except:
-            return 'localhost'
+        if self.is_real ():
+            utils.header("WARNING : real nodes dont have a host box")
+            return None
+        else:
+            try:
+                return self.node_spec['host_box']
+            except:
+                utils.header("WARNING : qemu nodes need a host box")
+                return 'localhost'
 
     def create_node (self):
         ownername = self.node_spec['owner']
@@ -49,8 +67,8 @@ class TestNode:
             for interface in self.node_spec['extra_interfaces']:
                 server.AddNodeNetwork(userauth,self.name(),
                                                     interface['network_fields'])
-                if interface.has_key('attributes'):
-                    for (attribute,value) in interface['attributes'].iteritems():
+                if interface.has_key('settings'):
+                    for (attribute,value) in interface['settings'].iteritems():
                         # locate node network
                         nn = server.GetNodeNetworks(userauth,{'ip':interface['network_fields']['ip']})[0]
                         nnid=nn['nodenetwork_id']
@@ -59,7 +77,7 @@ class TestNode:
                             nnst = server.GetNodeNetworkSettingTypes(userauth,{'name':attribute})[0]
                         except:
                             nnst = server.AddNodeNetworkSettingType(rootauth,{'category':'test',
-                                                                          'name':attribute})
+                                                                              'name':attribute})
                         # attach value
                         server.AddNodeNetworkSetting(userauth,nnid,attribute,value)
 
@@ -86,103 +104,81 @@ class TestNode:
             utils.header('%s has reached debug state'%hostname)
         return status
 
-    def conffile(self,image,hostname,path):
+    def qemu_config(self,hostname,path):
         model=self.node_spec['node_fields']['model']
-        if self.is_vmware():
-            host_box=self.host_box()
-            template='%s/template-vmplayer/node.vmx'%(path)
-            actual='%s/vmplayer-%s/node.vmx'%(path,hostname)
-            sed_command="sed -e s,@BOOTCD@,%s,g %s > %s"%(image,template,actual)
-            utils.header('Creating %s from %s'%(actual,template))
-            utils.system(sed_command)
-        elif self.is_qemu():
-            host_box=self.host_box()
-            mac=self.node_spec['network_fields']['mac']
-            dest_dir="qemu-%s"%(hostname)
-            utils.header('Storing the mac address for node %s'%hostname)
-            file=open(path+'/qemu-'+hostname+'/MAC','a')
-            file.write('%s\n'%mac)
-            file.write(dest_dir)
-            file.close()
-            utils.header ('Transferring configuration files for node %s into %s '%(hostname,host_box))
-            cleandir_command="ssh root@%s rm -rf %s"%(host_box, dest_dir)
-            createdir_command = "ssh root@%s mkdir -p  %s"%(host_box, dest_dir)
-            utils.system(cleandir_command)
-            utils.system(createdir_command)
-            scp_command = "scp -r %s/qemu-%s/* root@%s:/root/%s"%(path,hostname,host_box,dest_dir)
-            utils.system(scp_command)
-        
+        if not self.is_qemu():
+            raise Exception,"wrong"
+        host_box=self.host_box()
+        mac=self.node_spec['network_fields']['mac']
+        # dest_dir is the path that needs to be relevant when qemu is invoked
+        conf_filename="%s/qemu-%s/start-qemu.conf"%(path,hostname)
+        utils.header('Storing qemu config for %s in %s'%(hostname,conf_filename))
+        file=open(conf_filename,'w')
+        file.write('MACADDR=%s\n'%mac)
+        file.write('NODE_ISO=%s.iso\n'%hostname)
+        file.close()
+        if ( not  self.is_local(host_box)):
+            dest_dir="%s/qemu-%s"%(self.buildname(),hostname)
+            utils.header ("Transferring configuration files for node %s"%hostname)
+            utils.header ("Using dir %s on %s"%(dest_dir,host_box))
+            self.test_plc.run_in_host("ssh root@%s rm -rf %s"%(host_box, dest_dir))
+            self.test_plc.run_in_host("ssh root@%s mkdir -p  %s"%(host_box, dest_dir))
+            self.test_plc.run_in_host("scp -r %s/qemu-%s/* root@%s:%s"%(path,hostname,host_box,dest_dir))
+
     def create_boot_cd(self,path):
         model=self.node_spec['node_fields']['model']
         node_spec=self.node_spec
         hostname=node_spec['node_fields']['hostname']
-        encoded=self.test_plc.server.GetBootMedium(self.test_plc.auth_root(), hostname, 'node-iso', '')
+        utils.header("Calling GetBootMedium for %s"%hostname)
+        encoded=self.test_plc.server.GetBootMedium(self.test_plc.auth_root(), hostname, 'node-iso', '', ['serial'])
         if (encoded == ''):
             raise Exception, 'boot.iso not found'
-            
-        if model.find("vmware") >= 0:
-            utils.header('Initializing vmplayer area for node %s'%hostname)
-            clean_dir="rm -rf %s/vmplayer-%s"%(path,hostname)
-            mkdir_command="mkdir -p %s/vmplayer-%s"%(path,hostname)
-            tar_command="tar -C %s/template-vmplayer -cf - . | tar -C %s/vmplayer-%s -xf -"%(path,path,hostname)
-            utils.system(clean_dir)
-            utils.system(mkdir_command)
-            utils.system(tar_command);
-            utils.header('Creating boot medium for node %s'%hostname)
-            file=open(path+'/vmplayer-'+hostname+'/boot_file.iso','w')
-        elif  model.find("qemu") >= 0:
-            clean_dir="rm -rf %s/qemu-%s"%(path,hostname)
-            mkdir_command="mkdir -p %s/qemu-%s"%(path,hostname)
-            utils.system(clean_dir)
-            utils.system(mkdir_command)
-            copy_command="cp -r  %s/template-Qemu/* %s/qemu-%s"%(path,path,hostname)
-            utils.system(copy_command)
-            utils.header('Creating boot medium for node %s'%hostname)
-            file=open(path+'/qemu-'+hostname+'/boot_file.iso','w')
+
+        if  model.find("qemu") >= 0:
+            nodepath="%s/qemu-%s"%(path,hostname)
+            self.test_plc.run_in_host("rm -rf %s"%nodepath)
+            self.test_plc.run_in_host("mkdir -p %s"%nodepath)
+            template="%s/template-qemu"%path
+            self.test_plc.run_in_host("cp -r %s/* %s"%(template,nodepath))
+            self.qemu_config(hostname, path)
         else:
             nodepath="%s/real-%s"%(path,hostname)
-            utils.system("rm -rf %s"%nodepath)
-            utils.system("mkdir %s"%nodepath)
-            file=open("%s/%s"%(nodepath,"/boot_file.iso"),'w')
-
-        file.write(base64.b64decode(encoded))
-        file.close()
-        utils.header('boot cd created for %s'%hostname)
-        self.conffile('boot_file.iso',hostname, path)
+            self.test_plc.run_in_host("rm -rf %s"%nodepath)
+            self.test_plc.run_in_host("mkdir -p %s"%nodepath)
 
+        filename="%s/%s.iso"%(nodepath,hostname)
+        utils.header('Storing boot medium into %s'%filename)
+        file(filename,'w').write(base64.b64decode(encoded))
+    
     def start_node (self,options):
         model=self.node_spec['node_fields']['model']
-        if model.find("vmware") >= 0:
-            self.start_vmware(options)
-        elif model.find("qemu") >= 0:
+        #starting the Qemu nodes before 
+        if model.find("qemu") >= 0:
             self.start_qemu(options)
         else:
             utils.header("TestNode.start_node : ignoring model %s"%model)
 
-    def start_vmware (self,options):
-        hostname=self.node_spec['node_fields']['hostname']
-        path=options.path
-        display=options.display
-        utils.header('Starting vmplayer for node %s on %s'%(hostname,display))
-        utils.system('cd %s/vmplayer-%s ; DISPLAY=%s vmplayer node.vmx < /dev/null >/dev/null 2>/dev/null &'%(path,hostname,display))
-        
     def start_qemu (self, options):
+        utils.header("Starting qemu node")
         host_box=self.host_box()
         hostname=self.node_spec['node_fields']['hostname']
-        path=options.path
-        display=options.display
-        dest_dir="qemu-%s"%(hostname)
-        utils.header('Starting qemu for node %s '%(hostname))
-        utils.system("ssh root@%s ~/%s/env-qemu start "%(host_box, dest_dir ))
-        utils.system("ssh  root@%s DISPLAY=%s  ~/%s/start-qemu-node %s & "%( host_box, display, dest_dir, dest_dir))
+        dest_dir=self.buildname()+"/qemu-%s"%(hostname)
+        utils.header("Starting qemu for node %s on %s"%(hostname,host_box))
+
+        if (not self.is_local(host_box)):
+            host_string="ssh root@%s"%host_box
+        else:
+            host_string=""
         
-    def stop_qemu(self):
-        if not self.is_qemu():
-            return True
-        hostname=self.node_spec['node_fields']['hostname']
-        host_box=self.host_box()
-        utils.system('ssh root@%s  killall qemu'%host_box)
-        utils.header('Stoping qemu emulation of %s on the host machine %s and Restoring the initial network'
-                     %(hostname,host_box))
-        utils.system("ssh root@%s ~/qemu-%s/env-qemu stop "%(host_box, hostname ))
+        self.test_plc.run_in_host("%s ~/%s/env-qemu start >> ~/%s/%s.log "
+                                  %(host_string,  dest_dir, dest_dir, hostname ))
+        self.test_plc.run_in_host("%s ~/%s/start-qemu-node >> ~/%s/%s.log & "
+                                  %(host_string, dest_dir, dest_dir, hostname))
+
+    def kill_qemu (self):
+        hostname = self.name()
+        # kill the right processes 
+        command="./qemu_kill.sh %s"%hostname
+        utils.header("Stopping qemu for host %s on box %s"%(hostname,self.host_box()))
+        TestBox(self.host_box()).run(command)
         return True