Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Lisa Casino
slapos.core
Commits
b8105d89
Commit
b8105d89
authored
Jun 05, 2017
by
Tomáš Peterka
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into amarisoft
Conflicts: slapos/tests/slapformat.py
parents
9181210a
75650e2c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
162 additions
and
139 deletions
+162
-139
slapos/format.py
slapos/format.py
+35
-27
slapos/tests/slapformat.py
slapos/tests/slapformat.py
+127
-112
No files found.
slapos/format.py
View file @
b8105d89
...
...
@@ -246,6 +246,7 @@ class CGroupManager(object):
cpu_exclusive_file
=
".slapos-cpu-exclusive"
cpuset_path
=
"/sys/fs/cgroup/cpuset/"
task_write_mode
=
"wt"
def
__init__
(
self
,
computer
):
"""Extract necessary information from the ``computer``.
...
...
@@ -277,8 +278,8 @@ class CGroupManager(object):
Those folders are "/sys/fs/cgroup/cpuset/cpu<N>".
"""
for
cpu
in
self
.
_
list_cpus
():
cpu_path
=
self
.
_prepare_
cgroup_
folder
(
for
cpu
in
self
.
_
cpu_list
():
cpu_path
=
self
.
_prepare_folder
(
os
.
path
.
join
(
self
.
cpuset_path
,
"cpu"
+
str
(
cpu
)))
with
open
(
cpu_path
+
"/cpuset.cpus"
,
"wt"
)
as
fx
:
fx
.
write
(
str
(
cpu
))
# this cgroup manages only this cpu
...
...
@@ -299,7 +300,7 @@ class CGroupManager(object):
with
open
(
request_file
,
"rt"
)
as
fi
:
request_pid_set
.
update
(
map
(
int
,
fi
.
read
().
split
()))
cpu_list
=
self
.
_
list_cpus
()
cpu_list
=
self
.
_
cpu_list
()
generic_cpu
=
cpu_list
[
0
]
exclusive_cpu_list
=
cpu_list
[
1
:]
...
...
@@ -311,12 +312,12 @@ class CGroupManager(object):
running_pid_set
.
update
(
map
(
int
,
fi
.
read
().
split
()))
# gather already exclusively running PIDs
exlusive_pid_set
=
set
()
ex
c
lusive_pid_set
=
set
()
for
exclusive_cpu
in
exclusive_cpu_list
:
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
()))
ex
c
lusive_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
:
continue
# already exclusive
if
request
not
in
running_pid_set
:
...
...
@@ -325,17 +326,14 @@ class CGroupManager(object):
def
prepare_cpu_space
(
self
):
"""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
()))
first_cpu
=
self
.
_list_cpus
()[
0
]
task_path
=
os
.
path
.
join
(
self
.
cpuset_path
,
"cpu"
+
str
(
first_cpu
),
"tasks"
)
first_cpu
=
self
.
_cpu_list
()[
0
]
for
pid
in
running_set
:
with
open
(
task_path
,
"wt"
)
as
fo
:
fo
.
write
(
str
(
pid
))
self
.
_move_task
(
pid
,
first_cpu
)
time
.
sleep
(
0.01
)
def
_
list_cpus
(
self
):
def
_
cpu_list
(
self
):
"""Extract IDs of available CPUs and return them as a list.
The first one will be always used for all non-exclusive processes.
...
...
@@ -357,19 +355,23 @@ class CGroupManager(object):
: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
:
# 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
:
task_list
=
fi
.
read
().
split
()
if
len
(
task_list
)
>
0
:
continue
# skip occupied CPUs
with
open
(
task_path
,
"wt"
)
as
fo
:
fo
.
write
(
str
(
pid
))
return
exclusive_cpu
return
self
.
_move_task
(
pid
,
exclusive_cpu
)[
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
):
"""If-Create folder and set group write permission."""
if
not
os
.
path
.
exists
(
folder
):
...
...
@@ -421,7 +423,7 @@ class Computer(object):
self
.
slapos_version
=
None
# 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
()
def
__getinitargs__
(
self
):
...
...
@@ -1070,12 +1072,6 @@ class Tap(object):
else
:
raise
ValueError
(
"%s should not be empty. No ipv4 address assigned to %s"
%
(
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
):
...
...
@@ -1119,7 +1115,14 @@ class Tun(Tap):
else
:
raise
RuntimeError
(
"Cannot setup address on interface {}. "
"Address is missing."
.
format
(
self
.
name
))
# create routes
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
):
...
...
@@ -1188,8 +1191,13 @@ class Interface(object):
return
address_list
def
isBridge
(
self
):
_
,
result
=
callAndRead
([
'brctl'
,
'show'
])
return
any
(
line
.
startswith
(
self
.
name
)
for
line
in
result
.
split
(
"
\
n
"
))
try
:
_
,
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
):
"""Returns list of interfaces already present on bridge"""
...
...
slapos/tests/slapformat.py
View file @
b8105d89
...
...
@@ -26,16 +26,15 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
from
__future__
import
print_function
import
glob
import
logging
import
slapos.format
import
slapos.util
import
unittest
import
netaddr
import
shutil
import
socket
# for mocking
import
grp
import
netifaces
...
...
@@ -83,7 +82,7 @@ class FakeCallAndRead:
retval
=
0
,
'UP'
global
INTERFACE_DICT
if
'useradd'
in
argument_list
:
print
(
argument_list
)
print
argument_list
global
USER_LIST
username
=
argument_list
[
-
1
]
if
username
==
'-r'
:
...
...
@@ -113,6 +112,11 @@ class FakeCallAndRead:
retval
=
0
,
'OK'
elif
argument_list
[:
3
]
==
[
'route'
,
'add'
,
'-host'
]:
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
))
return
retval
...
...
@@ -148,11 +152,16 @@ class PwdMock:
def
getpwnam
(
self
,
name
):
global
USER_LIST
if
name
in
USER_LIST
:
class
r
esult
:
class
PwdR
esult
:
pw_uid
=
0
pw_gid
=
0
return
result
raise
KeyError
def
__getitem__
(
self
,
index
):
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
:
...
...
@@ -161,7 +170,8 @@ class NetifacesMock:
global
INTERFACE_DICT
if
name
in
INTERFACE_DICT
:
return
INTERFACE_DICT
[
name
]
raise
ValueError
raise
ValueError
(
"Interface
\
"
{}
\
"
not in INTERFACE_DICT {!s}"
.
format
(
name
,
INTERFACE_DICT
))
@
classmethod
def
interfaces
(
self
):
...
...
@@ -177,6 +187,7 @@ class SlaposUtilMock:
class
CGroupManagerMock
(
slapos
.
format
.
CGroupManager
):
cpuset_path
=
"/tmp/cpuset/"
task_write_mode
=
"at"
# append insted of write tasks PIDs for the tests
def
allowed
(
self
):
"""Always allowed."""
...
...
@@ -240,6 +251,8 @@ class SlapformatMixin(unittest.TestCase):
setattr
(
os
,
fake
,
f
)
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
():
setattr
(
os
,
name
,
original_value
)
del
self
.
saved_os
...
...
@@ -255,33 +268,6 @@ class SlapformatMixin(unittest.TestCase):
setattr
(
slapos
.
util
,
name
,
original_value
)
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
):
config
=
FakeConfig
()
config
.
dry_run
=
True
...
...
@@ -342,14 +328,14 @@ class TestComputer(SlapformatMixin):
logger
=
self
.
logger
,
name
=
'bridge'
,
ipv4_local_network
=
'127.0.0.1/16'
),
partition_list
=
[])
computer
.
format
()
self
.
assertEqual
Commands
([
self
.
assertEqual
([
"makedirs('/instance_root', 493)"
,
"makedirs('/software_root', 493)"
,
"chown('/software_root', 0, 0)"
,
"chmod('/software_root', 493)"
],
self
.
test_result
.
bucket
)
self
.
assertEqual
([
# 'ip addr list bridge', # don't track non-functional commands
'ip addr list bridge'
,
'groupadd slapsoft'
,
'useradd -d /software_root -g slapsoft slapsoft -r'
],
...
...
@@ -363,13 +349,15 @@ class TestComputer(SlapformatMixin):
logger
=
self
.
logger
,
name
=
'bridge'
,
ipv4_local_network
=
'127.0.0.1/16'
),
partition_list
=
[])
computer
.
format
(
alter_user
=
False
)
self
.
assertEqual
Commands
([
self
.
assertEqual
([
"makedirs('/instance_root', 493)"
,
"makedirs('/software_root', 493)"
,
"chmod('/software_root', 493)"
],
self
.
test_result
.
bucket
)
self
.
assertEqualCommands
(
[
'ip addr list bridge'
],
self
.
assertEqual
([
'ip addr list bridge'
,
'brctl show'
,
],
self
.
fakeCallAndRead
.
external_command_list
)
@
unittest
.
skip
(
"Not implemented"
)
...
...
@@ -380,14 +368,13 @@ class TestComputer(SlapformatMixin):
interface
=
slapos
.
format
.
Interface
(
logger
=
self
.
logger
,
name
=
'bridge'
,
ipv4_local_network
=
'127.0.0.1/16'
),
partition_list
=
[])
computer
.
format
(
alter_network
=
False
)
self
.
assertEqualCommands
([
self
.
assertEqual
([
"makedirs('/instance_root', 493)"
,
"makedirs('/software_root', 493)"
,
"chown('/software_root', 0, 0)"
,
"chmod('/software_root', 493)"
],
self
.
test_result
.
bucket
)
self
.
assertEqual
Commands
([
self
.
assertEqual
([
'ip addr list bridge'
,
'groupadd slapsoft'
,
'useradd -d /software_root -g slapsoft slapsoft -r'
...
...
@@ -402,12 +389,16 @@ class TestComputer(SlapformatMixin):
logger
=
self
.
logger
,
name
=
'bridge'
,
ipv4_local_network
=
'127.0.0.1/16'
),
partition_list
=
[])
computer
.
format
(
alter_network
=
False
,
alter_user
=
False
)
self
.
assertEqual
Commands
([
self
.
assertEqual
([
"makedirs('/instance_root', 493)"
,
"makedirs('/software_root', 493)"
,
"chmod('/software_root', 493)"
],
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"
)
def
test_construct_prepared
(
self
):
...
...
@@ -428,7 +419,7 @@ class TestComputer(SlapformatMixin):
}
computer
.
format
()
self
.
assertEqual
Commands
([
self
.
assertEqual
([
"makedirs('/instance_root', 493)"
,
"makedirs('/software_root', 493)"
,
"chown('/software_root', 0, 0)"
,
...
...
@@ -438,20 +429,21 @@ class TestComputer(SlapformatMixin):
"chmod('/instance_root/partition', 488)"
],
self
.
test_result
.
bucket
)
self
.
assertEqual
Commands
([
self
.
assertEqual
([
'ip addr list bridge'
,
'groupadd slapsoft'
,
'useradd -d /software_root -g slapsoft slapsoft -r'
,
'groupadd testuser'
,
'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'
,
# 'brctl show', # don't track non-functional commands
'brctl show'
,
'brctl addif bridge tap'
,
'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 list bridge', # don't track non-functional commands
'ip addr list bridge'
,
],
self
.
fakeCallAndRead
.
external_command_list
)
...
...
@@ -475,7 +467,7 @@ class TestComputer(SlapformatMixin):
}
computer
.
format
(
alter_user
=
False
)
self
.
assertEqual
Commands
([
self
.
assertEqual
([
"makedirs('/instance_root', 493)"
,
"makedirs('/software_root', 493)"
,
"chmod('/software_root', 493)"
,
...
...
@@ -483,17 +475,19 @@ class TestComputer(SlapformatMixin):
"chmod('/instance_root/partition', 488)"
],
self
.
test_result
.
bucket
)
self
.
assertEqualCommands
([
'ip addr list bridge'
,
'tunctl -t tap -u testuser'
,
'ip link set tap up'
,
# 'brctl show', # don't track non-functional commands
'brctl addif bridge tap'
,
'ip addr add ip/255.255.255.255 dev bridge'
,
# 'ip addr list bridge', # don't track non-functional commands
'ip addr add ip/ffff:ffff:ffff:ffff:: dev bridge'
,
# 'ip -6 addr list bridge', # don't track non-functional commands
],
self
.
assertEqual
([
'ip addr list bridge'
,
'brctl show'
,
'ip tuntap add dev tap mode tap user testuser'
,
'ip link set tap up'
,
'brctl show'
,
'brctl show'
,
'brctl addif bridge tap'
,
'ip addr add ip/255.255.255.255 dev bridge'
,
# 'ip addr list bridge',
'ip addr add ip/ffff:ffff:ffff:ffff:: dev bridge'
,
'ip -6 addr list bridge'
,
],
self
.
fakeCallAndRead
.
external_command_list
)
def
test_construct_prepared_tap_no_alter_user
(
self
):
...
...
@@ -505,12 +499,11 @@ class TestComputer(SlapformatMixin):
logger
=
self
.
logger
,
name
=
'iface'
,
ipv4_local_network
=
'127.0.0.1/16'
),
partition_list
=
[
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
USER_LIST
=
[
'testuser'
]
partition
.
tap
=
slapos
.
format
.
Tap
(
'tap'
)
computer
.
partition_list
=
[
partition
]
global
INTERFACE_DICT
INTERFACE_DICT
[
'iface'
]
=
{
socket
.
AF_INET
:
[{
'addr'
:
'192.168.242.77'
,
'broadcast'
:
'127.0.0.1'
,
...
...
@@ -523,7 +516,7 @@ class TestComputer(SlapformatMixin):
}
computer
.
format
(
alter_user
=
False
)
self
.
assertEqual
Commands
([
self
.
assertEqual
([
"makedirs('/instance_root', 493)"
,
"makedirs('/software_root', 493)"
,
"chmod('/software_root', 493)"
,
...
...
@@ -531,17 +524,19 @@ class TestComputer(SlapformatMixin):
"chmod('/instance_root/partition', 488)"
],
self
.
test_result
.
bucket
)
self
.
assertEqual
Commands
([
self
.
assertEqual
([
'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 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/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
)
partition
=
computer
.
partition_list
[
0
]
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_gateway
,
'10.8.0.1'
)
...
...
@@ -565,9 +560,8 @@ class TestComputer(SlapformatMixin):
'netmask'
:
'255.255.255.0'
}],
socket
.
AF_INET6
:
[{
'addr'
:
'2a01:e35:2e27::e59c'
,
'netmask'
:
'ffff:ffff:ffff:ffff::'
}]
}
computer
.
format
(
alter_network
=
False
)
self
.
assertEqual
Commands
([
self
.
assertEqual
([
"makedirs('/instance_root', 493)"
,
"makedirs('/software_root', 493)"
,
"chown('/software_root', 0, 0)"
,
...
...
@@ -577,8 +571,8 @@ class TestComputer(SlapformatMixin):
"chmod('/instance_root/partition', 488)"
],
self
.
test_result
.
bucket
)
self
.
assertEqual
Commands
([
# 'ip addr list bridge',
# don't track non-functional commands
self
.
assertEqual
([
# 'ip addr list bridge',
'groupadd slapsoft'
,
'useradd -d /software_root -g slapsoft slapsoft -r'
,
'groupadd testuser'
,
...
...
@@ -609,21 +603,22 @@ class TestComputer(SlapformatMixin):
}
computer
.
format
(
alter_network
=
False
,
alter_user
=
False
)
self
.
assertEqual
Commands
([
"makedirs('/instance_root', 493)"
,
"makedirs('/software_root', 493)"
,
"chmod('/software_root', 493)"
,
"mkdir('/instance_root/partition', 488)"
,
"chmod('/instance_root/partition', 488)"
],
self
.
assertEqual
([
"makedirs('/instance_root', 493)"
,
"makedirs('/software_root', 493)"
,
"chmod('/software_root', 493)"
,
"mkdir('/instance_root/partition', 488)"
,
"chmod('/instance_root/partition', 488)"
],
self
.
test_result
.
bucket
)
self
.
assertEqualCommands
([
# 'ip addr list bridge', # don't track non-functional commands
'ip addr add ip/255.255.255.255 dev bridge'
,
# 'ip addr list bridge', # don't track non-functional commands
'ip addr add ip/ffff:ffff:ffff:ffff:: dev bridge'
,
# 'ip -6 addr list bridge', # don't track non-functional commands
],
self
.
assertEqual
([
'ip addr list bridge'
,
'brctl show'
,
'ip addr add ip/255.255.255.255 dev bridge'
,
# 'ip addr list bridge',
'ip addr add ip/ffff:ffff:ffff:ffff:: dev bridge'
,
'ip -6 addr list bridge'
,
],
self
.
fakeCallAndRead
.
external_command_list
)
def
test_construct_use_unique_local_address_block
(
self
):
...
...
@@ -650,21 +645,22 @@ class TestComputer(SlapformatMixin):
}
computer
.
format
(
use_unique_local_address_block
=
True
,
alter_user
=
False
,
create_tap
=
False
)
self
.
assertEqual
Commands
([
"makedirs('/instance_root', 493)"
,
"makedirs('/software_root', 493)"
,
"chmod('/software_root', 493)"
,
"mkdir('/instance_root/partition', 488)"
,
"chmod('/instance_root/partition', 488)"
],
self
.
assertEqual
([
"makedirs('/instance_root', 493)"
,
"makedirs('/software_root', 493)"
,
"chmod('/software_root', 493)"
,
"mkdir('/instance_root/partition', 488)"
,
"chmod('/instance_root/partition', 488)"
],
self
.
test_result
.
bucket
)
self
.
assertEqualCommands
([
# 'ip addr list myinterface', # don't track non-functional commands
'ip address add dev myinterface fd00::1/64'
,
'ip addr add ip/255.255.255.255 dev myinterface'
,
'ip addr add ip/ffff:ffff:ffff:ffff:: dev myinterface'
,
# 'ip -6 addr list myinterface' # don't track non-functional commands
],
self
.
assertEqual
([
'ip addr list myinterface'
,
'brctl show'
,
'ip address add dev myinterface fd00::1/64'
,
'ip addr add ip/255.255.255.255 dev myinterface'
,
'ip addr add ip/ffff:ffff:ffff:ffff:: dev myinterface'
,
'ip -6 addr list myinterface'
],
self
.
fakeCallAndRead
.
external_command_list
)
...
...
@@ -674,15 +670,29 @@ class TestComputerWithCGroup(SlapformatMixin):
super
(
TestComputerWithCGroup
,
self
).
setUp
()
self
.
restoreOs
()
if
os
.
path
.
isdir
(
"/tmp/slapgrid/"
):
shutil
.
rmtree
(
"/tmp/slapgrid/"
)
os
.
mkdir
(
"/tmp/slapgrid/"
)
if
os
.
path
.
isdir
(
CGroupManagerMock
.
cpuset_path
):
shutil
.
rmtree
(
CGroupManagerMock
.
cpuset_path
)
os
.
mkdir
(
CGroupManagerMock
.
cpuset_path
)
with
open
(
os
.
path
.
join
(
CGroupManagerMock
.
cpuset_path
,
"cpuset.cpus"
),
"wt"
)
as
fo
:
fo
.
write
(
"0,1-3"
)
self
.
cpu_list
=
[
0
,
1
,
2
,
3
]
with
open
(
os
.
path
.
join
(
CGroupManagerMock
.
cpuset_path
,
"tasks"
),
"wt"
)
as
fo
:
fo
.
writelines
((
"1000
\
n
"
,
"1001
\
n
"
,
"1002
\
n
"
))
file_write
(
"0,1-3"
,
os
.
path
.
join
(
CGroupManagerMock
.
cpuset_path
,
"cpuset.cpus"
)
)
file_write
(
"
\
n
"
.
join
((
"1000"
,
"1001"
,
"1002"
,
""
)),
os
.
path
.
join
(
CGroupManagerMock
.
cpuset_path
,
"tasks"
))
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'
,
software_user
=
'testuser'
,
instance_root
=
'/tmp/slapgrid/instance_root'
,
software_root
=
'/tmp/slapgrid/software_root'
,
interface
=
slapos
.
format
.
Interface
(
...
...
@@ -693,16 +703,21 @@ class TestComputerWithCGroup(SlapformatMixin):
],
manager_list
=
(
CGroupManagerMock
,
)
)
# self.patchOs(self.logger)
def
tearDown
(
self
):
shutil
.
rmtree
(
CGroupManagerMock
.
cpuset_path
)
"""Cleanup temporary test folders."""
super
(
TestComputerWithCGroup
,
self
).
tearDown
()
shutil
.
rmtree
(
"/tmp/slapgrid/"
)
if
CGroupManagerMock
.
cpuset_path
.
startswith
(
"/tmp"
):
shutil
.
rmtree
(
CGroupManagerMock
.
cpuset_path
)
def
test_positive_cgroups
(
self
):
"""Positive test of cgroups."""
self
.
computer
.
format
(
alter_network
=
False
,
alter_user
=
False
)
# Test parsing "cpuset.cpus" file
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
for
cpu_id
in
self
.
cpu_list
:
cpu_n_path
=
os
.
path
.
join
(
CGroupManagerMock
.
cpuset_path
,
"cpu"
+
str
(
cpu_id
))
...
...
@@ -720,7 +735,7 @@ class TestComputerWithCGroup(SlapformatMixin):
# test moving tasks from generic core to private core
# request PID 1001 to be moved to its private CPU
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
))
# let format do the moving
self
.
computer
.
update
()
...
...
@@ -733,7 +748,7 @@ class TestPartition(SlapformatMixin):
def
test_createPath_no_alter_user
(
self
):
self
.
partition
.
createPath
(
False
)
self
.
assertEqual
Commands
(
self
.
assertEqual
(
[
"mkdir('/part_path', 488)"
,
"chmod('/part_path', 488)"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment