rename TestQemu into TestQemuBox

[tests.git] / system / TestPlc.py

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 020ac25..1ccdc80 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -16,7 +16,7 @@ from TestUser import TestUser
 from TestKey import TestKey
 from TestSlice import TestSlice
 from TestSliver import TestSliver
-from TestBox import TestBox
+from TestBoxQemu import TestBoxQemu
 from TestSsh import TestSsh
 from TestApiserver import TestApiserver
 from TestSliceSfa import TestSliceSfa
@@ -93,17 +93,18 @@ class TestPlc:
         'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', 'qemu_export', 'qemu_kill_all', 'qemu_start', SEP,
        'sfa_install', 'sfa_configure', 'cross_sfa_configure', 'sfa_import', 'sfa_start', SEPSFA,
         'sfi_configure@1', 'sfa_add_user@1', 'sfa_add_slice@1', 'sfa_discover@1', SEPSFA,
-        'sfa_create_slice@1', 'sfa_check_slice_plc', SEPSFA, 
+        'sfa_create_slice@1', 'sfa_check_slice_plc@1', SEPSFA, 
         'sfa_update_user@1', 'sfa_update_slice@1', 'sfa_view@1', 'sfa_utest@1',SEPSFA,
         # we used to run plcsh_stress_test, and then ssh_node_debug and ssh_node_boot
         # but as the stress test might take a while, we sometimes missed the debug mode..
         'ssh_node_debug', 'plcsh_stress_test@1', SEP,
         'ssh_node_boot', 'ssh_slice', 'check_initscripts', SEP,
         'ssh_slice_sfa@1', 'sfa_delete_slice@1', 'sfa_delete_user@1', SEPSFA,
-        'check_tcp',  'check_hooks@1',  SEP,
+        'check_tcp',  SEP,
         'force_gather_logs', 'force_local_post', SEP,
         ]
     other_steps = [ 
+        'check_hooks',  
         'free_all',
         'show_boxes', 'local_list','local_rel','local_rel_plc','local_rel_qemu',SEP,
         'plc_stop', 'vs_start', 'vs_stop', SEP,
@@ -301,7 +302,7 @@ class TestPlc:
         for (box,nodes) in self.gather_hostBoxes().iteritems():
             # pass the first nodename, as we don't push template-qemu on testboxes
             nodedir=nodes[0].nodedir()
-            TestBox(box,self.options.buildname).qemu_kill_all(nodedir)
+            TestBoxQemu(box,self.options.buildname).qemu_kill_all(nodedir)
         return True
 
     # make this a valid step
@@ -309,7 +310,7 @@ class TestPlc:
         'list all qemu instances on the qemu boxes involved by this setup'
         for (box,nodes) in self.gather_hostBoxes().iteritems():
             # this is the brute force version, kill all qemus on that host box
-            TestBox(box,self.options.buildname).qemu_list_all()
+            TestBoxQemu(box,self.options.buildname).qemu_list_all()
         return True
 
     # kill only the right qemus
@@ -1158,13 +1159,13 @@ class TestPlc:
 
     def conffile(self,filename):
         return "%s/%s"%(self.confdir(),filename)
-    def confsubdir(self,dirname,clean):
+    def confsubdir(self,dirname,clean,dry_run=False):
         subdirname="%s/%s"%(self.confdir(),dirname)
         if clean:
             utils.system("rm -rf %s"%subdirname)
         if not os.path.isdir(subdirname): 
             utils.system("mkdir -p %s"%subdirname)
-        if not os.path.isdir(subdirname):
+        if not dry_run and not os.path.isdir(subdirname):
             raise "Cannot create config subdir %s for plc %s"%(dirname,self.name())
         return subdirname
         
@@ -1205,8 +1206,9 @@ class TestPlc:
         return True
 
     def aggregate_xml_line(self):
-        return '<aggregate addr="%s" hrn="%s" port="12347"/>' % \
-            (self.vserverip,self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH'])
+        port=self.plc_spec['sfa']['neighbours-port']
+        return '<aggregate addr="%s" hrn="%s" port="%r"/>' % \
+            (self.vserverip,self.plc_spec['sfa']['SFA_REGISTRY_ROOT_AUTH'],port)
 
     def registry_xml_line(self):
         return '<registry addr="%s" hrn="%s" port="12345"/>' % \
@@ -1242,10 +1244,10 @@ class TestPlc:
         return self.run_in_guest('service sfa start')==0
 
     def sfi_configure(self):
-        "Create /root/.sfi on the plc side"
+        "Create /root/.sfi on the plc side for sfi client configuration"
         sfa_spec=self.plc_spec['sfa']
-        "sfi client configuration"
-       dir_name=self.confsubdir("dot-sfi",clean=True)
+       dir_name=self.confsubdir("dot-sfi",clean=True,dry_run=self.options.dry_run)
+        if self.options.dry_run: return True
        file_name=dir_name + os.sep + sfa_spec['piuser'] + '.pkey'
         fileconf=open(file_name,'w')
         fileconf.write (self.plc_spec['keys'][0]['private'])