path = l.split(':')[0]
comp = l.rsplit(':')[-1]
slice_name_check = comp.rsplit('/')[-1]
+ # the lines above were added by Guilherme <gsm@machados.org>
+ # 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
logger.log("Could not import sliver_lxc or libvirt or sliver_libvirt -- which is required here.")
###################################################
-###################################################
-# Author: Guilherme Sperb Machado <gsm@machados.org>
-###################################################
-# 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.
return result
-###################################################
-# Author: Guilherme Sperb Machado <gsm@machados.org>
-###################################################
-# 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:
# 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
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 <gsm@machados.org>
###################################################
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 <gsm@machados.org>
###################################################
-# 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)
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 <gsm@machados.org>
###################################################
-# 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 <gsm@machados.org>
#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) )
git://git.onelab.eu / nodemanager.git / blobdiff