vserver-based myplcs need to be stopped for freeing slots in the IP range

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 2e65dc0..0134687 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -69,11 +69,11 @@ class TestPlc:
                      'kill_all_qemus', 'reinstall_node','start_node', SEP,
                      'nodes_booted', 'nodes_ssh', 'check_slice',
                      'check_initscripts', 'check_tcp',SEP,
-                     'force_gather_logs', 'force_kill_qemus', ]
+                     'force_gather_logs', 'force_kill_qemus', 'force_record_tracker','force_free_tracker' ]
     other_steps = [ 'stop_all_vservers','fresh_install', 'cache_rpm', 'stop', SEP,
                     'clean_sites', 'clean_nodes', 'clean_slices', 'clean_keys', SEP,
                     'show_boxes', 'list_all_qemus', 'list_qemus', SEP,
-                    'db_dump' , 'db_restore',
+                    'db_dump' , 'db_restore', ' cleanup_tracker',
                     'standby_1 through 20'
                     ]
 
@@ -252,6 +252,57 @@ class TestPlc:
                 node.kill_qemu()
         return True
 
+
+    ### utility methods for handling the pool of IP addresses allocated to plcs
+    # Logic
+    # (*) running plcs are recorded in the file named ~/running-test-plcs
+    # (*) this file contains a line for each running plc, older first
+    # (*) each line contains the vserver name + the hostname of the (vserver) testbox where it sits
+    # (*) the free_tracker method performs a vserver stop on the oldest entry
+    # (*) the record_tracker method adds an entry at the bottom of the file
+    # (*) the cleanup_tracker method stops all known vservers and removes the tracker file
+
+    TRACKER_FILE="~/running-test-plcs"
+
+    def record_tracker (self):
+        if not self.vserver:
+            print 'record_tracker active on vserver plcs only - ignored'
+            return True
+        command="echo %s %s >> %s"%(self.vservername,self.test_ssh.hostname,TestPlc.TRACKER_FILE)
+        (code,output) = utils.output_of (self.test_ssh.actual_command(command))
+        if code != 0:
+            print "WARNING : COULD NOT record_tracker %s as a running plc on %s"%(self.vservername,self.test_ssh.hostname)
+            return False
+        print "Recorded %s in running plcs on host %s"%(self.vservername,self.test_ssh.hostname)
+        return True
+
+    def free_tracker (self):
+        if not self.vserver:
+            print 'free_tracker active on vserver plcs only - ignored'
+            return True
+        command="head -1 %s"%TestPlc.TRACKER_FILE
+        (code,line) = utils.output_of(self.test_ssh.actual_command(command))
+        if code != 0:
+            print "No entry found in %s on %s"%(TestPlc.TRACKER_FILE,self.test_ssh.hostname)
+            return False
+        try:
+            [vserver_to_stop,hostname] = line.split()
+        except:
+            print "WARNING: free_tracker: Could not parse %s - skipped"%TestPlc.TRACKER_FILE
+            return False
+        stop_command = "vserver --silent %s stop"%vserver_to_stop
+        utils.system(self.test_ssh.actual_command(stop_command))
+        x=TestPlc.TRACKER_FILE
+        flush_command = "tail --lines=+2 %s > %s.tmp ; mv %s.tmp %s"%(x,x,x,x)
+        utils.system(self.test_ssh.actual_command(flush_command))
+        return True
+
+    def cleanup_tracker (self):
+        stop_all = "cd /vservers ; for i in * ; do vserver --silent $i stop ; done"
+        utils.system(self.test_ssh.actual_command(stop_all))
+        clean_tracker = "rm -f %s"%TestPlc.TRACKER_FILE
+        utils.system(self.test_ssh.actual_command(clean_tracker))
+
     #################### step methods
 
     ### uninstall

diff --git a/system/utils.py b/system/utils.py
index b4001b2..d17dbef 100644 (file)
--- a/system/utils.py
+++ b/system/utils.py
@@ -109,7 +109,6 @@ def show_test_spec_pass (plc_spec,passno):
                 print '* \t',key,':',val
 
 def system(command,background=False):
-    now=time.strftime("%H:%M:%S", time.localtime())
     if background: command += " &"
     if options.dry_run:
         print 'dry_run:',command
@@ -117,6 +116,17 @@ def system(command,background=False):
     else:
         return os.system("set -x; " + command)
 
+### WARNING : this ALWAYS does its job, even in dry_run mode
+def output_of (command):
+    import commands
+#    if options.dry_run:
+#        print 'dry_run',command
+#        return (0,'[[dry-run - fake output]]')
+#    else:
+    (code,string) = commands.getstatusoutput(command)
+    return (code,string)
+
+# convenience: translating shell-like pattern into regexp
 def match (string, pattern):
     # tmp - there's probably much simpler
     # rewrite * into .*, ? into .