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
Labels
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Rafael Monnerat
slapos.core
Commits
233394db
Commit
233394db
authored
Aug 16, 2023
by
Xavier Thompson
Browse files
Options
Browse Files
Download
Plain Diff
Improve bits of testing framework and standalone
See merge request
!560
parents
93ccc013
be20c700
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
65 additions
and
62 deletions
+65
-62
slapos/slap/standalone.py
slapos/slap/standalone.py
+1
-31
slapos/testing/testcase.py
slapos/testing/testcase.py
+42
-2
slapos/tests/test_standalone.py
slapos/tests/test_standalone.py
+22
-29
No files found.
slapos/slap/standalone.py
View file @
233394db
...
@@ -328,7 +328,7 @@ class SlapformatDefinitionWriter(ConfigWriter):
...
@@ -328,7 +328,7 @@ class SlapformatDefinitionWriter(ConfigWriter):
textwrap
.
dedent
(
textwrap
.
dedent
(
"""
"""
[partition_{i}]
[partition_{i}]
address = {ipv
6_single_cidr} {ipv4
_cidr}
address = {ipv
4_cidr} {ipv6_single
_cidr}
{ipv6_range_config_line}
{ipv6_range_config_line}
pathname = {partition_base_name}{i}
pathname = {partition_base_name}{i}
user = {user}
user = {user}
...
@@ -654,7 +654,6 @@ class StandaloneSlapOS(object):
...
@@ -654,7 +654,6 @@ class StandaloneSlapOS(object):
unknown_partition_set
.
add
(
path
)
unknown_partition_set
.
add
(
path
)
# create partitions and configure computer
# create partitions and configure computer
partition_list
=
[]
for
i
in
range
(
partition_count
):
for
i
in
range
(
partition_count
):
partition_reference
=
'%s%s'
%
(
partition_base_name
,
i
)
partition_reference
=
'%s%s'
%
(
partition_base_name
,
i
)
...
@@ -663,25 +662,6 @@ class StandaloneSlapOS(object):
...
@@ -663,25 +662,6 @@ class StandaloneSlapOS(object):
if
not
(
os
.
path
.
exists
(
partition_path
)):
if
not
(
os
.
path
.
exists
(
partition_path
)):
os
.
mkdir
(
partition_path
)
os
.
mkdir
(
partition_path
)
os
.
chmod
(
partition_path
,
0o750
)
os
.
chmod
(
partition_path
,
0o750
)
ipv6_addr
,
ipv6_range
=
self
.
_getPartitionIpv6
(
i
)
partition_list
.
append
({
'address_list'
:
[
{
'addr'
:
ipv4_address
,
'netmask'
:
NETMASK_IPV4_FULL
},
{
'addr'
:
ipv6_addr
,
'netmask'
:
NETMASK_IPV6_FULL
}
],
'ipv6_range'
:
ipv6_range
,
'path'
:
partition_path
,
'reference'
:
partition_reference
,
'tap'
:
{
'name'
:
partition_reference
},
})
if
unknown_partition_set
:
if
unknown_partition_set
:
# sanity check that we are not removing partitions in use
# sanity check that we are not removing partitions in use
...
@@ -699,16 +679,6 @@ class StandaloneSlapOS(object):
...
@@ -699,16 +679,6 @@ class StandaloneSlapOS(object):
"Cannot reformat to remove busy partition at {part_id}"
.
format
(
"Cannot reformat to remove busy partition at {part_id}"
.
format
(
**
locals
()))
**
locals
()))
self
.
computer
.
updateConfiguration
(
dumps
({
'address'
:
ipv4_address
,
'netmask'
:
NETMASK_IPV4_FULL
,
'partition_list'
:
partition_list
,
'reference'
:
self
.
_computer_id
,
'instance_root'
:
self
.
_instance_root
,
'software_root'
:
self
.
_software_root
}))
for
part
in
unknown_partition_set
:
for
part
in
unknown_partition_set
:
self
.
_logger
.
debug
(
self
.
_logger
.
debug
(
"removing partition no longer part of format spec %s"
,
part
)
"removing partition no longer part of format spec %s"
,
part
)
...
...
slapos/testing/testcase.py
View file @
233394db
...
@@ -32,21 +32,27 @@ import glob
...
@@ -32,21 +32,27 @@ import glob
import
logging
import
logging
import
os
import
os
import
shutil
import
shutil
import
sqlite3
import
unittest
import
unittest
import
warnings
import
warnings
from
six.moves.urllib.parse
import
urlparse
from
six.moves.urllib.parse
import
urlparse
from
netaddr
import
valid_ipv6
from
.utils
import
getPortFromPath
from
.utils
import
getPortFromPath
from
.utils
import
ManagedResource
from
.utils
import
ManagedResource
from
..slap.standalone
import
StandaloneSlapOS
from
..slap.standalone
import
StandaloneSlapOS
from
..slap.standalone
import
SlapOSNodeCommandError
from
..slap.standalone
import
SlapOSNodeCommandError
from
..slap.standalone
import
PathTooDeepError
from
..slap.standalone
import
PathTooDeepError
from
..util
import
mkdir_p
from
..util
import
mkdir_p
from
..slap
import
ComputerPartition
from
..slap
import
ComputerPartition
from
.check_software
import
checkSoftware
from
.check_software
import
checkSoftware
from
..proxy.db_version
import
DB_VERSION
try
:
try
:
from
typing
import
Iterable
,
Tuple
,
Callable
,
Type
,
Dict
,
List
,
Optional
,
TypeVar
from
typing
import
Iterable
,
Tuple
,
Callable
,
Type
,
Dict
,
List
,
Optional
,
TypeVar
ManagedResourceType
=
TypeVar
(
"ManagedResourceType"
,
bound
=
ManagedResource
)
ManagedResourceType
=
TypeVar
(
"ManagedResourceType"
,
bound
=
ManagedResource
)
...
@@ -385,8 +391,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
...
@@ -385,8 +391,7 @@ class SlapOSInstanceTestCase(unittest.TestCase):
max_retry
=
cls
.
instance_max_retry
,
debug
=
cls
.
_debug
)
max_retry
=
cls
.
instance_max_retry
,
debug
=
cls
.
_debug
)
@
classmethod
@
classmethod
def
_setUpClass
(
cls
):
def
formatPartitions
(
cls
):
cls
.
slap
.
start
()
cls
.
logger
.
debug
(
cls
.
logger
.
debug
(
"Formatting to remove old partitions XXX should not be needed because we delete ..."
"Formatting to remove old partitions XXX should not be needed because we delete ..."
)
)
...
@@ -396,12 +401,20 @@ class SlapOSInstanceTestCase(unittest.TestCase):
...
@@ -396,12 +401,20 @@ class SlapOSInstanceTestCase(unittest.TestCase):
cls
.
partition_count
,
cls
.
_ipv4_address
,
cls
.
_ipv6_address
,
cls
.
partition_count
,
cls
.
_ipv4_address
,
cls
.
_ipv6_address
,
getattr
(
cls
,
'__partition_reference__'
,
'{}-'
.
format
(
cls
.
__name__
)))
getattr
(
cls
,
'__partition_reference__'
,
'{}-'
.
format
(
cls
.
__name__
)))
@
classmethod
def
_setUpClass
(
cls
):
cls
.
slap
.
start
()
# (re)format partitions
cls
.
formatPartitions
()
# request
# request
cls
.
requestDefaultInstance
()
cls
.
requestDefaultInstance
()
# slapos node instance
# slapos node instance
cls
.
logger
.
debug
(
"Waiting for instance"
)
cls
.
logger
.
debug
(
"Waiting for instance"
)
cls
.
waitForInstance
()
cls
.
waitForInstance
()
# expose some class attributes so that tests can use them:
# expose some class attributes so that tests can use them:
# the main ComputerPartition instance, to use getInstanceParameterDict
# the main ComputerPartition instance, to use getInstanceParameterDict
cls
.
computer_partition
=
cls
.
requestDefaultInstance
()
cls
.
computer_partition
=
cls
.
requestDefaultInstance
()
...
@@ -410,6 +423,10 @@ class SlapOSInstanceTestCase(unittest.TestCase):
...
@@ -410,6 +423,10 @@ class SlapOSInstanceTestCase(unittest.TestCase):
cls
.
computer_partition_root_path
=
os
.
path
.
join
(
cls
.
computer_partition_root_path
=
os
.
path
.
join
(
cls
.
slap
.
_instance_root
,
cls
.
computer_partition
.
getId
())
cls
.
slap
.
_instance_root
,
cls
.
computer_partition
.
getId
())
# the ipv6 of the instance
cls
.
computer_partition_ipv6_address
=
cls
.
getPartitionIPv6
(
cls
.
computer_partition
.
getId
())
@
classmethod
@
classmethod
@
contextlib
.
contextmanager
@
contextlib
.
contextmanager
def
_snapshotManager
(
cls
,
snapshot_name
):
def
_snapshotManager
(
cls
,
snapshot_name
):
...
@@ -643,3 +660,26 @@ class SlapOSInstanceTestCase(unittest.TestCase):
...
@@ -643,3 +660,26 @@ class SlapOSInstanceTestCase(unittest.TestCase):
partition_reference
=
cls
.
default_partition_reference
,
partition_reference
=
cls
.
default_partition_reference
,
partition_parameter_kw
=
cls
.
_instance_parameter_dict
,
partition_parameter_kw
=
cls
.
_instance_parameter_dict
,
state
=
state
)
state
=
state
)
@
classmethod
def
getPartitionId
(
cls
,
instance_name
):
query
=
"SELECT reference FROM partition%s WHERE partition_reference=?"
%
DB_VERSION
with
sqlite3
.
connect
(
os
.
path
.
join
(
cls
.
_base_directory
,
'var/proxy.db'
,
))
as
db
:
return
db
.
execute
(
query
,
(
instance_name
,)).
fetchall
()[
0
][
0
]
@
classmethod
def
getPartitionIPv6
(
cls
,
partition_id
):
query
=
"SELECT address FROM partition_network%s WHERE partition_reference=?"
%
DB_VERSION
with
sqlite3
.
connect
(
os
.
path
.
join
(
cls
.
_base_directory
,
'var/proxy.db'
,
))
as
db
:
rows
=
db
.
execute
(
query
,
(
partition_id
,)).
fetchall
()
# do not assume the partition's IPv6 address is the second one,
# instead find the first address that is IPv6
for
(
address
,)
in
rows
:
if
valid_ipv6
(
address
):
return
address
slapos/tests/test_standalone.py
View file @
233394db
...
@@ -136,14 +136,15 @@ class TestSlapOSStandaloneSetup(unittest.TestCase):
...
@@ -136,14 +136,15 @@ class TestSlapOSStandaloneSetup(unittest.TestCase):
for
i
,
resource
in
enumerate
(
resource_list
):
for
i
,
resource
in
enumerate
(
resource_list
):
resource_prefixlen
=
int
(
resource
[
'ipv6_range'
][
'network'
].
split
(
'/'
)[
1
])
resource_prefixlen
=
int
(
resource
[
'ipv6_range'
][
'network'
].
split
(
'/'
)[
1
])
self
.
assertEqual
(
resource_prefixlen
,
prefixlen
+
16
)
self
.
assertEqual
(
resource_prefixlen
,
prefixlen
+
16
)
self
.
assertTrue
(
netaddr
.
valid_ipv6
(
resource
[
'address_list'
][
0
][
'addr'
]))
partition_ipv6
=
resource
[
'address_list'
][
1
][
'addr'
]
self
.
assertTrue
(
netaddr
.
valid_ipv6
(
partition_ipv6
))
for
other_resource
in
resource_list
[
i
+
1
:]:
for
other_resource
in
resource_list
[
i
+
1
:]:
self
.
assertNotEqual
(
self
.
assertNotEqual
(
resource
[
'ipv6_range'
][
'addr'
],
resource
[
'ipv6_range'
][
'addr'
],
other_resource
[
'ipv6_range'
][
'addr'
])
other_resource
[
'ipv6_range'
][
'addr'
])
self
.
assertNotEqual
(
self
.
assertNotEqual
(
resource
[
'address_list'
][
0
][
'addr'
]
,
partition_ipv6
,
other_resource
[
'address_list'
][
0
][
'addr'
])
other_resource
[
'address_list'
][
1
][
'addr'
])
def
test_format_ipv6_small_range
(
self
):
def
test_format_ipv6_small_range
(
self
):
standalone
=
self
.
setupSimpleStandalone
()
standalone
=
self
.
setupSimpleStandalone
()
...
@@ -154,14 +155,12 @@ class TestSlapOSStandaloneSetup(unittest.TestCase):
...
@@ -154,14 +155,12 @@ class TestSlapOSStandaloneSetup(unittest.TestCase):
resource_list
=
self
.
getJsonResourceList
(
standalone
)
resource_list
=
self
.
getJsonResourceList
(
standalone
)
for
i
,
resource
in
enumerate
(
resource_list
):
for
i
,
resource
in
enumerate
(
resource_list
):
self
.
assertFalse
(
resource
[
'ipv6_range'
])
self
.
assertFalse
(
resource
[
'ipv6_range'
])
self
.
assertTrue
(
netaddr
.
valid_ipv6
(
resource
[
'address_list'
][
0
][
'addr'
]))
partition_ipv6
=
resource
[
'address_list'
][
1
][
'addr'
]
self
.
assertTrue
(
netaddr
.
valid_ipv6
(
partition_ipv6
))
for
other_resource
in
resource_list
[
i
+
1
:]:
for
other_resource
in
resource_list
[
i
+
1
:]:
self
.
assertNotEqual
(
other_partition_ipv6
=
other_resource
[
'address_list'
][
1
][
'addr'
]
resource
[
'address_list'
][
0
][
'addr'
],
self
.
assertNotEqual
(
partition_ipv6
,
other_partition_ipv6
)
other_resource
[
'address_list'
][
0
][
'addr'
])
self
.
assertNotEqual
(
partition_ipv6
,
addr0
)
self
.
assertNotEqual
(
resource
[
'address_list'
][
0
][
'addr'
],
addr0
)
def
test_format_ipv6_very_small_range
(
self
):
def
test_format_ipv6_very_small_range
(
self
):
standalone
=
self
.
setupSimpleStandalone
()
standalone
=
self
.
setupSimpleStandalone
()
...
@@ -172,21 +171,17 @@ class TestSlapOSStandaloneSetup(unittest.TestCase):
...
@@ -172,21 +171,17 @@ class TestSlapOSStandaloneSetup(unittest.TestCase):
resource_list
=
self
.
getJsonResourceList
(
standalone
)
resource_list
=
self
.
getJsonResourceList
(
standalone
)
for
i
,
resource
in
enumerate
(
resource_list
):
for
i
,
resource
in
enumerate
(
resource_list
):
self
.
assertFalse
(
resource
[
'ipv6_range'
])
self
.
assertFalse
(
resource
[
'ipv6_range'
])
self
.
assertTrue
(
netaddr
.
valid_ipv6
(
resource
[
'address_list'
][
0
][
'addr'
]))
partition_ipv6
=
resource
[
'address_list'
][
1
][
'addr'
]
self
.
assertTrue
(
netaddr
.
valid_ipv6
(
partition_ipv6
))
for
j
,
other_resource
in
enumerate
(
resource_list
[
i
+
1
:]):
for
j
,
other_resource
in
enumerate
(
resource_list
[
i
+
1
:]):
self
.
assertNotEqual
(
other_partition_ipv6
=
other_resource
[
'address_list'
][
1
][
'addr'
]
resource
[
'address_list'
][
0
][
'addr'
],
self
.
assertNotEqual
(
partition_ipv6
,
addr0
)
addr0
)
if
j
%
2
==
1
:
if
j
%
2
==
1
:
self
.
assertEqual
(
self
.
assertEqual
(
partition_ipv6
,
other_partition_ipv6
)
resource
[
'address_list'
][
0
][
'addr'
],
other_resource
[
'address_list'
][
0
][
'addr'
])
else
:
else
:
self
.
assertNotEqual
(
self
.
assertNotEqual
(
partition_ipv6
,
other_partition_ipv6
)
resource
[
'address_list'
][
0
][
'addr'
],
other_resource
[
'address_list'
][
0
][
'addr'
])
def
test_format_ipv6_sla
p
sh_128_range
(
self
):
def
test_format_ipv6_slash_128_range
(
self
):
standalone
=
self
.
setupSimpleStandalone
()
standalone
=
self
.
setupSimpleStandalone
()
prefixlen
=
128
prefixlen
=
128
slapos_fake_ipv6_range
=
'%s/%d'
%
(
SLAPOS_TEST_IPV6
,
prefixlen
)
slapos_fake_ipv6_range
=
'%s/%d'
%
(
SLAPOS_TEST_IPV6
,
prefixlen
)
...
@@ -194,10 +189,9 @@ class TestSlapOSStandaloneSetup(unittest.TestCase):
...
@@ -194,10 +189,9 @@ class TestSlapOSStandaloneSetup(unittest.TestCase):
resource_list
=
self
.
getJsonResourceList
(
standalone
)
resource_list
=
self
.
getJsonResourceList
(
standalone
)
for
i
,
resource
in
enumerate
(
resource_list
):
for
i
,
resource
in
enumerate
(
resource_list
):
self
.
assertFalse
(
resource
[
'ipv6_range'
])
self
.
assertFalse
(
resource
[
'ipv6_range'
])
self
.
assertTrue
(
netaddr
.
valid_ipv6
(
resource
[
'address_list'
][
0
][
'addr'
]))
partition_ipv6
=
resource
[
'address_list'
][
1
][
'addr'
]
self
.
assertEqual
(
self
.
assertTrue
(
netaddr
.
valid_ipv6
(
partition_ipv6
))
resource
[
'address_list'
][
0
][
'addr'
],
self
.
assertEqual
(
partition_ipv6
,
SLAPOS_TEST_IPV6
)
SLAPOS_TEST_IPV6
)
def
test_format_ipv6_no_range
(
self
):
def
test_format_ipv6_no_range
(
self
):
standalone
=
self
.
setupSimpleStandalone
()
standalone
=
self
.
setupSimpleStandalone
()
...
@@ -205,11 +199,10 @@ class TestSlapOSStandaloneSetup(unittest.TestCase):
...
@@ -205,11 +199,10 @@ class TestSlapOSStandaloneSetup(unittest.TestCase):
resource_list
=
self
.
getJsonResourceList
(
standalone
)
resource_list
=
self
.
getJsonResourceList
(
standalone
)
for
i
,
resource
in
enumerate
(
resource_list
):
for
i
,
resource
in
enumerate
(
resource_list
):
self
.
assertFalse
(
resource
[
'ipv6_range'
])
self
.
assertFalse
(
resource
[
'ipv6_range'
])
self
.
assertTrue
(
netaddr
.
valid_ipv6
(
resource
[
'address_list'
][
0
][
'addr'
]))
partition_ipv6
=
resource
[
'address_list'
][
1
][
'addr'
]
self
.
assertTrue
(
netaddr
.
valid_ipv6
(
partition_ipv6
))
for
other_resource
in
resource_list
[
i
+
1
:]:
for
other_resource
in
resource_list
[
i
+
1
:]:
self
.
assertEqual
(
self
.
assertEqual
(
partition_ipv6
,
SLAPOS_TEST_IPV6
)
resource
[
'address_list'
][
0
][
'addr'
],
SLAPOS_TEST_IPV6
)
def
test_reformat_less_partitions
(
self
):
def
test_reformat_less_partitions
(
self
):
standalone
=
self
.
setupSimpleStandalone
()
standalone
=
self
.
setupSimpleStandalone
()
...
...
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