X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=tools.py;h=059b282b3c586946716436f79b13e8c03f1e90e2;hb=d21e9214c45a1fa8703b8d8dd1900024fb3b8ebc;hp=a0fbe56516bd25d9e0178e71f61861cfde47e5a5;hpb=854fdfe526baa82adf31f14cac8a62223b310050;p=nodemanager.git diff --git a/tools.py b/tools.py index a0fbe56..059b282 100644 --- a/tools.py +++ b/tools.py @@ -7,6 +7,8 @@ import fcntl import errno import threading import subprocess +import shutil +import sys import logger @@ -108,7 +110,7 @@ The return value is the pid of the other running process, or None otherwise.""" def write_file(filename, do_write, **kw_args): """Write file atomically by opening a temporary file, using to write that file, and then renaming the temporary file.""" - os.rename(write_temp_file(do_write, **kw_args), filename) + shutil.move(write_temp_file(do_write, **kw_args), filename) def write_temp_file(do_write, mode=None, uidgid=None): fd, temporary_filename = tempfile.mkstemp() @@ -145,7 +147,7 @@ def replace_file_with_string (target, new_contents, chmod=None, remove_if_empty= os.close(fd) if os.path.exists(target): os.unlink(target) - os.rename(name,target) + shutil.move(name,target) if chmod: os.chmod(target,chmod) return True @@ -190,3 +192,95 @@ class NMLock: def release(self): logger.log("tools: Lock released.", 2) fcntl.lockf(self.fd, fcntl.LOCK_UN) + +#################### +# Utilities for getting the IP address of a LXC/Openvswitch slice. Do this by +# running ifconfig inside of the slice's context. + +def get_sliver_process(slice_name, process_cmdline): + """ Utility function to find a process inside of an LXC sliver. Returns + (cgroup_fn, pid). cgroup_fn is the filename of the cgroup file for + the process, for example /proc/2592/cgroup. Pid is the process id of + the process. If the process is not found then (None, None) is returned. + """ + try: + cmd = 'grep %s /proc/*/cgroup | grep freezer'%slice_name + output = os.popen(cmd).readlines() + except: + # the slice couldn't be found + logger.log("get_sliver_process: couldn't find slice %s" % slice_name) + return (None, None) + + cgroup_fn = None + pid = None + for e in output: + try: + l = e.rstrip() + path = l.split(':')[0] + comp = l.rsplit(':')[-1] + slice_name_check = comp.rsplit('/')[-1] + + if (slice_name_check == slice_name): + slice_path = path + pid = slice_path.split('/')[2] + cmdline = open('/proc/%s/cmdline'%pid).read().rstrip('\n\x00') + if (cmdline == process_cmdline): + cgroup_fn = slice_path + break + except: + break + + if (not cgroup_fn) or (not pid): + logger.log("get_sliver_process: process %s not running in slice %s" % (process_cmdline, slice_name)) + return (None, None) + + return (cgroup_fn, pid) + +def get_sliver_ifconfig(slice_name, device="eth0"): + """ return the output of "ifconfig" run from inside the sliver. + + side effects: adds "/usr/sbin" to sys.path + """ + + # setns is part of lxcsu and is installed to /usr/sbin + if not "/usr/sbin" in sys.path: + sys.path.append("/usr/sbin") + import setns + + (cgroup_fn, pid) = get_sliver_process(slice_name, "/sbin/init") + if (not cgroup_fn) or (not pid): + return None + + path = '/proc/%s/ns/net'%pid + + result = None + try: + setns.chcontext(path) + + args = ["/sbin/ifconfig", device] + sub = subprocess.Popen(args, stderr = subprocess.PIPE, stdout = subprocess.PIPE) + sub.wait() + + if (sub.returncode != 0): + logger.log("get_slice_ifconfig: error in ifconfig: %s" % sub.stderr.read()) + + result = sub.stdout.read() + finally: + setns.chcontext("/proc/1/ns/net") + + return result + +def get_sliver_ip(slice_name): + ifconfig = get_sliver_ifconfig(slice_name) + if not ifconfig: + return None + + for line in ifconfig.split("\n"): + if "inet addr:" in line: + # example: ' inet addr:192.168.122.189 Bcast:192.168.122.255 Mask:255.255.255.0' + parts = line.strip().split() + if len(parts)>=2 and parts[1].startswith("addr:"): + return parts[1].split(":")[1] + + return None +