From: Guilherme Sperb Machado Date: Thu, 18 Sep 2014 16:34:46 +0000 (+0200) Subject: few changes on the ipv6.py logic, and a bit of code cleanup in tools.py, X-Git-Tag: nodemanager-5.2-15~3^2~6 X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=9fbee5e89fe13eb431318b07e4438d4d5e368cfc few changes on the ipv6.py logic, and a bit of code cleanup in tools.py, update_ipv6addr_slivertag.py, and sliver_lxc.py. --- diff --git a/plugins/ipv6.py b/plugins/ipv6.py index a9ab96e..4f5d39f 100644 --- a/plugins/ipv6.py +++ b/plugins/ipv6.py @@ -3,8 +3,19 @@ """ Description: IPv6 Support and Management to Slices ipv6 nodemanager plugin -Version: 0.5 +Version: 0.7 Author: Guilherme Sperb Machado + +Requirements: +* The 'sliversipv6prefix' tag must have this format: + ipv6_address/prefix -- e.g., 2002:1000::1/64 +* The prefix specified on 'sliversipv6prefix' tag must be at least 64 + It should vary between 1 and 64, since it is the minimum amount of bits to + have native IPv6 auto-configuration. +* The ipv6_address on 'sliversipv6prefix' tag can be any valid IPv6 address. + E.g., 2002:1000:: or 2002:1000::1 +* It is the node manager/admin responsibility to properly set the IPv6 routing, + since slivers should receive/send any kind of traffic. """ import logger @@ -136,7 +147,7 @@ def check_if_ipv6_is_different(dom, ipv6addr, prefix): if ip.getAttribute('family')=='ipv6' and \ not ( re.match(r'fe80(.*)', ip.getAttribute("address"), re.I) ) and \ (ip.getAttribute('address')!=ipv6addr or ip.getAttribute('prefix')!=prefix) : - logger.log("ipv6: the IPv6 address or prefix are different. Change detected!") + logger.log("ipv6: IPv6 address or prefix are different. Change detected!") return True return False @@ -153,7 +164,7 @@ def set_up(networkLibvirt, connLibvirt, networkElem, ipv6addr, prefix): #logger.log(networkElem.toxml()) #ret = dir(conn) #for method in ret: - # logger.log(repr(method)) + # logger.log(repr(method)) networkLibvirt.undefine() networkLibvirt.destroy() connLibvirt.networkCreateXML(newXml) @@ -180,7 +191,7 @@ interface virbr0 f.write(configRadvd) kill_radvd() start_radvd() - logger.log("ipv6: set up process finalized. Enabled IPv6 address to the slivers!") + logger.log("ipv6: set up process finalized -- enabled IPv6 address to the slivers!") def clean_up(networkLibvirt, connLibvirt, networkElem): dom = remove_ipv6(networkElem) @@ -220,9 +231,11 @@ def GetSlivers(data, config, plc): ipv6addrprefix = setting['value'].split('/', 1) ipv6addr = ipv6addrprefix[0] valid_prefix = False + logger.log("ipv6: len(ipv6addrprefix)=%s" % (len(ipv6addrprefix)) ) if len(ipv6addrprefix)>1: prefix = ipv6addrprefix[1] - if prefix>0 and prefix<=64: + logger.log("ipv6: prefix=%s" % (prefix) ) + if int(prefix)>0 and int(prefix)<=64: valid_prefix = True else: valid_prefix = False @@ -233,8 +246,8 @@ def GetSlivers(data, config, plc): if not(valid_ipv6): logger.log("ipv6: the 'sliversipv6prefix' tag presented a non-valid IPv6 address!") elif not(valid_prefix): - logger.log("ipv6: the '%s' tag does not present a valid prefix " + - "(e.g., '/64', '/58')!" % (sliversipv6prefixtag) ) + logger.log("ipv6: the '%s' tag does not present a valid prefix (e.g., '/64', '/58')!" % \ + (sliversipv6prefixtag)) else: # connecting to the libvirtd connLibvirt = Sliver_Libvirt.getConnection(type) diff --git a/plugins/update_ipv6addr_slivertag.py b/plugins/update_ipv6addr_slivertag.py index ad72875..72ba14b 100644 --- a/plugins/update_ipv6addr_slivertag.py +++ b/plugins/update_ipv6addr_slivertag.py @@ -1,5 +1,3 @@ -# -*- python-indent: 4 -*- - """ Description: Update the IPv6 Address sliver tag accordingly to the IPv6 address set update_ipv6addr_slivertag nodemanager plugin @@ -37,15 +35,15 @@ def SetSliverTag(plc, data, tagname): for slice in data['slivers']: logger.log("update_ipv6addr_slivertag: starting with slice=%s" % (slice['name']) ) - # TODO: what about the prefixlen? should we add on it as well? - # here, I'm just taking the ipv6addr (value) + # TODO: what about the prefixlen? should we add on it as well? + # here, I'm just taking the ipv6addr (value) value,prefixlen = tools.get_sliver_ipv6(slice['name']) node_id = tools.node_id() slivertags = plc.GetSliceTags({"name":slice['name'],"node_id":node_id,"tagname":tagname}) - #logger.log(repr(str(slivertags))) - #for tag in slivertags: - # logger.log(repr(str(tag))) + #logger.log(repr(str(slivertags))) + #for tag in slivertags: + # logger.log(repr(str(tag))) ipv6addr = plc.GetSliceIPv6Address(slice['name']) logger.log("update_ipv6addr_slivertag: slice=%s getSliceIPv6Address=%s" % \ diff --git a/sliver_lxc.py b/sliver_lxc.py index bc546ac..44194ed 100644 --- a/sliver_lxc.py +++ b/sliver_lxc.py @@ -13,7 +13,7 @@ from string import Template # vsys probably should not be a plugin # the thing is, the right way to handle stuff would be that # if slivers get created by doing a,b,c -# then they sohuld be delted by doing c,b,a +# then they should be deleted by doing c,b,a # the current ordering model for vsys plugins completely fails to capture that from plugins.vsys import removeSliverFromVsys, startService as vsysStartService @@ -122,7 +122,7 @@ class Sliver_LXC(Sliver_Libvirt, Initscript): # # if /vservers/foo does not exist, it creates /vservers/foo # # but if it does exist, then it creates /vservers/foo/image !! # # so we need to check the expected container rootfs does not exist yet -# # this hopefully could be removed in a future release +# # this hopefully could be removed in a future release # if os.path.exists (containerDir): # logger.log("sliver_lxc: %s: WARNING cleaning up pre-existing %s"%(name,containerDir)) # command = ['btrfs', 'subvolume', 'delete', containerDir] @@ -222,7 +222,7 @@ class Sliver_LXC(Sliver_Libvirt, Initscript): logger.log_exc("exception while updating /etc/sudoers") # customizations for the user environment - root or slice uid - # we save the whole business in /etc/planetlab.profile + # we save the whole business in /etc/planetlab.profile # and source this file for both root and the slice uid's .profile # prompt for slice owner, + LD_PRELOAD for transparently wrap bind pl_profile=os.path.join(containerDir,"etc/planetlab.profile") @@ -258,7 +258,7 @@ unset pathmunge # if dir is not yet existing let's forget it for now if not os.path.isdir(os.path.dirname(from_root)): continue found=False - try: + try: contents=file(from_root).readlines() for content in contents: if content==enforced_line: found=True @@ -342,7 +342,7 @@ unset pathmunge # Remove rootfs of destroyed domain command = ['btrfs', 'subvolume', 'delete', containerDir] logger.log_call(command, timeout=BTRFS_TIMEOUT) - + # For some reason I am seeing this : #log_call: running command btrfs subvolume delete /vservers/inri_sl1 #log_call: ERROR: cannot delete '/vservers/inri_sl1' - Device or resource busy diff --git a/tools.py b/tools.py index 4a658b8..42d63d1 100644 --- a/tools.py +++ b/tools.py @@ -236,6 +236,11 @@ def get_sliver_process(slice_name, process_cmdline): path = l.split(':')[0] comp = l.rsplit(':')[-1] slice_name_check = comp.rsplit('/')[-1] + # the lines above were added by Guilherme + # due to the ipv6 plugin requirements + virt=get_node_virt() + if virt=='lxc': + slice_name_check = slice_name_check.rsplit('.')[0] if (slice_name_check == slice_name): slice_path = path @@ -271,65 +276,6 @@ except: logger.log("Could not import sliver_lxc or libvirt or sliver_libvirt -- which is required here.") ################################################### -################################################### -# Author: Guilherme Sperb Machado -################################################### -# Basically this method is just a copy from "get_sliver_process()", just -# adding one more split() to correctly parse the processes for LXC. -# Only for LXC! -# TODO: maybe merge both methods, and put the type as an argument, if -# it is LXC or vserver -################################################### -def get_sliver_process_lxc(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() - #logger.log("tools: l=%s" % (l) ) - path = l.split(':')[0] - #logger.log("tools: path=%s" % (path) ) - comp = l.rsplit(':')[-1] - #logger.log("tools: comp=%s" % (comp) ) - slice_name_check1 = comp.rsplit('/')[-1] - #logger.log("tools: slice_name_check1=%s" % (slice_name_check1) ) - slice_name_check2 = slice_name_check1.rsplit('.')[0] - #logger.log("tools: slice_name_check2=%s" % (slice_name_check2) ) - - if (slice_name_check2 == slice_name): - slice_path = path - pid = slice_path.split('/')[2] - #logger.log("tools: pid=%s" % (pid) ) - cmdline = open('/proc/%s/cmdline'%pid).read().rstrip('\n\x00') - #logger.log("tools: cmdline=%s" % (cmdline) ) - #logger.log("tools: process_cmdline=%s" % (process_cmdline) ) - if (cmdline == process_cmdline): - cgroup_fn = slice_path - break - except: - #logger.log("tools: break!") - 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. @@ -369,55 +315,6 @@ def get_sliver_ifconfig(slice_name, device="eth0"): return result -################################################### -# Author: Guilherme Sperb Machado -################################################### -# Basically this method is just a copy from "get_sliver_ifconfig()", but, -# instead, calls the "get_sliver_process_lxc()" method. -# Only for LXC! -# TODO: maybe merge both methods, and put the type as an argument, if -# it is LXC or vserver -################################################### -def get_sliver_ifconfig_lxc(slice_name, device="eth0"): - """ return the output of "ifconfig" run from inside the sliver. - - side effects: adds "/usr/sbin" to sys.path - """ - - # See if setns is installed. If it's not then we're probably not running - # LXC. - if not os.path.exists("/usr/sbin/setns.so"): - return None - - # 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_lxc(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: @@ -439,7 +336,7 @@ def get_sliver_ip(slice_name): # Only for LXC! ################################################### def get_sliver_ipv6(slice_name): - ifconfig = get_sliver_ifconfig_lxc(slice_name) + ifconfig = get_sliver_ifconfig(slice_name) if not ifconfig: return None,None @@ -508,11 +405,11 @@ def reboot_slivers(): for domain in domains: try: domain.destroy() - logger.log("tools: %s destroyed" % (domain.name()) ) + logger.log("tools: DESTROYED %s" % (domain.name()) ) domain.create() - logger.log("tools: %s created" % (domain.name()) ) + logger.log("tools: CREATED %s" % (domain.name()) ) except: - logger.log("tools: %s could not be rebooted" % (domain.name()) ) + logger.log("tools: FAILED to reboot %s" % (domain.name()) ) ################################################### # Author: Guilherme Sperb Machado @@ -521,13 +418,13 @@ def reboot_slivers(): ################################################### def get_hosts_file_path(slicename): containerDir = os.path.join(sliver_lxc.Sliver_LXC.CON_BASE_DIR, slicename) - logger.log("tools: %s" % (containerDir) ) return os.path.join(containerDir, 'etc', 'hosts') ################################################### # Author: Guilherme Sperb Machado ################################################### -# Search if there is a specific ipv6 address in the /etc/hosts file of a given slice +# Search if there is a specific ipv6 address in the +# /etc/hosts file of a given slice ################################################### def search_ipv6addr_hosts(slicename, ipv6addr): hostsFilePath = get_hosts_file_path(slicename) @@ -539,30 +436,32 @@ def search_ipv6addr_hosts(slicename, ipv6addr): fileinput.close() return found except: - logger.log("tools: error when finding ipv6 address %s in the /etc/hosts file of slice=%s" % (ipv6addr, slicename) ) + logger.log("tools: FAILED to search %s in /etc/hosts file of slice=%s" % \ + (ipv6addr, slicename) ) ################################################### # Author: Guilherme Sperb Machado ################################################### -# Removes all ipv6 addresses from the /etc/hosts file of a given slice +# Removes all ipv6 addresses from the /etc/hosts +# file of a given slice ################################################### def remove_all_ipv6addr_hosts(slicename, node): hostsFilePath = get_hosts_file_path(slicename) try: for line in fileinput.input(r'%s' % (hostsFilePath), inplace=True): - logger.log("tools: line=%s" % (line) ) search = re.search(r'^(.*)\s+(%s|%s)$' % (node,'localhost'), line) if search: ipv6candidate = search.group(1) ipv6candidatestrip = ipv6candidate.strip() - logger.log("tools: group1=%s" % (ipv6candidatestrip) ) valid = is_valid_ipv6(ipv6candidatestrip) if not valid: - logger.log("tools: address=%s not valid" % (ipv6candidatestrip) ) print line, fileinput.close() + logger.log("tools: REMOVED IPv6 address from /etc/hosts file of slice=%s" % \ + (slicename) ) except: - logger.log("tools: could not delete the ipv6 address from the hosts file of slice=%s" % (slicename) ) + logger.log("tools: FAILED to remove the IPv6 address from /etc/hosts file of slice=%s" % \ + (slicename) ) ################################################### # Author: Guilherme Sperb Machado @@ -577,12 +476,13 @@ def add_ipv6addr_hosts_line(slicename, node, ipv6addr): #string = "127.0.0.1\tlocalhost\n" try: with open(hostsFilePath, "a") as file: - # debugging purposes only: - #file.write(string) file.write(ipv6addr + " " + node + "\n") file.close() + logger.log("tools: ADDED IPv6 address to /etc/hosts file of slice=%s" % \ + (slicename) ) except: - logger.log("tools: could not add the IPv6 address to the hosts file of slice=%s" % (slicename) ) + logger.log("tools: FAILED to add the IPv6 address to /etc/hosts file of slice=%s" % \ + (slicename) )