fix specfile, could not install setns.so
[lxc-userspace.git] / slicesu
diff --git a/slicesu b/slicesu
old mode 100644 (file)
new mode 100755 (executable)
index 15e5854..dcbe850
--- a/slicesu
+++ b/slicesu
@@ -1,9 +1,10 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import sys
 import os
 import setns
 import pdb
+import re
 
 from argparse import ArgumentParser
 
@@ -25,36 +26,60 @@ def getarch(f):
 def get_cgroup_subdirs_for_pid(pid):
        cgroup_info_file = '/proc/%s/cgroup'%pid
        cgroup_lines = open(cgroup_info_file).read().splitlines()
-       
+
        subdirs = {}
        for line in cgroup_lines:
                try:
                        _, cgroup_name, subdir = line.split(':')
                        subdirs[cgroup_name] = subdir
-               except Exception, e:
-                       print "Error reading cgroup info: %s"%str(e)
+               except Exception as e:
+                       print("Error reading cgroup info: %s"%str(e))
                        pass
-       
+
        return subdirs
-               
-       
+
+
 def umount(fs_dir, opts=''):
        output = os.popen('/bin/umount %s %s 2>&1'%(opts, fs_dir)).read()
        return ('device is busy' not in output)
 
 def kvmsu(slice_name, args):
-       # Find MAC address of virt interface
-       ifstr = os.popen('/usr/bin/virsh domiflist %s'%slice_name).read().strip()
-       mac_address = ifstr.split()[-1]
-
-       # Find IP address of virt interface
-       ipaddr_str = os.popen('arp -an | grep %s'%'78:2b:cb:2d:f0:60').read().strip()
-       ip_addr_part = ipaddr_str.split()[1]
-       if (ip_addr_part[0]=='(' and ip_addr_part[-1]==')'):
-               ip_addr = ip_addr_part[1:len(ip_addr_part)-1]
-       
-       os.execv('/usr/bin/ssh',['/usr/bin/ssh','-o','StrictHostKeyChecking=no','root@%s'%ip_addr,'"$@"'])
-       
+    mac_addresses = []
+
+    # Find MAC addresses of virt interfaces
+    p = os.popen("virsh domiflist %s"%slice_name)
+    for line in p:
+        m = re.search(r'([0-9A-F]{2}[:-]){5}([0-9A-F]{2})', line, re.I)
+        if m:
+            mac_addresses.append(m.group())
+
+    # Find IP address of a reachable virt interface
+    # Here we're taking the one attached to br-nat, but this is specific to OpenCloud
+    ip_addr = None
+    try:
+        f = open('/var/lib/dnsmasq/br-nat.hosts', 'r')
+        for line in f:
+            for mac in mac_addresses:
+                m = re.search("^%s,[0-9.]+$"%mac, line, re.I)
+                if m:
+                    ip_addr = m.group().split(',')[1]
+                    break
+        f.close()
+    except:
+        pass
+
+    if ip_addr:
+        # Need to login to a Ubuntu Cloud image as 'ubuntu' user
+        # Not sure how to make this more general
+           os.execv('/usr/bin/ssh',
+                    ['/usr/bin/ssh','-o','StrictHostKeyChecking=no','ubuntu@%s'%ip_addr]
+                    + args.command_to_run)
+    else:
+        # What should happen here?
+        print("Cannot map instance to IP address")
+        exit(1)
+
+
 
 def lxcsu(slice_name, args):
        # plain lxcsu
@@ -81,14 +106,14 @@ def lxcsu(slice_name, args):
                # they chould be changed as well
 
        except:
-               print "Domain %s not found"%slice_name
+               print("Domain %s not found"%slice_name)
                exit(1)
 
        if not driver_pid or not init_pid:
-               print "Domain %s not started"%slice_name
+               print("Domain %s not started"%slice_name)
                exit(1)
 
-       if debug: print "Found driver_pid",driver_pid,'and init_pid=',init_pid
+       if debug: print("Found driver_pid",driver_pid,'and init_pid=',init_pid)
        # xxx probably init_pid here too
        arch = getarch('/proc/%s/exe'%driver_pid)
 
@@ -106,7 +131,7 @@ def lxcsu(slice_name, args):
                                sysctls.append((sysctl_file, sysctl_name, sysctl_val))
 
        # xxx probably init_pid here too
-       subdirs = get_cgroup_subdirs_for_pid(driver_pid) 
+       subdirs = get_cgroup_subdirs_for_pid(driver_pid)
        sysfs_root = '/sys/fs/cgroup'
 
        # If the slice is frozen, then we'll get an EBUSY when trying to write to the task
@@ -127,12 +152,12 @@ def lxcsu(slice_name, args):
                           subsystem_comps.reverse()
                           subsystem_alt = ','.join(subsystem_comps)
                           tasks_path_alt = [sysfs_root, subsystem_alt, subdirs[subsystem], 'tasks']
-                       except Exception,e:
+                       except Exception as e:
                                pass
-                          
+
                        tasks_path = [sysfs_root,subsystem,subdirs[subsystem],'tasks']
                        tasks_path_str = '/'.join(tasks_path)
-        
+
                        try:
                                f = open(tasks_path_str, 'w')
                        except:
@@ -143,19 +168,19 @@ def lxcsu(slice_name, args):
                        if (subsystem=='freezer'):
                                f.close()
 
-               except Exception,e:
-                       if (not subdirs.has_key(subsystem)):
+               except Exception as e:
+                       if (subsystem not in subdirs):
                                pass
                        else:
-                               if debug: print e 
-                               print "Error assigning cgroup %s (pid=%s) for slice %s"%(current_cgroup,driver_pid, slice_name)
+                               if debug: print(e)
+                               print("Error assigning cgroup %s (pid=%s) for slice %s"%(current_cgroup,driver_pid, slice_name))
                                exit(1)
 
 
        def chcontext (path):
                retcod = setns.chcontext (path)
                if retcod != 0:
-                       print 'WARNING - setns(%s)=>%s (ignored)'%(path,retcod)
+                       print('WARNING - setns(%s)=>%s (ignored)'%(path,retcod))
                return retcod
 
        # Use init_pid and not driver_pid to locate reference namespaces
@@ -163,7 +188,7 @@ def lxcsu(slice_name, args):
 
        if True:                                        chcontext(ref_ns+'uts')
        if True:                                        chcontext(ref_ns+'ipc')
-               
+
        if (not args.no_pidns):         chcontext(ref_ns+'pid')
        if (not args.no_netns):         chcontext(ref_ns+'net')
        if (not args.no_mntns):         chcontext(ref_ns+'mnt')
@@ -179,7 +204,7 @@ def lxcsu(slice_name, args):
                                os.system('%s -w %s=%s  >/dev/null 2>&1'%(fn, sysctl_name,sysctl_val))
                                break
                        else:
-                               print "Error: image does not have a sysctl binary"
+                               print("Error: image does not have a sysctl binary")
 
        # cgroups is not yet LXC-safe, so we need to use the coarse grained access control
        # strategy of unmounting the filesystem
@@ -188,14 +213,14 @@ def lxcsu(slice_name, args):
        for subsystem in ['cpuset','cpu,cpuacct','memory','devices','freezer','net_cls','blkio','perf_event','systemd']:
                fs_path = '/sys/fs/cgroup/%s'%subsystem
                if (not umount(fs_path,'-l')):
-                       print 'WARNING - umount failed (ignored) with path=',fs_path
+                       print('WARNING - umount failed (ignored) with path=',fs_path)
                        pass
                        # Leaving these comments for historical reference
                        #print "Error disabling cgroup access"
                        #exit(1) - Don't need this because failure here implies failure in the call to umount /sys/fs/cgroup
 
        if (not umount('/sys/fs/cgroup')):
-               print "Error disabling cgroup access"
+               print("Error disabling cgroup access")
                exit(1)
 
        fork_pid = os.fork()
@@ -209,7 +234,7 @@ def lxcsu(slice_name, args):
 
        if (fork_pid == 0):
                if (not args.root):
-                       setns.drop_caps() 
+                       setns.drop_caps()
                        if (args.nosliceuid):
                                # we still want to drop capabilities, but don't want to switch UIDs
                                exec_args = [arch,'/bin/sh','--login',]+args.command_to_run
@@ -218,7 +243,7 @@ def lxcsu(slice_name, args):
                                                                # as a way of checking the existence of the slice account
                                uid = getuid (slice_name)
                                if not uid:
-                                       print "lxcsu could not spot %s in /etc/passwd - exiting"%slice_name
+                                       print("lxcsu could not spot %s in /etc/passwd - exiting"%slice_name)
                                        exit(1)
                                exec_args = [arch,'/usr/bin/sudo','-u',slice_name,'/bin/sh','--login',]+args.command_to_run
 # once we can drop f12, it would be nicer to instead go for
@@ -232,7 +257,7 @@ def lxcsu(slice_name, args):
                if not args.noslicehome:
                        os.environ['HOME'] = '/home/%s'%slice_name
                        os.chdir("/home/%s"%(slice_name))
-               if debug: print 'lxcsu:execv:','/usr/bin/setarch',exec_args
+               if debug: print('lxcsu:execv:','/usr/bin/setarch',exec_args)
                os.execv('/usr/bin/setarch',exec_args)
        else:
                setns.proc_umount()
@@ -297,7 +322,7 @@ def main ():
                                ostype = pair[1].strip()
                                break
        except:
-               print "Domain %s not found"%slice_name
+               print("Domain %s not found"%slice_name)
 
        is_kvm = ostype=='hvm'