atom removed trailing spaces
[tests.git] / system / Substrate.py
index 6977497..2ab6c89 100644 (file)
@@ -1,26 +1,26 @@
 #
 # Thierry Parmentelat <thierry.parmentelat@inria.fr>
-# Copyright (C) 2010 INRIA 
+# Copyright (C) 2010-2015 INRIA
 #
 # #################### history
 #
 # see also Substrate.readme
 #
 # This is a complete rewrite of TestResources/Tracker/Pool
-# we don't use trackers anymore and just probe/sense the running 
+# we don't use trackers anymore and just probe/sense the running
 # boxes to figure out where we are
 # in order to implement some fairness in the round-robin allocation scheme
-# we need an indication of the 'age' of each running entity, 
+# we need an indication of the 'age' of each running entity,
 # hence the 'timestamp-*' steps in TestPlc
-# 
+#
 # this should be much more flexible:
-# * supports several plc boxes 
+# * supports several plc boxes
 # * supports several qemu guests per host
 # * no need to worry about tracker being in sync or not
 #
 # #################### howto use
 #
-# each site is to write its own LocalSubstrate.py, 
+# each site is to write its own LocalSubstrate.py,
 # (see e.g. LocalSubstrate.inria.py)
 # LocalSubstrate.py is expected to be in /root on the testmaster box
 # and needs to define
 # . the kvm-qemu capable boxes to host qemu instances
 # .  and their admissible load (max # of myplcs)
 # . the pool of DNS-names and IP-addresses available for nodes
-# 
+#
 # #################### implem. note
-# 
-# this model relies on 'sensing' the substrate, 
+#
+# this model relies on 'sensing' the substrate,
 # i.e. probing all the boxes for their running instances of vservers and qemu
-# this is how we get rid of tracker inconsistencies 
-# however there is a 'black hole' between the time where a given address is 
+# this is how we get rid of tracker inconsistencies
+# however there is a 'black hole' between the time where a given address is
 # allocated and when it actually gets used/pingable
 # this is why we still need a shared knowledge among running tests
 # in a file named /root/starting
-# this is connected to the Pool class 
-# 
+# this is connected to the Pool class
+#
 # ####################
 
 import os.path, sys
@@ -51,25 +51,25 @@ import time
 import re
 import traceback
 import subprocess
-import commands
 import socket
 from optparse import OptionParser
 
 import utils
 from TestSsh import TestSsh
 from TestMapper import TestMapper
+from functools import reduce
 
 # too painful to propagate this cleanly
-verbose=None
+verbose = None
 
 def header (message, banner=True):
     if not message: return
-    if banner: print "===============",
-    print message
+    if banner:
+        print("===============", end=' ')
+    print(message)
     sys.stdout.flush()
 
-def timestamp_sort(o1, o2):
-    return o1.timestamp-o2.timestamp
+def timestamp_key(o): return o.timestamp
 
 def short_hostname (hostname):
     return hostname.split('.')[0]
@@ -79,41 +79,47 @@ def short_hostname (hostname):
 # instances, that go undetected through sensing
 class Starting:
 
-    location='/root/starting'
+    location = '/root/starting'
+
     def __init__ (self):
         self.tuples=[]
 
+    def __repr__(self):
+        return '<Starting>'
+
     def load (self):
-        try:    self.tuples=[line.strip().split('@') 
-                             for line in file(Starting.location).readlines()]
-        except: self.tuples=[]
+        try:
+            with open(Starting.location) as starting:
+                self.tuples = [line.strip().split('@') for line in starting.readlines()]
+        except:
+            self.tuples = []
 
-    def vnames (self) : 
+    def vnames (self) :
         self.load()
-        return [ x for (x,_) in self.tuples ]
+        return [ x for (x, _) in self.tuples ]
 
     def add (self, vname, bname):
         if not vname in self.vnames():
             with open(Starting.location, 'a') as out:
-                out.write("%s@%s\n"%(vname,bname))
-            
+                out.write("{}@{}\n".format(vname, bname))
+
     def delete_vname (self, vname):
         self.load()
         if vname in self.vnames():
-            f=file(Starting.location,'w')
-            for (v, b) in self.tuples: 
-                if v != vname: f.write("%s@%s\n"%(v,b))
-            f.close()
-    
+            with open(Starting.location, 'w') as f:
+                for (v, b) in self.tuples:
+                    if v != vname:
+                        f.write("{}@{}\n".format(v, b))
+
 ####################
 # pool class
 # allows to pick an available IP among a pool
 # input is expressed as a list of tuples (hostname,ip,user_data)
 # that can be searched iteratively for a free slot
 # e.g.
-# pool = [ (hostname1,user_data1),  
-#          (hostname2,user_data2),  
-#          (hostname3,user_data2),  
+# pool = [ (hostname1,user_data1),
+#          (hostname2,user_data2),
+#          (hostname3,user_data2),
 #          (hostname4,user_data4) ]
 # assuming that ip1 and ip3 are taken (pingable), then we'd get
 # pool=Pool(pool)
@@ -131,32 +137,39 @@ class PoolItem:
         self.status = None
         self.ip = None
 
+    def __repr__(self):
+        return "<PoolItem {} {}>".format(self.hostname, self.userdata)
+
     def line(self):
-        return "Pooled %s (%s) -> %s"%(self.hostname,self.userdata, self.status)
+        return "Pooled {} ({}) -> {}".format(self.hostname, self.userdata, self.status)
 
     def char (self):
-        if   self.status==None:       return '?'
-        elif self.status=='busy':     return '+'
-        elif self.status=='free':     return '-'
-        elif self.status=='mine':     return 'M'
-        elif self.status=='starting': return 'S'
+        if   self.status == None:       return '?'
+        elif self.status == 'busy':     return '*'
+        elif self.status == 'free':     return '.'
+        elif self.status == 'mine':     return 'M'
+        elif self.status == 'starting': return 'S'
 
     def get_ip(self):
-        if self.ip: return self.ip
-        ip=socket.gethostbyname(self.hostname)
-        self.ip=ip
-        return ip
+        if self.ip:
+            return self.ip
+        self.ip = socket.gethostbyname(self.hostname)
+        return self.ip
 
 class Pool:
 
     def __init__ (self, tuples, message, substrate):
-        self.pool_items = [ PoolItem (hostname, userdata) for (hostname, userdata) in tuples ] 
+        self.pool_items = [ PoolItem (hostname, userdata) for (hostname, userdata) in tuples ]
         self.message = message
         # where to send notifications upon load_starting
         self.substrate = substrate
 
+    def __repr__(self):
+        return "<Pool {} : {} .. {}>".format(self.message, self.pool_items[0], self.pool_items[-1])
+
     def list (self, verbose=False):
-        for i in self.pool_items: print i.line()
+        print(self)
+        for i in self.pool_items: print(i.line())
 
     def line (self):
         line = self.message
@@ -164,27 +177,29 @@ class Pool:
         return line
 
     def _item (self, hostname):
-        for i in self.pool_items: 
+        for i in self.pool_items:
             if i.hostname == hostname: return i
-        raise Exception ("Could not locate hostname %s in pool %s"%(hostname,self.message))
+        raise Exception ("Could not locate hostname {} in pool {}".format(hostname, self.message))
 
-    def retrieve_userdata (self, hostname): 
+    def retrieve_userdata (self, hostname):
         return self._item(hostname).userdata
 
     def get_ip (self, hostname):
-        try:    return self._item(hostname).get_ip()
-        except: return socket.gethostbyname(hostname)
-        
+        try:
+            return self._item(hostname).get_ip()
+        except:
+            return socket.gethostbyname(hostname)
+
     def set_mine (self, hostname):
         try:
             self._item(hostname).status='mine'
         except:
-            print 'WARNING: host %s not found in IP pool %s'%(hostname,self.message)
+            print('WARNING: host {} not found in IP pool {}'.format(hostname, self.message))
 
     def next_free (self):
         for i in self.pool_items:
             if i.status == 'free':
-                i.status='mine'
+                i.status = 'mine'
                 return (i.hostname, i.userdata)
         return None
 
@@ -193,16 +208,17 @@ class Pool:
     def add_starting (self, vname, bname):
         Starting().add(vname, bname)
         for i in self.pool_items:
-            if i.hostname == vname: i.status='mine'
+            if i.hostname == vname:
+                i.status = 'mine'
 
     # load the starting instances from the common file
     # remember that might be ours
     # return the list of (vname,bname) that are not ours
     def load_starting (self):
-        starting=Starting()
+        starting = Starting()
         starting.load()
-        new_tuples=[]
-        for (v,b) in starting.tuples:
+        new_tuples = []
+        for (v, b) in starting.tuples:
             for i in self.pool_items:
                 if i.hostname == v and i.status == 'free':
                     i.status = 'starting'
@@ -212,71 +228,86 @@ class Pool:
     def release_my_starting (self):
         for i in self.pool_items:
             if i.status == 'mine':
-                Starting().delete_vname (i.hostname)
+                Starting().delete_vname(i.hostname)
                 i.status = None
 
 
     ##########
     def _sense (self):
         for item in self.pool_items:
-            if item.status is not None: 
-                print item.char(),
+            if item.status is not None:
+                print(item.char(), end=' ')
                 continue
-            if self.check_ping (item.hostname): 
+            if self.check_ping (item.hostname):
                 item.status = 'busy'
-                print '*',
+                print('*', end=' ')
             else:
                 item.status = 'free'
-                print '.',
-    
+                print('.', end=' ')
+            sys.stdout.flush()
+
     def sense (self):
-        print 'Sensing IP pool', self.message,
+        print('Sensing IP pool', self.message, end=' ')
+        sys.stdout.flush()
         self._sense()
-        print 'Done'
-        for (vname,bname) in self.load_starting():
-            self.substrate.add_starting_dummy (bname, vname)
-        print "After having loaded 'starting': IP pool"
-        print self.line()
+        print('Done')
+        for vname, bname in self.load_starting():
+            self.substrate.add_starting_dummy(bname, vname)
+        print("After having loaded 'starting': IP pool")
+        print(self.line())
     # OS-dependent ping option (support for macos, for convenience)
     ping_timeout_option = None
     # returns True when a given hostname/ip responds to ping
     def check_ping (self, hostname):
+        if '.' not in hostname:
+            hostname = self.substrate.fqdn(hostname)
         if not Pool.ping_timeout_option:
-            (status, osname) = commands.getstatusoutput("uname -s")
+            (status, osname) = subprocess.getstatusoutput("uname -s")
             if status != 0:
-                raise Exception, "TestPool: Cannot figure your OS name"
+                raise Exception("TestPool: Cannot figure your OS name")
             if osname == "Linux":
-                Pool.ping_timeout_option="-w"
+                Pool.ping_timeout_option = "-w"
             elif osname == "Darwin":
-                Pool.ping_timeout_option="-t"
-
-        command="ping -c 1 %s 1 %s"%(Pool.ping_timeout_option, hostname)
-        (status,output) = commands.getstatusoutput(command)
+                Pool.ping_timeout_option = "-t"
+
+        command = "ping -c 1 {} 1 {}".format(Pool.ping_timeout_option, hostname)
+        (status, output) = subprocess.getstatusoutput(command)
+#        print ("""
+#----------
+#Ping command <{command}> has returned {status}
+#--
+#{output}
+#----------
+#        """.format(**locals()))
         return status == 0
 
 ####################
 class Box:
-    def __init__ (self,hostname):
+    def __init__ (self, hostname):
         self.hostname = hostname
         self._probed = None
+    def __repr__(self):
+        return "<Box {}>".format(self.hostname)
     def shortname (self):
         return short_hostname(self.hostname)
     def test_ssh (self):
         return TestSsh(self.hostname, username='root', unknown_host=False)
     def reboot (self, options):
         self.test_ssh().run("shutdown -r now",
-                            message="Rebooting %s"%self.hostname,
+                            message="Rebooting {}".format(self.hostname),
                             dry_run=options.dry_run)
 
     def hostname_fedora (self, virt=None):
-        result = "%s {"%self.hostname
+        # this truly is an opening bracket
+        result = "{}".format(self.hostname) + " {"
         if virt:
-            result += "%s-"%virt
-        result += "%s %s"%(self.fedora(),self.memory())
+            result += "{}-".format(virt)
+        result += "{} {}".format(self.fedora(), self.memory())
         # too painful to propagate this cleanly
         global verbose
         if verbose:
-            result += "-%s" % self.uname()
+            result += "-{}".format(self.uname())
+        # and the matching closing bracket
         result += "}"
         return result
 
@@ -306,8 +337,8 @@ class Box:
             probe_argv = self.test_ssh().actual_argv(composite_command)
         composite = self.backquote ( probe_argv, trash_err=True )
         self._hostname = self._uptime = self._uname = self._fedora = self._memory = "** Unknown **"
-        if not composite: 
-            print "root@%s unreachable"%self.hostname
+        if not composite:
+            print("root@{} unreachable".format(self.hostname))
             self._probed = ''
         else:
             try:
@@ -322,11 +353,10 @@ class Box:
                 self._fedora = fedora.replace("Fedora release ","f").split(" ")[0]
                 # translate into Mb
                 self._memory = int(memory.split()[1])/(1024)
-            except:
+            except Exception as e:
                 import traceback
-                print 'BEG issue with pieces',pieces
+                print('BEG issue with pieces')
                 traceback.print_exc()
-                print 'END issue with pieces',pieces
             self._probed = self._hostname
         return self._probed
 
@@ -345,35 +375,40 @@ class Box:
         return '*unprobed* fedora'
     def memory(self):
         self.probe()
-        if hasattr(self,'_memory') and self._memory: return "%s Mb"%self._memory
+        if hasattr(self,'_memory') and self._memory: return "{} Mb".format(self._memory)
         return '*unprobed* memory'
 
     def run(self, argv, message=None, trash_err=False, dry_run=False):
         if dry_run:
-            print 'DRY_RUN:',
-            print " ".join(argv)
+            print('DRY_RUN:', end=' ')
+            print(" ".join(argv))
             return 0
         else:
             header(message)
             if not trash_err:
                 return subprocess.call(argv)
             else:
-                return subprocess.call(argv, stderr=file('/dev/null','w'))
-                
+                with open('/dev/null', 'w') as null:
+                    return subprocess.call(argv, stderr=null)
+
     def run_ssh (self, argv, message, trash_err=False, dry_run=False):
         ssh_argv = self.test_ssh().actual_argv(argv)
-        result=self.run (ssh_argv, message, trash_err, dry_run=dry_run)
-        if result!=0:
-            print "WARNING: failed to run %s on %s"%(" ".join(argv),self.hostname)
+        result = self.run (ssh_argv, message, trash_err, dry_run=dry_run)
+        if result != 0:
+            print("WARNING: failed to run {} on {}".format(" ".join(argv), self.hostname))
         return result
 
     def backquote (self, argv, trash_err=False):
-        # print 'running backquote',argv
+        # in python3 we need to set universal_newlines=True
         if not trash_err:
-            result= subprocess.Popen(argv,stdout=subprocess.PIPE).communicate()[0]
+            out_err = subprocess.Popen(argv, stdout=subprocess.PIPE,
+                                       universal_newlines=True).communicate()
         else:
-            result= subprocess.Popen(argv,stdout=subprocess.PIPE,stderr=file('/dev/null','w')).communicate()[0]
-        return result
+            with open('/dev/null', 'w') as null:
+                out_err = subprocess.Popen(argv, stdout=subprocess.PIPE, stderr=null,
+                                           universal_newlines=True).communicate()
+        # only interested in stdout here
+        return out_err[0]
 
     # if you have any shell-expanded arguments like *
     # and if there's any chance the command is adressed to the local host
@@ -387,31 +422,35 @@ class BuildInstance:
         self.buildname = buildname
         self.buildbox = buildbox
         self.pids = [pid]
+    def __repr__(self):
+        return "<BuildInstance {} in {}>".format(self.buildname, self.buildbox)
 
     def add_pid(self,pid):
         self.pids.append(pid)
 
     def line (self):
-        return "== %s == (pids=%r)"%(self.buildname,self.pids)
+        return "== {} == (pids={})".format(self.buildname, self.pids)
 
 class BuildBox (Box):
     def __init__ (self, hostname):
         Box.__init__(self, hostname)
         self.build_instances = []
+    def __repr__(self):
+        return "<BuildBox {}>".format(self.hostname)
 
     def add_build(self, buildname, pid):
         for build in self.build_instances:
-            if build.buildname == buildname: 
+            if build.buildname == buildname:
                 build.add_pid(pid)
                 return
         self.build_instances.append(BuildInstance(buildname, pid, self))
 
     def list(self, verbose=False):
-        if not self.build_instances: 
-            header ('No build process on %s (%s)'%(self.hostname_fedora(), self.uptime()))
+        if not self.build_instances:
+            header ('No build process on {} ({})'.format(self.hostname_fedora(), self.uptime()))
         else:
-            header ("Builds on %s (%s)"%(self.hostname_fedora(), self.uptime()))
-            for b in self.build_instances: 
+            header ("Builds on {} ({})".format(self.hostname_fedora(), self.uptime()))
+            for b in self.build_instances:
                 header (b.line(), banner=False)
 
     def reboot (self, options):
@@ -430,7 +469,8 @@ class BuildLxcBox (BuildBox):
 
     # inspect box and find currently running builds
     def sense(self, options):
-        print 'xb',
+        print('xb', end=' ')
+        sys.stdout.flush()
         pids = self.backquote_ssh(['pgrep','lbuild'], trash_err=True)
         if not pids: return
         command = ['ps', '-o', 'pid,command'] + [ pid for pid in pids.split("\n") if pid]
@@ -438,26 +478,28 @@ class BuildLxcBox (BuildBox):
         for line in ps_lines:
             if not line.strip() or line.find('PID') >= 0: continue
             m = build_matcher.match(line)
-            if m: 
+            if m:
                 date = time.strftime('%Y-%m-%d', time.localtime(time.time()))
                 buildname = m.group('buildname').replace('@DATE@', date)
                 self.add_build(buildname, m.group('pid'))
                 continue
             m = build_matcher_initvm.match(line)
-            if m: 
+            if m:
                 # buildname is expansed here
                 self.add_build(buildname, m.group('pid'))
                 continue
-            header('BuildLxcBox.sense: command %r returned line that failed to match'%command)
-            header(">>%s<<"%line)
-    
+            header('BuildLxcBox.sense: command {} returned line that failed to match'.format(command))
+            header(">>{}<<".format(line))
+
 ############################################################
 class PlcInstance:
     def __init__ (self, plcbox):
         self.plc_box = plcbox
         # unknown yet
         self.timestamp = 0
-        
+    def __repr__(self):
+        return "<PlcInstance {}>".format(self.plc_box)
+
     def set_timestamp (self,timestamp):
         self.timestamp = timestamp
     def set_now (self):
@@ -470,7 +512,9 @@ class PlcLxcInstance (PlcInstance):
     def __init__ (self, plcbox, lxcname, pid):
         PlcInstance.__init__(self, plcbox)
         self.lxcname = lxcname
-       self.pid = pid
+        self.pid = pid
+    def __repr__(self):
+        return "<PlcLxcInstance {}>".format(self.lxcname)
 
     def vplcname (self):
         return self.lxcname.split('-')[-1]
@@ -478,19 +522,19 @@ class PlcLxcInstance (PlcInstance):
         return self.lxcname.rsplit('-',2)[0]
 
     def line (self):
-        msg="== %s =="%(self.vplcname())
-        msg += " [=%s]"%self.lxcname
+        msg="== {} ==".format(self.vplcname())
+        msg += " [={}]".format(self.lxcname)
         if self.pid==-1:  msg+=" not (yet?) running"
-        else:              msg+=" (pid=%s)"%self.pid
-        if self.timestamp: msg += " @ %s"%self.pretty_timestamp()
+        else:              msg+=" (pid={})".format(self.pid)
+        if self.timestamp: msg += " @ {}".format(self.pretty_timestamp())
         else:              msg += " *unknown timestamp*"
         return msg
 
     def kill (self):
-        command="rsync lxc-driver.sh  %s:/root"%self.plc_box.hostname
-       commands.getstatusoutput(command)
-       msg="lxc container stopping %s on %s"%(self.lxcname, self.plc_box.hostname)
-       self.plc_box.run_ssh(['/root/lxc-driver.sh', '-c', 'stop_lxc', '-n', self.lxcname], msg)
+        command="rsync lxc-driver.sh  {}:/root".format(self.plc_box.hostname)
+        subprocess.getstatusoutput(command)
+        msg="lxc container stopping {} on {}".format(self.lxcname, self.plc_box.hostname)
+        self.plc_box.run_ssh(['/root/lxc-driver.sh', '-c', 'stop_lxc', '-n', self.lxcname], msg)
         self.plc_box.forget(self)
 
 ##########
@@ -499,6 +543,8 @@ class PlcBox (Box):
         Box.__init__(self, hostname)
         self.plc_instances = []
         self.max_plcs = max_plcs
+    def __repr__(self):
+        return "<PlcBox {}>".format(self.hostname)
 
     def free_slots (self):
         return self.max_plcs - len(self.plc_instances)
@@ -519,12 +565,12 @@ class PlcBox (Box):
             self.soft_reboot (options)
 
     def list(self, verbose=False):
-        if not self.plc_instances: 
-            header ('No plc running on %s'%(self.line()))
+        if not self.plc_instances:
+            header ('No plc running on {}'.format(self.line()))
         else:
-            header ("Active plc VMs on %s"%self.line())
-            self.plc_instances.sort(timestamp_sort)
-            for p in self.plc_instances: 
+            header ("Active plc VMs on {}".format(self.line()))
+            self.plc_instances.sort(key=timestamp_key)
+            for p in self.plc_instances:
                 header (p.line(), banner=False)
 
 ## we do not this at INRIA any more
@@ -533,58 +579,63 @@ class PlcLxcBox (PlcBox):
     def add_lxc (self, lxcname, pid):
         for plc in self.plc_instances:
             if plc.lxcname == lxcname:
-                header("WARNING, duplicate myplc %s running on %s"%\
-                       (lxcname, self.hostname), banner=False)
+                header("WARNING, duplicate myplc {} running on {}"\
+                       .format(lxcname, self.hostname), banner=False)
                 return
-        self.plc_instances.append(PlcLxcInstance(self, lxcname, pid))    
+        self.plc_instances.append(PlcLxcInstance(self, lxcname, pid))
 
 
     # a line describing the box
-    def line(self): 
-        return "%s [max=%d,free=%d] (%s)"%(self.hostname_fedora(virt="lxc"), 
-                                           self.max_plcs,self.free_slots(),
-                                           self.uptime())
-    
+    def line(self):
+        return "{} [max={},free={}] ({})".format(self.hostname_fedora(virt="lxc"),
+                                                 self.max_plcs, self.free_slots(),
+                                                 self.uptime())
+
     def plc_instance_by_lxcname(self, lxcname):
         for p in self.plc_instances:
             if p.lxcname == lxcname:
                 return p
         return None
-    
+
     # essentially shutdown all running containers
     def soft_reboot(self, options):
-        command="rsync lxc-driver.sh  %s:/root"%self.hostname
-        commands.getstatusoutput(command)
-       self.run_ssh( ['/root/lxc-driver.sh','-c','stop_all'],
-                      "Stopping all running lxc containers on %s"%self.hostname,
+        command="rsync lxc-driver.sh  {}:/root".format(self.hostname)
+        subprocess.getstatusoutput(command)
+        self.run_ssh( ['/root/lxc-driver.sh','-c','stop_all'],
+                      "Stopping all running lxc containers on {}".format(self.hostname),
                       dry_run=options.dry_run)
 
 
-    # sense is expected to fill self.plc_instances with PlcLxcInstance's 
+    # sense is expected to fill self.plc_instances with PlcLxcInstance's
     # to describe the currently running VM's
     def sense(self, options):
-        print "xp",
-       command="rsync lxc-driver.sh  %s:/root"%self.hostname
-        commands.getstatusoutput(command)
-       command=['/root/lxc-driver.sh', '-c', 'sense_all']
+        print("xp", end=' ')
+        sys.stdout.flush()
+        command = "rsync lxc-driver.sh  {}:/root".format(self.hostname)
+        subprocess.getstatusoutput(command)
+        command = ['/root/lxc-driver.sh', '-c', 'sense_all']
         lxc_stat = self.backquote_ssh (command)
-       for lxc_line in lxc_stat.split("\n"):
-            if not lxc_line: continue
+        for lxc_line in lxc_stat.split("\n"):
+            if not lxc_line:
+                continue
+            # we mix build and plc VMs
+            if 'vplc' not in lxc_line:
+                continue
             lxcname = lxc_line.split(";")[0]
-           pid = lxc_line.split(";")[1]
-           timestamp = lxc_line.split(";")[2]
+            pid = lxc_line.split(";")[1]
+            timestamp = lxc_line.split(";")[2]
             self.add_lxc(lxcname,pid)
             try: timestamp = int(timestamp)
             except: timestamp = 0
             p = self.plc_instance_by_lxcname(lxcname)
             if not p:
-                print 'WARNING zombie plc',self.hostname,lxcname
-                print '... was expecting',lxcname,'in',[i.lxcname for i in self.plc_instances]
+                print('WARNING zombie plc',self.hostname,lxcname)
+                print('... was expecting',lxcname,'in',[i.lxcname for i in self.plc_instances])
                 continue
             p.set_timestamp(timestamp)
 
 ############################################################
-class QemuInstance: 
+class QemuInstance:
     def __init__(self, nodename, pid, qemubox):
         self.nodename = nodename
         self.pid = pid
@@ -592,7 +643,9 @@ class QemuInstance:
         # not known yet
         self.buildname = None
         self.timestamp = 0
-        
+    def __repr__(self):
+        return "<QemuInstance {}>".format(self.nodename)
+
     def set_buildname (self, buildname):
         self.buildname = buildname
     def set_timestamp (self, timestamp):
@@ -601,22 +654,22 @@ class QemuInstance:
         self.timestamp = int(time.time())
     def pretty_timestamp (self):
         return time.strftime("%Y-%m-%d:%H-%M", time.localtime(self.timestamp))
-    
+
     def line (self):
-        msg = "== %s =="%(short_hostname(self.nodename))
-        msg += " [=%s]"%self.buildname
-        if self.pid:       msg += " (pid=%s)"%self.pid
+        msg = "== {} ==".format(short_hostname(self.nodename))
+        msg += " [={}]".format(self.buildname)
+        if self.pid:       msg += " (pid={})".format(self.pid)
         else:              msg += " not (yet?) running"
-        if self.timestamp: msg += " @ %s"%self.pretty_timestamp()
+        if self.timestamp: msg += " @ {}".format(self.pretty_timestamp())
         else:              msg += " *unknown timestamp*"
         return msg
-    
+
     def kill(self):
-        if self.pid == 0: 
-            print "cannot kill qemu %s with pid==0"%self.nodename
+        if self.pid == 0:
+            print("cannot kill qemu {} with pid==0".format(self.nodename))
             return
-        msg="Killing qemu %s with pid=%s on box %s"%(self.nodename, self.pid, self.qemu_box.hostname)
-        self.qemu_box.run_ssh(['kill', "%s"%self.pid], msg)
+        msg = "Killing qemu {} with pid={} on box {}".format(self.nodename, self.pid, self.qemu_box.hostname)
+        self.qemu_box.run_ssh(['kill', "{}".format(self.pid)], msg)
         self.qemu_box.forget(self)
 
 
@@ -625,12 +678,14 @@ class QemuBox (Box):
         Box.__init__(self, hostname)
         self.qemu_instances = []
         self.max_qemus = max_qemus
+    def __repr__(self):
+        return "<QemuBox {}>".format(self.hostname)
 
     def add_node(self, nodename, pid):
         for qemu in self.qemu_instances:
-            if qemu.nodename == nodename: 
-                header("WARNING, duplicate qemu %s running on %s"%\
-                       (nodename,self.hostname), banner=False)
+            if qemu.nodename == nodename:
+                header("WARNING, duplicate qemu {} running on {}"\
+                       .format(nodename,self.hostname), banner=False)
                 return
         self.qemu_instances.append(QemuInstance(nodename, pid, self))
 
@@ -647,17 +702,18 @@ class QemuBox (Box):
         self.qemu_instances.append(dummy)
 
     def line (self):
-        return "%s [max=%d,free=%d] (%s) %s"%(
-            self.hostname_fedora(virt="qemu"), self.max_qemus, self.free_slots(),
-            self.uptime(), self.driver())
+        return "{} [max={},free={}] ({}) {}"\
+            .format(self.hostname_fedora(virt="qemu"),
+                    self.max_qemus, self.free_slots(),
+                    self.uptime(), self.driver())
 
     def list(self, verbose=False):
-        if not self.qemu_instances: 
-            header ('No qemu on %s'%(self.line()))
+        if not self.qemu_instances:
+            header ('No qemu on {}'.format(self.line()))
         else:
-            header ("Qemus on %s"%(self.line()))
-            self.qemu_instances.sort(timestamp_sort)
-            for q in self.qemu_instances: 
+            header ("Qemus on {}".format(self.line()))
+            self.qemu_instances.sort(key=timestamp_key)
+            for q in self.qemu_instances:
                 header (q.line(), banner=False)
 
     def free_slots (self):
@@ -690,7 +746,8 @@ class QemuBox (Box):
     matcher=re.compile("\s*(?P<pid>[0-9]+).*-cdrom\s+(?P<nodename>[^\s]+)\.iso")
 
     def sense(self, options):
-        print 'qn',
+        print('qn', end=' ')
+        sys.stdout.flush()
         modules = self.backquote_ssh(['lsmod']).split('\n')
         self._driver = '*NO kqemu/kvm_intel MODULE LOADED*'
         for module in modules:
@@ -709,11 +766,11 @@ class QemuBox (Box):
             if not line.strip() or line.find('PID') >=0 :
                 continue
             m = QemuBox.matcher.match(line)
-            if m: 
+            if m:
                 self.add_node(m.group('nodename'), m.group('pid'))
                 continue
-            header('QemuBox.sense: command %r returned line that failed to match'%command)
-            header(">>%s<<"%line)
+            header('QemuBox.sense: command {} returned line that failed to match'.format(command))
+            header(">>{}<<".format(line))
         ########## retrieve alive instances and map to build
         live_builds=[]
         command = ['grep', '.', '/vservers/*/*/qemu.pid', '/dev/null']
@@ -731,12 +788,12 @@ class QemuBox (Box):
                 q.set_buildname(buildname)
                 live_builds.append(buildname)
             except:
-                print 'WARNING, could not parse pid line',pid_line
+                print('WARNING, could not parse pid line', pid_line)
         # retrieve timestamps
         if not live_builds:
             return
         command =  ['grep','.']
-        command += ['/vservers/%s/*/timestamp'%b for b in live_builds]
+        command += ['/vservers/{}/*/timestamp'.format(b) for b in live_builds]
         command += ['/dev/null']
         ts_lines = self.backquote_ssh(command, trash_err=True).split('\n')
         for ts_line in ts_lines:
@@ -749,8 +806,8 @@ class QemuBox (Box):
                 (_, timestamp) = tail.split(':')
                 timestamp = int(timestamp)
                 q = self.qemu_instance_by_nodename_buildname(nodename, buildname)
-                if not q: 
-                    # this warning corresponds to qemu instances that were not killed properly 
+                if not q:
+                    # this warning corresponds to qemu instances that were not killed properly
                     # and that have a dangling qemu.pid - and not even all of them as they need
                     # to be attached to a build that has a node running...
                     # it is more confusing than helpful, so let's just trash it
@@ -760,7 +817,7 @@ class QemuBox (Box):
                     continue
                 q.set_timestamp(timestamp)
             except:
-                print 'WARNING, could not parse ts line',ts_line
+                print('WARNING, could not parse ts line',ts_line)
 
 ####################
 class TestInstance:
@@ -774,6 +831,8 @@ class TestInstance:
         # has a KO test
         self.broken_steps = []
         self.timestamp = 0
+    def __repr__(self):
+        return "<TestInstance {}>".format(self.buildname)
 
     def set_timestamp(self, timestamp):
         self.timestamp = timestamp
@@ -785,7 +844,7 @@ class TestInstance:
         return len(self.pids) != 0
     def add_pid(self, pid):
         self.pids.append(pid)
-    def set_broken(self, plcindex, step): 
+    def set_broken(self, plcindex, step):
         self.broken_steps.append( (plcindex, step,) )
 
     def second_letter(self):
@@ -806,18 +865,20 @@ class TestInstance:
         # second letter : '=' if fine, 'W' for warnings (only ignored steps) 'B' for broken
         letter2 = self.second_letter()
         double += letter2
-        msg = " %s %s =="%(double,self.buildname)
+        msg = " {} {} ==".format(double, self.buildname)
         if not self.pids:
             pass
         elif len(self.pids)==1:
-            msg += " (pid=%s)"%self.pids[0]
+            msg += " (pid={})".format(self.pids[0])
         else:
-            msg += " !!!pids=%s!!!"%self.pids
-        msg += " @%s"%self.pretty_timestamp()
+            msg += " !!!pids={}!!!".format(self.pids)
+        msg += " @{}".format(self.pretty_timestamp())
         if letter2 != '=':
             msg2 = ( ' BROKEN' if letter2 == 'B' else ' WARNING' )
             # sometimes we have an empty plcindex
-            msg += " [%s="%msg2 + " ".join( [ "%s@%s"%(s,i) if i else s for (i, s) in self.broken_steps ] ) + "]"
+            msg += " [{}=".format(msg2) \
+                   + " ".join(["{}@{}".format(s, i) if i else s for (i, s) in self.broken_steps]) \
+                   + "]"
         return msg
 
 class TestBox(Box):
@@ -825,12 +886,14 @@ class TestBox(Box):
         Box.__init__(self, hostname)
         self.starting_ips = []
         self.test_instances = []
+    def __repr__(self):
+        return "<TestBox {}>".format(self.hostname)
 
     def reboot(self, options):
         # can't reboot a vserver VM
         self.run_ssh(['pkill', 'run_log'], "Terminating current runs",
                       dry_run=options.dry_run)
-        self.run_ssh(['rm', '-f', Starting.location], "Cleaning %s"%Starting.location,
+        self.run_ssh(['rm', '-f', Starting.location], "Cleaning {}".format(Starting.location),
                       dry_run=options.dry_run)
 
     def get_test(self, buildname):
@@ -841,9 +904,9 @@ class TestBox(Box):
     # we scan ALL remaining test results, even the ones not running
     def add_timestamp(self, buildname, timestamp):
         i = self.get_test(buildname)
-        if i:   
+        if i:
             i.set_timestamp(timestamp)
-        else:   
+        else:
             i = TestInstance(buildname, 0)
             i.set_timestamp(timestamp)
             self.test_instances.append(i)
@@ -854,7 +917,7 @@ class TestBox(Box):
             self.test_instances.append(TestInstance(buildname, pid))
             return
         if i.pids:
-            print "WARNING: 2 concurrent tests run on same build %s"%buildname
+            print("WARNING: 2 concurrent tests run on same build {}".format(buildname))
         i.add_pid(pid)
 
     def add_broken(self, buildname, plcindex, step):
@@ -869,8 +932,8 @@ class TestBox(Box):
     matcher_grep_missing=re.compile ("grep: /root/(?P<buildname>[^/]+)/logs/trace: No such file or directory")
 
     def sense(self, options):
-        print 'tm',
-        self.starting_ips = [x for x in self.backquote_ssh(['cat',Starting.location], trash_err=True).strip().split('\n') if x]
+        print('tm', end=' ')
+        self.starting_ips = [ x for x in self.backquote_ssh( ['cat', Starting.location], trash_err=True).strip().split('\n') if x ]
 
         # scan timestamps on all tests
         # this is likely to not invoke ssh so we need to be a bit smarter to get * expanded
@@ -888,7 +951,7 @@ class TestBox(Box):
                 timestamp = int(timestamp)
                 t = self.add_timestamp(buildname, timestamp)
             except:
-                print 'WARNING, could not parse ts line', ts_line
+                print('WARNING, could not parse ts line', ts_line)
 
         # let's try to be robust here -- tests that fail very early like e.g.
         # "Cannot make space for a PLC instance: vplc IP pool exhausted", that occurs as part of provision
@@ -905,33 +968,33 @@ class TestBox(Box):
                 self.add_broken(buildname, '', 'NO STEP DONE')
                 continue
             m = TestBox.matcher_grep.match(line)
-            if m: 
+            if m:
                 buildname = m.group('buildname')
                 plcindex = m.group('plcindex')
                 step = m.group('step')
                 self.add_broken(buildname, plcindex, step)
                 continue
-            header("TestBox.sense: command %r returned line that failed to match\n%s"%(command,line))
-            header(">>%s<<"%line)
+            header("TestBox.sense: command {} returned line that failed to match\n{}".format(command, line))
+            header(">>{}<<".format(line))
 
         pids = self.backquote_ssh (['pgrep', 'run_log'], trash_err=True)
         if not pids:
             return
-        command = ['ls','-ld'] + ["/proc/%s/cwd"%pid for pid in pids.split("\n") if pid]
+        command = ['ls','-ld'] + ["/proc/{}/cwd".format(pid) for pid in pids.split("\n") if pid]
         ps_lines = self.backquote_ssh(command).split('\n')
         for line in ps_lines:
             if not line.strip():
                 continue
             m = TestBox.matcher_proc.match(line)
-            if m: 
+            if m:
                 pid = m.group('pid')
                 buildname = m.group('buildname')
                 self.add_running_test(pid, buildname)
                 continue
-            header("TestBox.sense: command %r returned line that failed to match\n%s"%(command,line))
-            header(">>%s<<"%line)
-        
-        
+            header("TestBox.sense: command {} returned line that failed to match\n{}".format(command, line))
+            header(">>{}<<".format(line))
+
+
     def line (self):
         return self.hostname_fedora()
 
@@ -945,20 +1008,20 @@ class TestBox(Box):
             msg="running tests"
 
         if not instances:
-            header ("No %s on %s"%(msg,self.line()))
+            header ("No {} on {}".format(msg, self.line()))
         else:
-            header ("%s on %s"%(msg,self.line()))
-            instances.sort(timestamp_sort)
+            header ("{} on {}".format(msg, self.line()))
+            instances.sort(key=timestamp_key)
             for i in instances:
-                print i.line()
+                print(i.line())
         # show 'starting' regardless of verbose
         if self.starting_ips:
-            header("Starting IP addresses on %s"%self.line())
+            header("Starting IP addresses on {}".format(self.line()))
             self.starting_ips.sort()
             for starting in self.starting_ips:
-                print starting
+                print(starting)
         else:
-            header("Empty 'starting' on %s"%self.line())
+            header("Empty 'starting' on {}".format(self.line()))
 
 ############################################################
 class Options: pass
@@ -979,32 +1042,35 @@ class Substrate:
 
         self.vplc_pool = Pool(self.vplc_ips(), "for vplcs", self)
         self.vnode_pool = Pool(self.vnode_ips(), "for vnodes", self)
-        
+
         self.build_boxes = self.build_lxc_boxes
         self.plc_boxes = self.plc_lxc_boxes
         self.default_boxes = self.plc_boxes + self.qemu_boxes
         self.all_boxes = self.build_boxes + [ self.test_box ] + self.plc_boxes + self.qemu_boxes
+    def __repr__(self):
+        return "<Substrate {}>".format(self.summary_line())
 
     def summary_line (self):
         msg  = "["
-        msg += " %d xp"%len(self.plc_lxc_boxes)
-        msg += " %d tried plc boxes"%len(self.plc_boxes)
+        msg += " {} xp".format(len(self.plc_lxc_boxes))
+        msg += " {} xq".format(len(self.qemu_boxes))
         msg += "]"
         return msg
 
     def fqdn (self, hostname):
         if hostname.find('.') < 0:
-            return "%s.%s" % (hostname, self.domain())
+            return "{}.{}".format(hostname, self.domain())
         return hostname
 
     # return True if actual sensing takes place
     def sense(self, force=False):
         if self._sensed and not force:
             return False
-        print 'Sensing local substrate...',
+        print('Sensing local substrate...', end=' ')
+        sys.stdout.flush()
         for b in self.default_boxes:
             b.sense(self.options)
-        print 'Done'
+        print('Done')
         self._sensed = True
         return True
 
@@ -1026,7 +1092,7 @@ class Substrate:
     def add_starting_dummy(self, bname, vname):
         return self.add_dummy_plc(bname, vname) or self.add_dummy_qemu(bname, vname)
 
-    ########## 
+    ##########
     def provision(self, plcs, options):
         try:
             # attach each plc to a plc box and an IP address
@@ -1037,12 +1103,12 @@ class Substrate:
             plcs = [ self.localize_sfa_rspec(plc, options) for plc in plcs ]
             self.list()
             return plcs
-        except Exception, e:
-            print '* Could not provision this test on current substrate','--',e,'--','exiting'
+        except Exception as e:
+            print('* Could not provision this test on current substrate','--',e,'--','exiting')
             traceback.print_exc()
             sys.exit(1)
 
-    # it is expected that a couple of options like ips_bplc and ips_vplc 
+    # it is expected that a couple of options like ips_bplc and ips_vplc
     # are set or unset together
     @staticmethod
     def check_options(x, y):
@@ -1053,14 +1119,14 @@ class Substrate:
     # find an available plc box (or make space)
     # and a free IP address (using options if present)
     def provision_plc(self, plc, options):
-        
+
         assert Substrate.check_options(options.ips_bplc, options.ips_vplc)
 
         #### let's find an IP address for that plc
-        # look in options 
+        # look in options
         if options.ips_vplc:
             # this is a rerun
-            # we don't check anything here, 
+            # we don't check anything here,
             # it is the caller's responsability to cleanup and make sure this makes sense
             plc_boxname = options.ips_bplc.pop()
             vplc_hostname = options.ips_vplc.pop()
@@ -1069,7 +1135,7 @@ class Substrate:
                 self.list()
             plc_boxname = None
             vplc_hostname = None
-            # try to find an available IP 
+            # try to find an available IP
             self.vplc_pool.sense()
             couple = self.vplc_pool.next_free()
             if couple:
@@ -1086,10 +1152,10 @@ class Substrate:
             # make space by killing the oldest running instance
             if not plc_boxname or not vplc_hostname:
                 # find the oldest of all our instances
-                all_plc_instances = reduce(lambda x, y: x+y, 
+                all_plc_instances = reduce(lambda x, y: x+y,
                                            [ pb.plc_instances for pb in self.plc_boxes ],
                                            [])
-                all_plc_instances.sort(timestamp_sort)
+                all_plc_instances.sort(key=timestamp_key)
                 try:
                     plc_instance_to_kill = all_plc_instances[0]
                 except:
@@ -1098,12 +1164,12 @@ class Substrate:
                         msg += " PLC boxes are full"
                     if not vplc_hostname:
                         msg += " vplc IP pool exhausted"
-                    msg += " %s"%self.summary_line()
-                    raise Exception,"Cannot make space for a PLC instance:" + msg
+                    msg += " {}".format(self.summary_line())
+                    raise Exception("Cannot make space for a PLC instance:" + msg)
                 freed_plc_boxname = plc_instance_to_kill.plc_box.hostname
                 freed_vplc_hostname = plc_instance_to_kill.vplcname()
-                message = 'killing oldest plc instance = %s on %s' % (plc_instance_to_kill.line(),
-                                                                      freed_plc_boxname)
+                message = 'killing oldest plc instance = {} on {}'\
+                    .format(plc_instance_to_kill.line(), freed_plc_boxname)
                 plc_instance_to_kill.kill()
                 # use this new plcbox if that was the problem
                 if not plc_boxname:
@@ -1114,7 +1180,7 @@ class Substrate:
                     # record in pool as mine
                     self.vplc_pool.set_mine(vplc_hostname)
 
-        # 
+        #
         self.add_dummy_plc(plc_boxname, plc['name'])
         vplc_ip = self.vplc_pool.get_ip(vplc_hostname)
         self.vplc_pool.add_starting(vplc_hostname, plc_boxname)
@@ -1122,11 +1188,11 @@ class Substrate:
         #### compute a helpful vserver name
         # remove domain in hostname
         vplc_short = short_hostname(vplc_hostname)
-        vservername = "%s-%d-%s" % (options.buildname, plc['index'], vplc_short)
-        plc_name = "%s_%s" % (plc['name'], vplc_short)
+        vservername = "{}-{}-{}".format(options.buildname, plc['index'], vplc_short)
+        plc_name = "{}_{}".format(plc['name'], vplc_short)
 
-        utils.header('PROVISION plc %s in box %s at IP %s as %s' % \
-                     (plc['name'], plc_boxname, vplc_hostname, vservername))
+        utils.header('PROVISION plc {} in box {} at IP {} as {}'\
+                     .format(plc['name'], plc_boxname, vplc_hostname, vservername))
 
         #### apply in the plc_spec
         # # informative
@@ -1167,7 +1233,7 @@ class Substrate:
                     self.list()
                 qemu_boxname = None
                 vnode_hostname = None
-                # try to find an available IP 
+                # try to find an available IP
                 self.vnode_pool.sense()
                 couple = self.vnode_pool.next_free()
                 if couple:
@@ -1183,10 +1249,10 @@ class Substrate:
                 # if we miss the box or the IP, kill the oldest instance
                 if not qemu_boxname or not vnode_hostname:
                 # find the oldest of all our instances
-                    all_qemu_instances = reduce(lambda x, y: x+y, 
+                    all_qemu_instances = reduce(lambda x, y: x+y,
                                                 [ qb.qemu_instances for qb in self.qemu_boxes ],
                                                 [])
-                    all_qemu_instances.sort(timestamp_sort)
+                    all_qemu_instances.sort(key=timestamp_key)
                     try:
                         qemu_instance_to_kill = all_qemu_instances[0]
                     except:
@@ -1194,14 +1260,14 @@ class Substrate:
                         if not qemu_boxname:
                             msg += " QEMU boxes are full"
                         if not vnode_hostname:
-                            msg += " vnode IP pool exhausted" 
-                        msg += " %s"%self.summary_line()
-                        raise Exception,"Cannot make space for a QEMU instance:"+msg
+                            msg += " vnode IP pool exhausted"
+                        msg += " {}".format(self.summary_line())
+                        raise Exception("Cannot make space for a QEMU instance:"+msg)
                     freed_qemu_boxname = qemu_instance_to_kill.qemu_box.hostname
                     freed_vnode_hostname = short_hostname(qemu_instance_to_kill.nodename)
                     # kill it
-                    message = 'killing oldest qemu node = %s on %s' % (qemu_instance_to_kill.line(),
-                                                                       freed_qemu_boxname)
+                    message = 'killing oldest qemu node = {} on {}'.format(qemu_instance_to_kill.line(),
+                                                                           freed_qemu_boxname)
                     qemu_instance_to_kill.kill()
                     # use these freed resources where needed
                     if not qemu_boxname:
@@ -1218,26 +1284,25 @@ class Substrate:
             vnode_fqdn = self.fqdn(vnode_hostname)
             nodemap = {'host_box' : qemu_boxname,
                        'node_fields:hostname' : vnode_fqdn,
-                       'interface_fields:ip' : ip, 
-                       'ipaddress_fields:ip_addr' : ip, 
+                       'interface_fields:ip' : ip,
+                       'ipaddress_fields:ip_addr' : ip,
                        'interface_fields:mac' : mac,
                    }
             nodemap.update(self.network_settings())
             maps.append( (nodename, nodemap) )
 
-            utils.header("PROVISION node %s in box %s at IP %s with MAC %s" % \
-                         (nodename, qemu_boxname, vnode_hostname, mac))
+            utils.header("PROVISION node {} in box {} at IP {} with MAC {}"\
+                         .format(nodename, qemu_boxname, vnode_hostname, mac))
 
         return test_mapper.map({'node':maps})[0]
 
     def localize_sfa_rspec(self, plc, options):
-       
+
         plc['sfa']['settings']['SFA_REGISTRY_HOST'] = plc['settings']['PLC_DB_HOST']
         plc['sfa']['settings']['SFA_AGGREGATE_HOST'] = plc['settings']['PLC_DB_HOST']
-        plc['sfa']['settings']['SFA_SM_HOST'] = plc['settings']['PLC_DB_HOST']
         plc['sfa']['settings']['SFA_DB_HOST'] = plc['settings']['PLC_DB_HOST']
-        plc['sfa']['settings']['SFA_PLC_URL'] = 'https://%s:443/PLCAPI/' % plc['settings']['PLC_API_HOST']
-       return plc
+        plc['sfa']['settings']['SFA_PLC_URL'] = 'https://{}:443/PLCAPI/'.format(plc['settings']['PLC_API_HOST'])
+        return plc
 
     #################### release:
     def release(self, options):
@@ -1255,29 +1320,30 @@ class Substrate:
                     return b
             except:
                 pass
-        print "Could not find box %s" % boxname
+        print("Could not find box {}".format(boxname))
         return None
 
-    # deal with the mix of boxes and names and stores the current focus 
+    # deal with the mix of boxes and names and stores the current focus
     # as a list of Box instances in self.focus_all
     def normalize(self, box_or_names):
         self.focus_all = []
         for box in box_or_names:
             if not isinstance(box, Box):
                 box = self.get_box(box)
-            if not box: 
-                print 'Warning - could not handle box',box
+            if not box:
+                print('Warning - could not handle box',box)
             self.focus_all.append(box)
         # elaborate by type
         self.focus_build = [ x for x in self.focus_all if isinstance(x, BuildBox) ]
         self.focus_plc = [ x for x in self.focus_all if isinstance(x, PlcBox) ]
         self.focus_qemu = [ x for x in self.focus_all if isinstance(x, QemuBox) ]
-                             
+
     def list_boxes(self):
-        print 'Sensing',
+        print('Sensing', end=' ')
+        sys.stdout.flush()
         for box in self.focus_all:
             box.sense(self.options)
-        print 'Done'
+        print('Done')
         for box in self.focus_all:
             box.list(self.options.verbose)
 
@@ -1286,7 +1352,7 @@ class Substrate:
             box.reboot(self.options)
 
     def sanity_check(self):
-        print 'Sanity check'
+        print('Sanity check')
         self.sanity_check_plc()
         self.sanity_check_qemu()
 
@@ -1302,10 +1368,10 @@ class Substrate:
             if node not in hash:
                 hash[node] = 0
             hash[node]+=1
-        for (node,count) in hash.items():
+        for (node,count) in list(hash.items()):
             if count!=1:
-                print 'WARNING - duplicate node', node
-        
+                print('WARNING - duplicate node', node)
+
 
     ####################
     # can be run as a utility to probe/display/manage the local infrastructure
@@ -1316,13 +1382,13 @@ class Substrate:
         parser.add_option('-s', "--soft", action='store_true', dest='soft', default=False,
                           help='soft mode for reboot (terminates processes)')
         parser.add_option('-t', "--testbox", action='store_true', dest='testbox', default=False,
-                          help='add test box') 
+                          help='add test box')
         parser.add_option('-b', "--build", action='store_true', dest='builds', default=False,
                           help='add build boxes')
         parser.add_option('-p', "--plc", action='store_true', dest='plcs', default=False,
                           help='add plc boxes')
         parser.add_option('-q', "--qemu", action='store_true', dest='qemus', default=False,
-                          help='add qemu boxes') 
+                          help='add qemu boxes')
         parser.add_option('-a', "--all", action='store_true', dest='all', default=False,
                           help='address all known  boxes, like -b -t -p -q')
         parser.add_option('-v', "--verbose", action='store_true', dest='verbose', default=False,
@@ -1337,7 +1403,7 @@ class Substrate:
         if self.options.plcs: boxes += self.plc_boxes
         if self.options.qemus: boxes += self.qemu_boxes
         if self.options.all: boxes += self.all_boxes
-        
+
         global verbose
         verbose = self.options.verbose
         # default scope is -b -p -q -t