From decc019cb38701778589c311a8185b14f8e1a1a5 Mon Sep 17 00:00:00 2001 From: smbaker Date: Mon, 3 Dec 2012 18:57:19 -0800 Subject: [PATCH] get syndicate sliver ip by using ifconfig in sliver context --- plugins/syndicate.py | 40 +++++-------------- tools.py | 94 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 31 deletions(-) diff --git a/plugins/syndicate.py b/plugins/syndicate.py index 618b8ab..af663bd 100644 --- a/plugins/syndicate.py +++ b/plugins/syndicate.py @@ -5,6 +5,7 @@ import httplib import os import shutil +import tools from threading import Thread import logger @@ -52,36 +53,13 @@ def disable_syndicate_mount(sliver, mountpoint, syndicate_ip): except: logger.log_exc("failed to delete syndicate mountpoint", "Syndicate") -def get_syndicate_ip(): - fn = "/vservers/princeton_syndicate/var/lib/dhclient/dhclient-eth0.leases" - if not os.path.exists(fn): - logger.log("Syndicate: cannot find princeton_syndicate's dhclient lease db") - return None - - fixed_address = None - for line in open(fn).readlines(): - line = line.strip() - if line.startswith("fixed-address"): - fixed_address = line - - if not fixed_address: - logger.log("Syndicate: no fixed_address line in dhclient lease db") - return None - - parts=fixed_address.split(" ") - if len(parts)!=2: - logger.log("Syndicate: malformed fixed-address line in dhclient: %s" % line) - return None - - ip = parts[1].strip(";") - - #logger.log("Syndicate ip is %s" % ip) - - return ip - def GetSlivers(data, conf = None, plc = None): node_id = tools.node_id() + syndicate_ip = tools.get_syndicate_ip("princeton_syndicate") + if not syndicate_ip: + logger.log("Syndicate: unable to get syndicate sliver ip. aborting.") + if 'slivers' not in data: logger.log_missing_data("syndicate.GetSlivers",'slivers') return @@ -101,13 +79,13 @@ def GetSlivers(data, conf = None, plc = None): if enable_syndicate and (not has_syndicate): logger.log("Syndicate: enabling syndicate for %s" % sliver_name) - #enable_syndicate_mount(sliver, syndicate_mountpoint, get_syndicate_ip()) - t = Thread(target=enable_syndicate_mount, args=(sliver, syndicate_mountpoint, get_syndicate_ip())) + #enable_syndicate_mount(sliver, syndicate_mountpoint, syndicate_ip) + t = Thread(target=enable_syndicate_mount, args=(sliver, syndicate_mountpoint, syndicate_ip)) t.start() elif (not enable_syndicate) and (has_syndicate): logger.log("Syndicate: disabling syndicate for %s" % sliver_name) - #disable_syndicate_mount(sliver, syndicate_mountpoint, get_syndicate_ip()) - t = Thread(target=disable_syndicate_mount, args=(sliver, syndicate_mountpoint, get_syndicate_ip())) + #disable_syndicate_mount(sliver, syndicate_mountpoint, syndicate_ip) + t = Thread(target=disable_syndicate_mount, args=(sliver, syndicate_mountpoint, syndicate_ip)) t.start() diff --git a/tools.py b/tools.py index 36754fc..8b4e23c 100644 --- a/tools.py +++ b/tools.py @@ -8,6 +8,7 @@ import errno import threading import subprocess import shutil +import sys import logger @@ -191,3 +192,96 @@ 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 + r3 = setns.chcontext(path) + + 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 + -- 2.43.0