super-speed-up-slices

diff --git a/system/TestApiserver.py b/system/TestApiserver.py
index ea85300..a0024a6 100644 (file)
--- a/system/TestApiserver.py
+++ b/system/TestApiserver.py
@@ -49,6 +49,7 @@ server_methods = [ ('GetNodes' ,  []),
                    ('AddLeases', True),
                    ('GetLeases', []),
                    ('DeleteLeases',True),
                    ('AddLeases', True),
                    ('GetLeases', []),
                    ('DeleteLeases',True),

+                   ('GetConfFiles',[]),

                    ('AddConfFile','True'),
                    ('GetSliceTags',[]),
                    ('system.listMethods',[]),
                    ('AddConfFile','True'),
                    ('GetSliceTags',[]),
                    ('system.listMethods',[]),

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 6c8bb55..b983f46 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -169,7 +169,7 @@ class TestPlc:
         'gather_logs_force', SEP,
         ]
     other_steps = [ 
         'gather_logs_force', SEP,
         ]
     other_steps = [ 

-        'export', 'show_boxes', SEP,
+        'export', 'show_boxes', 'super_speed_up_slices', SEP,

         'check_hooks', 'plc_stop', 'plcvm_start', 'plcvm_stop', SEP,
         'delete_initscripts', 'delete_nodegroups','delete_all_sites', SEP,
         'delete_sites', 'delete_nodes', 'delete_slices', 'keys_clean', SEP,
         'check_hooks', 'plc_stop', 'plcvm_start', 'plcvm_stop', SEP,
         'delete_initscripts', 'delete_nodegroups','delete_all_sites', SEP,
         'delete_sites', 'delete_nodes', 'delete_slices', 'keys_clean', SEP,


@@ -1235,20 +1235,28 @@ class TestPlc:
         return PlcapiUrlScanner (self.auth_root(),ip=self.vserverip).scan()
 
     def speed_up_slices (self):
         return PlcapiUrlScanner (self.auth_root(),ip=self.vserverip).scan()
 
     def speed_up_slices (self):

-        "tweak nodemanager settings on all nodes using a conf file"
+        "tweak nodemanager cycle (wait time) to 30+/-10 s"
+        return self._speed_up_slices (30,10)
+    def super_speed_up_slices (self):
+        "dev mode: tweak nodemanager cycle (wait time) to 5+/-1 s"
+        return self._speed_up_slices (5,1)
+
+    def _speed_up_slices (self, p, r):

         # create the template on the server-side 
         template="%s.nodemanager"%self.name()
         template_file = open (template,"w")
         # create the template on the server-side 
         template="%s.nodemanager"%self.name()
         template_file = open (template,"w")

-        template_file.write('OPTIONS="-p 30 -r 11 -d"\n')
+        template_file.write('OPTIONS="-p %s -r %s -d"\n'%(p,r))

         template_file.close()
         in_vm="/var/www/html/PlanetLabConf/nodemanager"
         remote="%s/%s"%(self.vm_root_in_host(),in_vm)
         self.test_ssh.copy_abs(template,remote)
         # Add a conf file
         template_file.close()
         in_vm="/var/www/html/PlanetLabConf/nodemanager"
         remote="%s/%s"%(self.vm_root_in_host(),in_vm)
         self.test_ssh.copy_abs(template,remote)
         # Add a conf file

-        self.apiserver.AddConfFile (self.auth_root(),
-                                    {'dest':'/etc/sysconfig/nodemanager',
-                                     'source':'PlanetLabConf/nodemanager',
-                                     'postinstall_cmd':'service nm restart',})
+        if not self.apiserver.GetConfFiles (self.auth_root(),
+                                        {'dest':'/etc/sysconfig/nodemanager'}):
+            self.apiserver.AddConfFile (self.auth_root(),
+                                        {'dest':'/etc/sysconfig/nodemanager',
+                                         'source':'PlanetLabConf/nodemanager',
+                                         'postinstall_cmd':'service nm restart',})

         return True
 
     def debug_nodemanager (self):
         return True
 
     def debug_nodemanager (self):