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
21
Merge Requests
21
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
slapos.core
Commits
daaadb69
Commit
daaadb69
authored
Dec 14, 2018
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
standalone WIP
parent
1f7a3777
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
207 additions
and
13 deletions
+207
-13
slapos/slap/standalone.py
slapos/slap/standalone.py
+52
-13
slapos/tests/standalone.py
slapos/tests/standalone.py
+155
-0
No files found.
slapos/slap/standalone.py
View file @
daaadb69
...
...
@@ -30,11 +30,18 @@ import os
import
textwrap
import
xmlrpclib
import
hashlib
import
subprocess
import
logging
import
time
import
sys
import
socket
import
errno
from
contextlib
import
closing
try
:
import
subprocess32
as
subprocess
except
ImportError
:
import
subprocess
import
xml_marshaller
import
zope.interface
import
supervisor.xmlrpc
...
...
@@ -157,7 +164,7 @@ class StandaloneSlapOS(object):
self
.
_server_port
=
server_port
self
.
_master_url
=
"http://{server_ip}:{server_port}"
.
format
(
**
locals
())
self
.
_formatted
=
False
self
.
_formatted
=
False
# XXX useless
self
.
_base_directory
=
base_directory
...
...
@@ -243,6 +250,7 @@ class StandaloneSlapOS(object):
self
.
_ensureSlaposAvailable
()
def
_writeSlaposCommand
(
self
):
# XXX move to class ?
with
open
(
self
.
_slapos_bin
,
'w'
)
as
f
:
f
.
write
(
textwrap
.
dedent
(
'''
\
#!/bin/sh
...
...
@@ -257,7 +265,7 @@ class StandaloneSlapOS(object):
try
:
subprocess
.
check_call
(
[
'supervisord'
],
close_fds
=
True
,
#
close_fds=True,
cwd
=
self
.
_base_directory
,
)
except
:
...
...
@@ -271,7 +279,7 @@ class StandaloneSlapOS(object):
time
.
sleep
(
1
)
try
:
# Call a method to ensure connection to master can be established
self
.
getComputer
()
.
getComputerPartitionList
()
self
.
computer
.
getComputerPartitionList
()
except
ConnectionError
,
e
:
retry
+=
1
if
retry
>=
60
:
...
...
@@ -288,8 +296,6 @@ class StandaloneSlapOS(object):
partition_base_name
=
"slappart"
):
"""Create partitions
"""
computer
=
self
.
getComputer
()
for
path
in
(
self
.
_software_root
,
self
.
_instance_root
,
):
...
...
@@ -307,7 +313,7 @@ class StandaloneSlapOS(object):
os
.
mkdir
(
partition_path
)
os
.
chmod
(
partition_path
,
0o750
)
computer
.
updateConfiguration
(
self
.
computer
.
updateConfiguration
(
xml_marshaller
.
xml_marshaller
.
dumps
({
'address'
:
ipv4_address
,
'netmask'
:
'255.255.255.255'
,
...
...
@@ -324,17 +330,33 @@ class StandaloneSlapOS(object):
'software_root'
:
self
.
_software_root
}))
self
.
_formatted
=
True
def
getComputer
(
self
):
@
property
def
computer
(
self
):
if
self
.
_computer
is
None
:
self
.
_computer
=
self
.
_slap
.
registerComputer
(
self
.
_computer_id
)
return
self
.
_computer
def
supply
(
self
,
software_url
,
computer_guid
=
None
):
@
property
def
software_directory
(
self
):
return
self
.
_software_root
@
property
def
instance_directory
(
self
):
return
self
.
_instance_root
@
property
def
supervisor_rpc
(
self
):
# XXX is this exposed ?
return
self
.
_getSupervisorRPCServer
()
def
supply
(
self
,
software_url
,
computer_guid
=
None
,
state
=
"available"
):
if
computer_guid
not
in
(
None
,
self
.
_computer_id
):
raise
ValueError
(
"Can only supply on embedded computer"
)
self
.
_slap
.
registerSupply
().
supply
(
software_url
,
self
.
_computer_id
)
self
.
_computer_id
,
state
=
state
,
)
def
request
(
self
,
software_release
,
software_type
,
partition_reference
,
shared
=
False
,
partition_parameter_kw
=
None
,
filter_kw
=
None
):
...
...
@@ -350,6 +372,24 @@ class StandaloneSlapOS(object):
partition_parameter_kw
=
partition_parameter_kw
,
filter_kw
=
filter_kw
)
def
shutdown
(
self
):
"""Shutdown all services.
This methods blocks until services are stop or a timeout is reached.
TODO: deadline instead of timeout ?
"""
self
.
supervisor_rpc
.
supervisor
.
shutdown
()
# wait for supervisor to shutdown and free its port
for
i
in
range
(
10
):
with
closing
(
socket
.
socket
(
socket
.
AF_INET
,
socket
.
SOCK_STREAM
))
as
s
:
try
:
s
.
bind
((
self
.
_server_ip
,
self
.
_server_port
))
except
socket
.
error
as
e
:
if
e
.
errno
==
errno
.
EADDRINUSE
:
return
raise
time
.
sleep
(.
2
*
i
)
def
_runSlapOSCommand
(
self
,
command
,
max_retry
=
0
,
debug
=
False
,
error_lines
=
30
):
success
=
False
if
debug
:
...
...
@@ -357,10 +397,10 @@ class StandaloneSlapOS(object):
debug_args
=
prog
.
get
(
'debug_args'
,
''
)
return
subprocess
.
check_call
(
prog
[
'command'
].
format
(
**
locals
()),
close_fds
=
True
,
#
close_fds=True,
shell
=
True
)
server
=
self
.
_getSupervisorRPCServer
()
server
=
self
.
supervisor_rpc
retry
=
0
while
True
:
self
.
_logger
.
debug
(
"retry %s: starting %s"
,
retry
,
command
)
...
...
@@ -447,7 +487,6 @@ class StandaloneSlapOS(object):
transport
=
supervisor
.
xmlrpc
.
SupervisorTransport
(
None
,
None
,
# XXX hardcoded socket path
serverurl
=
"unix://{self._supervisor_socket}"
.
format
(
**
locals
())))
...
...
slapos/tests/standalone.py
0 → 100644
View file @
daaadb69
##############################################################################
#
# Copyright (c) 2018 Vifib SARL and Contributors. All Rights Reserved.
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsibility of assessing all potential
# consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial
# guarantees and support are strongly adviced to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 3
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
import
unittest
import
os
import
tempfile
import
textwrap
import
shutil
import
hashlib
import
socket
import
errno
from
contextlib
import
closing
import
psutil
from
slapos.slap.standalone
import
StandaloneSlapOS
from
slapos.slap.standalone
import
SlapOSNodeCommandError
SLAPOS_TEST_WORKING_DIR
=
os
.
environ
[
'SLAPOS_TEST_WORKING_DIR'
]
SLAPOS_TEST_IPV4
=
os
.
environ
[
'SLAPOS_TEST_IPV4'
]
SLAPOS_TEST_IPV6
=
os
.
environ
[
'SLAPOS_TEST_IPV6'
]
SLAPOS_TEST_PORT
=
int
(
os
.
environ
[
'SLAPOS_TEST_PORT'
])
def
checkPortIsFree
():
"""Sanity check that we did not leak a process listening on this port.
"""
with
closing
(
socket
.
socket
(
socket
.
AF_INET
,
socket
.
SOCK_STREAM
))
as
s
:
try
:
s
.
bind
((
SLAPOS_TEST_IPV4
,
SLAPOS_TEST_PORT
))
except
socket
.
error
as
e
:
if
e
.
errno
==
errno
.
EADDRINUSE
:
return
raise
class
TestSlapOSStandaloneSetup
(
unittest
.
TestCase
):
def
setUp
(
self
):
checkPortIsFree
()
def
test_format
(
self
):
working_dir
=
tempfile
.
mkdtemp
(
prefix
=
__name__
)
self
.
addCleanup
(
shutil
.
rmtree
,
working_dir
)
standalone
=
StandaloneSlapOS
(
working_dir
,
SLAPOS_TEST_IPV4
,
SLAPOS_TEST_PORT
)
self
.
addCleanup
(
standalone
.
shutdown
)
standalone
.
format
(
3
,
SLAPOS_TEST_IPV4
,
SLAPOS_TEST_IPV6
)
self
.
assertTrue
(
os
.
path
.
exists
(
standalone
.
software_directory
))
self
.
assertTrue
(
os
.
path
.
exists
(
standalone
.
instance_directory
))
self
.
assertTrue
(
os
.
path
.
exists
(
os
.
path
.
join
(
standalone
.
instance_directory
,
'slappart0'
)))
self
.
assertTrue
(
os
.
path
.
exists
(
os
.
path
.
join
(
standalone
.
instance_directory
,
'slappart1'
)))
self
.
assertTrue
(
os
.
path
.
exists
(
os
.
path
.
join
(
standalone
.
instance_directory
,
'slappart2'
)))
class
SlapOSStandaloneTestCase
(
unittest
.
TestCase
):
def
setUp
(
self
):
checkPortIsFree
()
working_dir
=
tempfile
.
mkdtemp
(
prefix
=
__name__
)
self
.
addCleanup
(
shutil
.
rmtree
,
working_dir
)
self
.
standalone
=
StandaloneSlapOS
(
working_dir
,
SLAPOS_TEST_IPV4
,
SLAPOS_TEST_PORT
)
self
.
addCleanup
(
self
.
standalone
.
shutdown
)
self
.
standalone
.
format
(
1
,
SLAPOS_TEST_IPV4
,
SLAPOS_TEST_IPV6
)
class
TestSlapOSStandaloneInstall
(
SlapOSStandaloneTestCase
):
def
test_install_software
(
self
):
with
tempfile
.
NamedTemporaryFile
(
suffix
=
"-%s.cfg"
%
self
.
id
())
as
f
:
f
.
write
(
textwrap
.
dedent
(
'''
[buildout]
parts = p
[p]
recipe = plone.recipe.command
command = touch ${buildout:directory}/instance.cfg
'''
))
f
.
flush
()
self
.
standalone
.
supply
(
f
.
name
)
self
.
standalone
.
installSoftware
()
software_hash
=
hashlib
.
md5
(
f
.
name
).
hexdigest
()
software_installation_path
=
os
.
path
.
join
(
self
.
standalone
.
software_directory
,
software_hash
)
self
.
assertTrue
(
os
.
path
.
exists
(
software_installation_path
))
self
.
assertTrue
(
os
.
path
.
exists
(
os
.
path
.
join
(
software_installation_path
,
'bin'
)))
self
.
assertTrue
(
os
.
path
.
exists
(
os
.
path
.
join
(
software_installation_path
,
'parts'
)))
self
.
assertTrue
(
os
.
path
.
exists
(
os
.
path
.
join
(
software_installation_path
,
'.completed'
)))
self
.
assertTrue
(
os
.
path
.
exists
(
os
.
path
.
join
(
software_installation_path
,
'instance.cfg'
)))
# destroy
self
.
standalone
.
supply
(
f
.
name
,
state
=
'destroyed'
)
self
.
standalone
.
installSoftware
()
self
.
assertFalse
(
os
.
path
.
exists
(
software_installation_path
))
def
test_install_software_failure
(
self
):
with
tempfile
.
NamedTemporaryFile
(
suffix
=
"-%s.cfg"
%
self
.
id
())
as
f
:
f
.
write
(
textwrap
.
dedent
(
'''
[buildout]
parts = p
[p]
recipe = plone.recipe.command
command = bash -c "exit 123"
stop-on-error = true
'''
))
f
.
flush
()
self
.
standalone
.
supply
(
f
.
name
)
with
self
.
assertRaises
(
SlapOSNodeCommandError
)
as
e
:
self
.
standalone
.
installSoftware
()
self
.
assertEqual
(
1
,
e
.
exception
[
0
][
'exitstatus'
])
self
.
assertIn
(
"Error: Non zero exit code (123) while running command."
,
e
.
exception
[
0
][
'output'
])
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