Skip to content

S
slapos.core
Commit b8105d89 authored by Tomáš Peterka's avatar Tomáš Peterka
Browse files
Options

Merge remote-tracking branch 'origin/master' into amarisoft 

Conflicts:
	slapos/tests/slapformat.py
parents 9181210a 75650e2c
Hide whitespace changes
Inline Side-by-side
Showing with 162 additions and 139 deletions
slapos/format.py
View file @ b8105d89
...@@ -246,6 +246,7 @@ class CGroupManager(object): ...@@ -246,6 +246,7 @@ class CGroupManager(object):
cpu_exclusive_file = ".slapos-cpu-exclusive" cpu_exclusive_file = ".slapos-cpu-exclusive"
cpuset_path = "/sys/fs/cgroup/cpuset/" cpuset_path = "/sys/fs/cgroup/cpuset/"
task_write_mode = "wt"
def __init__(self, computer): def __init__(self, computer):
"""Extract necessary information from the ``computer``. """Extract necessary information from the ``computer``.
...@@ -277,8 +278,8 @@ class CGroupManager(object): ...@@ -277,8 +278,8 @@ class CGroupManager(object):
Those folders are "/sys/fs/cgroup/cpuset/cpu<N>". Those folders are "/sys/fs/cgroup/cpuset/cpu<N>".
""" """
for cpu in self._list_cpus(): for cpu in self._cpu_list():
cpu_path = self._prepare_cgroup_folder( cpu_path = self._prepare_folder(
os.path.join(self.cpuset_path, "cpu" + str(cpu))) os.path.join(self.cpuset_path, "cpu" + str(cpu)))
with open(cpu_path + "/cpuset.cpus", "wt") as fx: with open(cpu_path + "/cpuset.cpus", "wt") as fx:
fx.write(str(cpu)) # this cgroup manages only this cpu fx.write(str(cpu)) # this cgroup manages only this cpu
...@@ -299,7 +300,7 @@ class CGroupManager(object): ...@@ -299,7 +300,7 @@ class CGroupManager(object):
with open(request_file, "rt") as fi: with open(request_file, "rt") as fi:
request_pid_set.update(map(int, fi.read().split())) request_pid_set.update(map(int, fi.read().split()))
cpu_list = self._list_cpus() cpu_list = self._cpu_list()
generic_cpu = cpu_list[0] generic_cpu = cpu_list[0]
exclusive_cpu_list = cpu_list[1:] exclusive_cpu_list = cpu_list[1:]
...@@ -311,12 +312,12 @@ class CGroupManager(object): ...@@ -311,12 +312,12 @@ class CGroupManager(object):
running_pid_set.update(map(int, fi.read().split())) running_pid_set.update(map(int, fi.read().split()))
# gather already exclusively running PIDs # gather already exclusively running PIDs
exlusive_pid_set = set() exclusive_pid_set = set()
for exclusive_cpu in exclusive_cpu_list: for exclusive_cpu in exclusive_cpu_list:
with open(os.path.join(self.cpuset_path, "cpu" + str(exclusive_cpu), "tasks"), "rt") as fi: with open(os.path.join(self.cpuset_path, "cpu" + str(exclusive_cpu), "tasks"), "rt") as fi:
exlusive_pid_set.update(map(int, fi.read().split())) exclusive_pid_set.update(map(int, fi.read().split()))
for request in request_set: for request in request_pid_set:
if request in exclusive_pid_set: if request in exclusive_pid_set:
continue # already exclusive continue # already exclusive
if request not in running_pid_set: if request not in running_pid_set:
...@@ -325,17 +326,14 @@ class CGroupManager(object): ...@@ -325,17 +326,14 @@ class CGroupManager(object):
def prepare_cpu_space(self): def prepare_cpu_space(self):
"""Move all PIDs from the pool of all CPUs into the first exclusive CPU.""" """Move all PIDs from the pool of all CPUs into the first exclusive CPU."""
with open(self.cpuset_path + "tasks", "rt") as fi: with open(os.path.join(self.cpuset_path, "tasks"), "rt") as fi:
running_set = set(map(int, fi.read().split())) running_set = set(map(int, fi.read().split()))
first_cpu = self._list_cpus()[0] first_cpu = self._cpu_list()[0]
task_path = os.path.join(self.cpuset_path, "cpu" + str(first_cpu), "tasks")
for pid in running_set: for pid in running_set:
with open(task_path, "wt") as fo: self._move_task(pid, first_cpu)
fo.write(str(pid))
time.sleep(0.01) time.sleep(0.01)
def _list_cpus(self): def _cpu_list(self):
"""Extract IDs of available CPUs and return them as a list. """Extract IDs of available CPUs and return them as a list.
The first one will be always used for all non-exclusive processes. The first one will be always used for all non-exclusive processes.
...@@ -357,19 +355,23 @@ class CGroupManager(object): ...@@ -357,19 +355,23 @@ class CGroupManager(object):
:return: int, cpu_id of used CPU, -1 if placement was not possible :return: int, cpu_id of used CPU, -1 if placement was not possible
""" """
exclusive_cpu_list = self._list_cpus()[1:] exclusive_cpu_list = self._cpu_list()[1:]
for exclusive_cpu in exclusive_cpu_list: for exclusive_cpu in exclusive_cpu_list:
# gather tasks assigned to current exclusive CPU # gather tasks assigned to current exclusive CPU
task_path = os.path.join(self.cpuset_path, "cpu" + str(first_cpu), "tasks") task_path = os.path.join(self.cpuset_path, "cpu" + str(exclusive_cpu), "tasks")
with open(task_path, "rt") as fi: with open(task_path, "rt") as fi:
task_list = fi.read().split() task_list = fi.read().split()
if len(task_list) > 0: if len(task_list) > 0:
continue # skip occupied CPUs continue # skip occupied CPUs
with open(task_path, "wt") as fo: return self._move_task(pid, exclusive_cpu)[1]
fo.write(str(pid))
return exclusive_cpu
return -1 return -1
def _move_task(self, pid, cpu_id):
"""Move ``pid`` to ``cpu_id``."""
with open(os.path.join(self.cpuset_path, "cpu" + str(cpu_id), "tasks"), self.task_write_mode) as fo:
fo.write(str(pid) + "\n")
return pid, cpu_id
def _prepare_folder(self, folder): def _prepare_folder(self, folder):
"""If-Create folder and set group write permission.""" """If-Create folder and set group write permission."""
if not os.path.exists(folder): if not os.path.exists(folder):
...@@ -421,7 +423,7 @@ class Computer(object): ...@@ -421,7 +423,7 @@ class Computer(object):
self.slapos_version = None self.slapos_version = None
# HASA relation to managers (could turn into plugins with `format` and `update` methods) # HASA relation to managers (could turn into plugins with `format` and `update` methods)
self.manager_list = (manager(self) for manager in manager_list if manager(self).allowed()) \ self.manager_list = [manager(self) for manager in manager_list if manager(self).allowed()] \
if manager_list else tuple() if manager_list else tuple()
def __getinitargs__(self): def __getinitargs__(self):
...@@ -1070,12 +1072,6 @@ class Tap(object): ...@@ -1070,12 +1072,6 @@ class Tap(object):
else: else:
raise ValueError("%s should not be empty. No ipv4 address assigned to %s" % raise ValueError("%s should not be empty. No ipv4 address assigned to %s" %
(self.ipv4_addr, self.name)) (self.ipv4_addr, self.name))
# Add iptables rule to accept connections from this interface
chain_rule = ['INPUT', '-i', self.name, '-j', 'ACCEPT']
code, _ = callAndRead(['iptables', '-C'] + chain_rule, raise_on_error=False)
if code == 0:
# 0 means the rule does not exits so we are free to insert it
callAndRead(['iptables', '-I'] + chain_rule)
class Tun(Tap): class Tun(Tap):
...@@ -1119,7 +1115,14 @@ class Tun(Tap): ...@@ -1119,7 +1115,14 @@ class Tun(Tap):
else: else:
raise RuntimeError("Cannot setup address on interface {}. " raise RuntimeError("Cannot setup address on interface {}. "
"Address is missing.".format(self.name)) "Address is missing.".format(self.name))
# create routes
super(Tun, self).createRoutes() super(Tun, self).createRoutes()
# add iptables rule to accept connections from this interface
chain_rule = ['INPUT', '-i', self.name, '-j', 'ACCEPT']
code, _ = callAndRead(['iptables', '-C'] + chain_rule, raise_on_error=False)
if code == 0:
# 0 means the rule does not exits so we are free to insert it
callAndRead(['iptables', '-I'] + chain_rule)
class Interface(object): class Interface(object):
...@@ -1188,8 +1191,13 @@ class Interface(object): ...@@ -1188,8 +1191,13 @@ class Interface(object):
return address_list return address_list
def isBridge(self): def isBridge(self):
_, result = callAndRead(['brctl', 'show']) try:
return any(line.startswith(self.name) for line in result.split("\n")) _, result = callAndRead(['brctl', 'show'])
return any(line.startswith(self.name) for line in result.split("\n"))
except Exception as e:
# the binary "brctl" itself does not exist - bridge is imposible to exist
logger.warning(str(e))
return False
def getInterfaceList(self): def getInterfaceList(self):
"""Returns list of interfaces already present on bridge""" """Returns list of interfaces already present on bridge"""
......
slapos/tests/slapformat.py
View file @ b8105d89
...@@ -26,16 +26,15 @@ ...@@ -26,16 +26,15 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# #
############################################################################## ##############################################################################
from __future__ import print_function import glob
import logging import logging
import slapos.format import slapos.format
import slapos.util import slapos.util
import unittest import unittest
import netaddr import netaddr
import shutil
import socket import socket
# for mocking # for mocking
import grp import grp
import netifaces import netifaces
...@@ -83,7 +82,7 @@ class FakeCallAndRead: ...@@ -83,7 +82,7 @@ class FakeCallAndRead:
retval = 0, 'UP' retval = 0, 'UP'
global INTERFACE_DICT global INTERFACE_DICT
if 'useradd' in argument_list: if 'useradd' in argument_list:
print(argument_list) print argument_list
global USER_LIST global USER_LIST
username = argument_list[-1] username = argument_list[-1]
if username == '-r': if username == '-r':
...@@ -113,6 +112,11 @@ class FakeCallAndRead: ...@@ -113,6 +112,11 @@ class FakeCallAndRead:
retval = 0, 'OK' retval = 0, 'OK'
elif argument_list[:3] == ['route', 'add', '-host']: elif argument_list[:3] == ['route', 'add', '-host']:
retval = 0, 'OK' retval = 0, 'OK'
elif argument_list[:2] == ['brctl', 'show']:
retval = 0, "\n".join(("bridge name bridge id STP enabled interfaces",
"bridge bridge bridge b001 000:000 1 fakeinterface",
" fakeinterface2"
""))
self.external_command_list.append(' '.join(argument_list)) self.external_command_list.append(' '.join(argument_list))
return retval return retval
...@@ -148,11 +152,16 @@ class PwdMock: ...@@ -148,11 +152,16 @@ class PwdMock:
def getpwnam(self, name): def getpwnam(self, name):
global USER_LIST global USER_LIST
if name in USER_LIST: if name in USER_LIST:
class result: class PwdResult:
pw_uid = 0 pw_uid = 0
pw_gid = 0 pw_gid = 0
return result def __getitem__(self, index):
raise KeyError if index == 2:
return self.pw_uid
if index == 3:
return self.pw_gid
return PwdResult()
raise KeyError("User \"{}\" not in global USER_LIST {!s}".format(name, USER_LIST))
class NetifacesMock: class NetifacesMock:
...@@ -161,7 +170,8 @@ class NetifacesMock: ...@@ -161,7 +170,8 @@ class NetifacesMock:
global INTERFACE_DICT global INTERFACE_DICT
if name in INTERFACE_DICT: if name in INTERFACE_DICT:
return INTERFACE_DICT[name] return INTERFACE_DICT[name]
raise ValueError raise ValueError("Interface \"{}\" not in INTERFACE_DICT {!s}".format(
name, INTERFACE_DICT))
@classmethod @classmethod
def interfaces(self): def interfaces(self):
...@@ -177,6 +187,7 @@ class SlaposUtilMock: ...@@ -177,6 +187,7 @@ class SlaposUtilMock:
class CGroupManagerMock(slapos.format.CGroupManager): class CGroupManagerMock(slapos.format.CGroupManager):
cpuset_path = "/tmp/cpuset/" cpuset_path = "/tmp/cpuset/"
task_write_mode = "at" # append insted of write tasks PIDs for the tests
def allowed(self): def allowed(self):
"""Always allowed.""" """Always allowed."""
...@@ -240,6 +251,8 @@ class SlapformatMixin(unittest.TestCase): ...@@ -240,6 +251,8 @@ class SlapformatMixin(unittest.TestCase):
setattr(os, fake, f) setattr(os, fake, f)
def restoreOs(self): def restoreOs(self):
if not hasattr(self, 'saved_os'):
return # os was never patched or already restored
for name, original_value in self.saved_os.items(): for name, original_value in self.saved_os.items():
setattr(os, name, original_value) setattr(os, name, original_value)
del self.saved_os del self.saved_os
...@@ -255,33 +268,6 @@ class SlapformatMixin(unittest.TestCase): ...@@ -255,33 +268,6 @@ class SlapformatMixin(unittest.TestCase):
setattr(slapos.util, name, original_value) setattr(slapos.util, name, original_value)
del self.saved_slapos_util del self.saved_slapos_util
def assertEqualCommands(self, seq1, seq2):
"""Assert that all items in seq1 are present in right order in seq2.
This is useful for ``logger.bucket_list`` where we save executed commands
which mix together with logging messages.
"""
if len(seq1) == 0:
return
assert len(seq1) <= len(seq2), "First argument should contain mandatory items\n"
if len(seq1) != len(seq2):
logging.getLogger('test.slap.format').warning("Comparing uneven sequences!\n")
print("\n".join(map(str, seq1)))
print("\n".join(map(str, seq2)))
# we cannot do simple filter s2 in s1 because commands might repeat
iter1, iter2 = iter(seq1), iter(seq2)
item1, item2 = next(iter1), next(iter2)
try:
while item1 != item2:
item2 = next(iter2)
item1 = next(iter1)
except StopIteration as e:
raise AssertionError(
"Following sequences differs at line \"{!s}\"\n{}\n!=\n{}\n".format(
item1,
"\n".join(map(str, seq1)),
"\n".join(map(str, seq2))))
def setUp(self): def setUp(self):
config = FakeConfig() config = FakeConfig()
config.dry_run = True config.dry_run = True
...@@ -342,14 +328,14 @@ class TestComputer(SlapformatMixin): ...@@ -342,14 +328,14 @@ class TestComputer(SlapformatMixin):
logger=self.logger, name='bridge', ipv4_local_network='127.0.0.1/16'), logger=self.logger, name='bridge', ipv4_local_network='127.0.0.1/16'),
partition_list=[]) partition_list=[])
computer.format() computer.format()
self.assertEqualCommands([ self.assertEqual([
"makedirs('/instance_root', 493)", "makedirs('/instance_root', 493)",
"makedirs('/software_root', 493)", "makedirs('/software_root', 493)",
"chown('/software_root', 0, 0)", "chown('/software_root', 0, 0)",
"chmod('/software_root', 493)"], "chmod('/software_root', 493)"],
self.test_result.bucket) self.test_result.bucket)
self.assertEqual([ self.assertEqual([
# 'ip addr list bridge', # don't track non-functional commands 'ip addr list bridge',
'groupadd slapsoft', 'groupadd slapsoft',
'useradd -d /software_root -g slapsoft slapsoft -r' 'useradd -d /software_root -g slapsoft slapsoft -r'
], ],
...@@ -363,13 +349,15 @@ class TestComputer(SlapformatMixin): ...@@ -363,13 +349,15 @@ class TestComputer(SlapformatMixin):
logger=self.logger, name='bridge', ipv4_local_network='127.0.0.1/16'), logger=self.logger, name='bridge', ipv4_local_network='127.0.0.1/16'),
partition_list=[]) partition_list=[])
computer.format(alter_user=False) computer.format(alter_user=False)
self.assertEqualCommands([ self.assertEqual([
"makedirs('/instance_root', 493)", "makedirs('/instance_root', 493)",
"makedirs('/software_root', 493)", "makedirs('/software_root', 493)",
"chmod('/software_root', 493)"], "chmod('/software_root', 493)"],
self.test_result.bucket) self.test_result.bucket)
self.assertEqualCommands( self.assertEqual([
['ip addr list bridge'], 'ip addr list bridge',
'brctl show',
],
self.fakeCallAndRead.external_command_list) self.fakeCallAndRead.external_command_list)
@unittest.skip("Not implemented") @unittest.skip("Not implemented")
...@@ -380,14 +368,13 @@ class TestComputer(SlapformatMixin): ...@@ -380,14 +368,13 @@ class TestComputer(SlapformatMixin):
interface=slapos.format.Interface( interface=slapos.format.Interface(
logger=self.logger, name='bridge', ipv4_local_network='127.0.0.1/16'), logger=self.logger, name='bridge', ipv4_local_network='127.0.0.1/16'),
partition_list=[]) partition_list=[])
computer.format(alter_network=False) self.assertEqual([
self.assertEqualCommands([
"makedirs('/instance_root', 493)", "makedirs('/instance_root', 493)",
"makedirs('/software_root', 493)", "makedirs('/software_root', 493)",
"chown('/software_root', 0, 0)", "chown('/software_root', 0, 0)",
"chmod('/software_root', 493)"], "chmod('/software_root', 493)"],
self.test_result.bucket) self.test_result.bucket)
self.assertEqualCommands([ self.assertEqual([
'ip addr list bridge', 'ip addr list bridge',
'groupadd slapsoft', 'groupadd slapsoft',
'useradd -d /software_root -g slapsoft slapsoft -r' 'useradd -d /software_root -g slapsoft slapsoft -r'
...@@ -402,12 +389,16 @@ class TestComputer(SlapformatMixin): ...@@ -402,12 +389,16 @@ class TestComputer(SlapformatMixin):
logger=self.logger, name='bridge', ipv4_local_network='127.0.0.1/16'), logger=self.logger, name='bridge', ipv4_local_network='127.0.0.1/16'),
partition_list=[]) partition_list=[])
computer.format(alter_network=False, alter_user=False) computer.format(alter_network=False, alter_user=False)
self.assertEqualCommands([ self.assertEqual([
"makedirs('/instance_root', 493)", "makedirs('/instance_root', 493)",
"makedirs('/software_root', 493)", "makedirs('/software_root', 493)",
"chmod('/software_root', 493)"], "chmod('/software_root', 493)"],
self.test_result.bucket) self.test_result.bucket)
self.assertEqualCommands([], self.fakeCallAndRead.external_command_list) self.assertEqual([
'ip addr list bridge',
'brctl show',
],
self.fakeCallAndRead.external_command_list)
@unittest.skip("Not implemented") @unittest.skip("Not implemented")
def test_construct_prepared(self): def test_construct_prepared(self):
...@@ -428,7 +419,7 @@ class TestComputer(SlapformatMixin): ...@@ -428,7 +419,7 @@ class TestComputer(SlapformatMixin):
} }
computer.format() computer.format()
self.assertEqualCommands([ self.assertEqual([
"makedirs('/instance_root', 493)", "makedirs('/instance_root', 493)",
"makedirs('/software_root', 493)", "makedirs('/software_root', 493)",
"chown('/software_root', 0, 0)", "chown('/software_root', 0, 0)",
...@@ -438,20 +429,21 @@ class TestComputer(SlapformatMixin): ...@@ -438,20 +429,21 @@ class TestComputer(SlapformatMixin):
"chmod('/instance_root/partition', 488)" "chmod('/instance_root/partition', 488)"
], ],
self.test_result.bucket) self.test_result.bucket)
self.assertEqualCommands([ self.assertEqual([
'ip addr list bridge', 'ip addr list bridge',
'groupadd slapsoft', 'groupadd slapsoft',
'useradd -d /software_root -g slapsoft slapsoft -r', 'useradd -d /software_root -g slapsoft slapsoft -r',
'groupadd testuser', 'groupadd testuser',
'useradd -d /instance_root/partition -g testuser -G slapsoft testuser -r', 'useradd -d /instance_root/partition -g testuser -G slapsoft testuser -r',
'tunctl -t tap -u testuser', 'brctl show',
'ip tuntap add dev tap mode tap user testuser',
'ip link set tap up', 'ip link set tap up',
# 'brctl show', # don't track non-functional commands 'brctl show',
'brctl addif bridge tap', 'brctl addif bridge tap',
'ip addr add ip/255.255.255.255 dev bridge', 'ip addr add ip/255.255.255.255 dev bridge',
# 'ip addr list bridge', # don't track non-functional commands 'ip addr list bridge',
'ip addr add ip/ffff:ffff:ffff:ffff:: dev bridge', 'ip addr add ip/ffff:ffff:ffff:ffff:: dev bridge',
# 'ip addr list bridge', # don't track non-functional commands 'ip addr list bridge',
], ],
self.fakeCallAndRead.external_command_list) self.fakeCallAndRead.external_command_list)
...@@ -475,7 +467,7 @@ class TestComputer(SlapformatMixin): ...@@ -475,7 +467,7 @@ class TestComputer(SlapformatMixin):
} }
computer.format(alter_user=False) computer.format(alter_user=False)
self.assertEqualCommands([ self.assertEqual([
"makedirs('/instance_root', 493)", "makedirs('/instance_root', 493)",
"makedirs('/software_root', 493)", "makedirs('/software_root', 493)",
"chmod('/software_root', 493)", "chmod('/software_root', 493)",
...@@ -483,17 +475,19 @@ class TestComputer(SlapformatMixin): ...@@ -483,17 +475,19 @@ class TestComputer(SlapformatMixin):
"chmod('/instance_root/partition', 488)" "chmod('/instance_root/partition', 488)"
], ],
self.test_result.bucket) self.test_result.bucket)
self.assertEqualCommands([ self.assertEqual([
'ip addr list bridge', 'ip addr list bridge',
'tunctl -t tap -u testuser', 'brctl show',
'ip link set tap up', 'ip tuntap add dev tap mode tap user testuser',
# 'brctl show', # don't track non-functional commands 'ip link set tap up',
'brctl addif bridge tap', 'brctl show',
'ip addr add ip/255.255.255.255 dev bridge', 'brctl show',
# 'ip addr list bridge', # don't track non-functional commands 'brctl addif bridge tap',
'ip addr add ip/ffff:ffff:ffff:ffff:: dev bridge', 'ip addr add ip/255.255.255.255 dev bridge',
# 'ip -6 addr list bridge', # don't track non-functional commands # 'ip addr list bridge',
], 'ip addr add ip/ffff:ffff:ffff:ffff:: dev bridge',
'ip -6 addr list bridge',
],
self.fakeCallAndRead.external_command_list) self.fakeCallAndRead.external_command_list)
def test_construct_prepared_tap_no_alter_user(self): def test_construct_prepared_tap_no_alter_user(self):
...@@ -505,12 +499,11 @@ class TestComputer(SlapformatMixin): ...@@ -505,12 +499,11 @@ class TestComputer(SlapformatMixin):
logger=self.logger, name='iface', ipv4_local_network='127.0.0.1/16'), logger=self.logger, name='iface', ipv4_local_network='127.0.0.1/16'),
partition_list=[ partition_list=[
slapos.format.Partition( slapos.format.Partition(
'partition', '/part_path', slapos.format.User('testuser'), [], tap=None), 'partition', '/part_path', slapos.format.User('testuser'), [],
tap=slapos.format.Tap('tap')),
]) ])
global USER_LIST global USER_LIST
USER_LIST = ['testuser'] USER_LIST = ['testuser']
partition.tap = slapos.format.Tap('tap')
computer.partition_list = [partition]
global INTERFACE_DICT global INTERFACE_DICT
INTERFACE_DICT['iface'] = { INTERFACE_DICT['iface'] = {
socket.AF_INET: [{'addr': '192.168.242.77', 'broadcast': '127.0.0.1', socket.AF_INET: [{'addr': '192.168.242.77', 'broadcast': '127.0.0.1',
...@@ -523,7 +516,7 @@ class TestComputer(SlapformatMixin): ...@@ -523,7 +516,7 @@ class TestComputer(SlapformatMixin):
} }
computer.format(alter_user=False) computer.format(alter_user=False)
self.assertEqualCommands([ self.assertEqual([
"makedirs('/instance_root', 493)", "makedirs('/instance_root', 493)",
"makedirs('/software_root', 493)", "makedirs('/software_root', 493)",
"chmod('/software_root', 493)", "chmod('/software_root', 493)",
...@@ -531,17 +524,19 @@ class TestComputer(SlapformatMixin): ...@@ -531,17 +524,19 @@ class TestComputer(SlapformatMixin):
"chmod('/instance_root/partition', 488)" "chmod('/instance_root/partition', 488)"
], ],
self.test_result.bucket) self.test_result.bucket)
self.assertEqualCommands([ self.assertEqual([
'ip addr list iface', 'ip addr list iface',
'tunctl -t tap -u testuser', 'brctl show',
'ip tuntap add dev tap mode tap user testuser',
'ip link set tap up', 'ip link set tap up',
'ip route show 10.8.0.2', 'ip route show 10.8.0.2',
'route add -host 10.8.0.2 dev tap', 'ip route add 10.8.0.2 dev tap',
'ip addr add ip/255.255.255.255 dev iface', 'ip addr add ip/255.255.255.255 dev iface',
'ip addr add ip/ffff:ffff:ffff:ffff:: dev iface', 'ip addr add ip/ffff:ffff:ffff:ffff:: dev iface',
# 'ip -6 addr list iface' # don't track non-functional commands 'ip -6 addr list iface'
], ],
self.fakeCallAndRead.external_command_list) self.fakeCallAndRead.external_command_list)
partition = computer.partition_list[0]
self.assertEqual(partition.tap.ipv4_addr, '10.8.0.2') self.assertEqual(partition.tap.ipv4_addr, '10.8.0.2')
self.assertEqual(partition.tap.ipv4_netmask, '255.255.255.0') self.assertEqual(partition.tap.ipv4_netmask, '255.255.255.0')
self.assertEqual(partition.tap.ipv4_gateway, '10.8.0.1') self.assertEqual(partition.tap.ipv4_gateway, '10.8.0.1')
...@@ -565,9 +560,8 @@ class TestComputer(SlapformatMixin): ...@@ -565,9 +560,8 @@ class TestComputer(SlapformatMixin):
'netmask': '255.255.255.0'}], 'netmask': '255.255.255.0'}],
socket.AF_INET6: [{'addr': '2a01:e35:2e27::e59c', 'netmask': 'ffff:ffff:ffff:ffff::'}] socket.AF_INET6: [{'addr': '2a01:e35:2e27::e59c', 'netmask': 'ffff:ffff:ffff:ffff::'}]
} }
computer.format(alter_network=False) computer.format(alter_network=False)
self.assertEqualCommands([ self.assertEqual([
"makedirs('/instance_root', 493)", "makedirs('/instance_root', 493)",
"makedirs('/software_root', 493)", "makedirs('/software_root', 493)",
"chown('/software_root', 0, 0)", "chown('/software_root', 0, 0)",
...@@ -577,8 +571,8 @@ class TestComputer(SlapformatMixin): ...@@ -577,8 +571,8 @@ class TestComputer(SlapformatMixin):
"chmod('/instance_root/partition', 488)" "chmod('/instance_root/partition', 488)"
], ],
self.test_result.bucket) self.test_result.bucket)
self.assertEqualCommands([ self.assertEqual([
# 'ip addr list bridge', # don't track non-functional commands # 'ip addr list bridge',
'groupadd slapsoft', 'groupadd slapsoft',
'useradd -d /software_root -g slapsoft slapsoft -r', 'useradd -d /software_root -g slapsoft slapsoft -r',
'groupadd testuser', 'groupadd testuser',
...@@ -609,21 +603,22 @@ class TestComputer(SlapformatMixin): ...@@ -609,21 +603,22 @@ class TestComputer(SlapformatMixin):
} }
computer.format(alter_network=False, alter_user=False) computer.format(alter_network=False, alter_user=False)
self.assertEqualCommands([ self.assertEqual([
"makedirs('/instance_root', 493)", "makedirs('/instance_root', 493)",
"makedirs('/software_root', 493)", "makedirs('/software_root', 493)",
"chmod('/software_root', 493)", "chmod('/software_root', 493)",
"mkdir('/instance_root/partition', 488)", "mkdir('/instance_root/partition', 488)",
"chmod('/instance_root/partition', 488)" "chmod('/instance_root/partition', 488)"
], ],
self.test_result.bucket) self.test_result.bucket)
self.assertEqualCommands([ self.assertEqual([
# 'ip addr list bridge', # don't track non-functional commands 'ip addr list bridge',
'ip addr add ip/255.255.255.255 dev bridge', 'brctl show',
# 'ip addr list bridge', # don't track non-functional commands 'ip addr add ip/255.255.255.255 dev bridge',
'ip addr add ip/ffff:ffff:ffff:ffff:: dev bridge', # 'ip addr list bridge',
# 'ip -6 addr list bridge', # don't track non-functional commands 'ip addr add ip/ffff:ffff:ffff:ffff:: dev bridge',
], 'ip -6 addr list bridge',
],
self.fakeCallAndRead.external_command_list) self.fakeCallAndRead.external_command_list)
def test_construct_use_unique_local_address_block(self): def test_construct_use_unique_local_address_block(self):
...@@ -650,21 +645,22 @@ class TestComputer(SlapformatMixin): ...@@ -650,21 +645,22 @@ class TestComputer(SlapformatMixin):
} }
computer.format(use_unique_local_address_block=True, alter_user=False, create_tap=False) computer.format(use_unique_local_address_block=True, alter_user=False, create_tap=False)
self.assertEqualCommands([ self.assertEqual([
"makedirs('/instance_root', 493)", "makedirs('/instance_root', 493)",
"makedirs('/software_root', 493)", "makedirs('/software_root', 493)",
"chmod('/software_root', 493)", "chmod('/software_root', 493)",
"mkdir('/instance_root/partition', 488)", "mkdir('/instance_root/partition', 488)",
"chmod('/instance_root/partition', 488)" "chmod('/instance_root/partition', 488)"
], ],
self.test_result.bucket) self.test_result.bucket)
self.assertEqualCommands([ self.assertEqual([
# 'ip addr list myinterface', # don't track non-functional commands 'ip addr list myinterface',
'ip address add dev myinterface fd00::1/64', 'brctl show',
'ip addr add ip/255.255.255.255 dev myinterface', 'ip address add dev myinterface fd00::1/64',
'ip addr add ip/ffff:ffff:ffff:ffff:: dev myinterface', 'ip addr add ip/255.255.255.255 dev myinterface',
# 'ip -6 addr list myinterface' # don't track non-functional commands 'ip addr add ip/ffff:ffff:ffff:ffff:: dev myinterface',
], 'ip -6 addr list myinterface'
],
self.fakeCallAndRead.external_command_list) self.fakeCallAndRead.external_command_list)
...@@ -674,15 +670,29 @@ class TestComputerWithCGroup(SlapformatMixin): ...@@ -674,15 +670,29 @@ class TestComputerWithCGroup(SlapformatMixin):
super(TestComputerWithCGroup, self).setUp() super(TestComputerWithCGroup, self).setUp()
self.restoreOs() self.restoreOs()
if os.path.isdir("/tmp/slapgrid/"):
shutil.rmtree("/tmp/slapgrid/")
os.mkdir("/tmp/slapgrid/") os.mkdir("/tmp/slapgrid/")
if os.path.isdir(CGroupManagerMock.cpuset_path):
shutil.rmtree(CGroupManagerMock.cpuset_path)
os.mkdir(CGroupManagerMock.cpuset_path) os.mkdir(CGroupManagerMock.cpuset_path)
with open(os.path.join(CGroupManagerMock.cpuset_path, "cpuset.cpus"), "wt") as fo: file_write("0,1-3",
fo.write("0,1-3") os.path.join(CGroupManagerMock.cpuset_path, "cpuset.cpus"))
self.cpu_list = [0, 1, 2, 3] file_write("\n".join(("1000", "1001", "1002", "")),
with open(os.path.join(CGroupManagerMock.cpuset_path, "tasks"), "wt") as fo: os.path.join(CGroupManagerMock.cpuset_path, "tasks"))
fo.writelines(("1000\n", "1001\n", "1002\n")) self.cpu_list = [0, 1, 2, 3]
global USER_LIST, INTERFACE_DICT
USER_LIST = ['testuser']
INTERFACE_DICT['bridge'] = {
socket.AF_INET: [
{'addr': '127.0.0.1', 'broadcast': '127.0.255.255', 'netmask': '255.255.0.0'}],
socket.AF_INET6: [
{'addr': '2a01:e35:2e27::e59c', 'netmask': 'ffff:ffff:ffff:ffff::'}]
}
self.computer = slapos.format.Computer('computer', self.computer = slapos.format.Computer('computer',
software_user='testuser',
instance_root='/tmp/slapgrid/instance_root', instance_root='/tmp/slapgrid/instance_root',
software_root='/tmp/slapgrid/software_root', software_root='/tmp/slapgrid/software_root',
interface=slapos.format.Interface( interface=slapos.format.Interface(
...@@ -693,16 +703,21 @@ class TestComputerWithCGroup(SlapformatMixin): ...@@ -693,16 +703,21 @@ class TestComputerWithCGroup(SlapformatMixin):
], ],
manager_list=(CGroupManagerMock, ) manager_list=(CGroupManagerMock, )
) )
# self.patchOs(self.logger)
def tearDown(self): def tearDown(self):
shutil.rmtree(CGroupManagerMock.cpuset_path) """Cleanup temporary test folders."""
super(TestComputerWithCGroup, self).tearDown() super(TestComputerWithCGroup, self).tearDown()
shutil.rmtree("/tmp/slapgrid/")
if CGroupManagerMock.cpuset_path.startswith("/tmp"):
shutil.rmtree(CGroupManagerMock.cpuset_path)
def test_positive_cgroups(self): def test_positive_cgroups(self):
"""Positive test of cgroups.""" """Positive test of cgroups."""
self.computer.format(alter_network=False, alter_user=False)
# Test parsing "cpuset.cpus" file # Test parsing "cpuset.cpus" file
self.assertEqual(self.computer.manager_list[0]._cpu_list(), self.cpu_list) self.assertEqual(self.computer.manager_list[0]._cpu_list(), self.cpu_list)
# This should created per-cpu groups and move all tasks in CPU pool into cpu0
self.computer.format(alter_network=False, alter_user=False)
# Test files creation for exclusive CPUs # Test files creation for exclusive CPUs
for cpu_id in self.cpu_list: for cpu_id in self.cpu_list:
cpu_n_path = os.path.join(CGroupManagerMock.cpuset_path, "cpu" + str(cpu_id)) cpu_n_path = os.path.join(CGroupManagerMock.cpuset_path, "cpu" + str(cpu_id))
...@@ -720,7 +735,7 @@ class TestComputerWithCGroup(SlapformatMixin): ...@@ -720,7 +735,7 @@ class TestComputerWithCGroup(SlapformatMixin):
# test moving tasks from generic core to private core # test moving tasks from generic core to private core
# request PID 1001 to be moved to its private CPU # request PID 1001 to be moved to its private CPU
file_write("1001\n", file_write("1001\n",
os.path.join(self.computer.partition_list.path, os.path.join(self.computer.partition_list[0].path,
CGroupManagerMock.cpu_exclusive_file)) CGroupManagerMock.cpu_exclusive_file))
# let format do the moving # let format do the moving
self.computer.update() self.computer.update()
...@@ -733,7 +748,7 @@ class TestPartition(SlapformatMixin): ...@@ -733,7 +748,7 @@ class TestPartition(SlapformatMixin):
def test_createPath_no_alter_user(self): def test_createPath_no_alter_user(self):
self.partition.createPath(False) self.partition.createPath(False)
self.assertEqualCommands( self.assertEqual(
[ [
"mkdir('/part_path', 488)", "mkdir('/part_path', 488)",
"chmod('/part_path', 488)" "chmod('/part_path', 488)"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7