Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
EOLE
Zéphir
Services
Server Manager
Commits
f8243cc1
Commit
f8243cc1
authored
Jan 28, 2019
by
Matthieu Lamalle
Browse files
Migration to Gitlab
parent
cf261202
Changes
4
Hide whitespace changes
Inline
Side-by-side
scripts/controller
View file @
f8243cc1
...
...
@@ -73,6 +73,18 @@ class ServerRunner(ZephirCommonController):
else
:
return
b
'{}'
@
register_wamp
(
'v1.server.config.get'
,
notification_uri
=
None
,
database
=
True
)
async
def
get_config
(
self
,
cursor
,
serverid
):
return
{
'configuration'
:
serverid
}
@
register_http
(
'v1.server.config.get'
,
param
=
'configuration'
,
database
=
True
)
async
def
get_config_file
(
self
,
cursor
,
secret
):
values
=
self
.
server
.
fetch_configuration
(
cursor
,
secret
)
if
values
:
return
json
.
dumps
(
values
).
encode
()
else
:
return
b
'{}'
@
register_wamp
(
'v1.server.create'
,
notification_uri
=
'v1.server.created'
,
database
=
True
)
async
def
create_server
(
self
,
cursor
,
servername
,
serverdescription
,
servermodelid
,
serverpassphrase
):
try
:
...
...
src/python/server/server/error.py
View file @
f8243cc1
...
...
@@ -41,3 +41,5 @@ class ServerErrorUnknownServerId(ServerError):
class
ServerErrorUnknownServerModelId
(
ServerError
):
"""Unknown servermodel ID
"""
src/python/server/server/query.py
View file @
f8243cc1
...
...
@@ -26,7 +26,6 @@ FETCH_SERVER_AUTOMATION = '''
WHERE serverid = %s
'''
"""
Creates a server based on its name and servermodel
"""
...
...
test/unit/10_servermanager/test_server_controller.py
View file @
f8243cc1
import
json
from
zephir.config
import
ServiceConfig
from
server.server
import
Server
from
zephir.database
import
connect
...
...
@@ -61,3 +63,14 @@ def test_get_automation_command():
rserver
=
server
.
create_server
(
cursor
,
"my_beautiful_server"
,
"server's description"
,
servermodelid
)
server
.
register_server_for_automation
(
cursor
,
rserver
[
'serverid'
],
"salt"
)
assert
server
.
get_automation_command
(
cursor
,
rserver
[
'serverid'
])
==
(
"salt"
,
"cmd.run"
)
def
test_get_config
():
global
server
,
cursor
,
servermodelid
rserver
=
server
.
create_server
(
cursor
,
"my_beautiful_server"
,
"server's description"
,
servermodelid
)
result
=
None
assert
server
.
fetch_configuration
(
cursor
,
rserver
[
'serverid'
])
==
result
configuration
=
'{"creole.general.numero_etab": "000007",
\
"creole.interface_0.adresse_ip_eth0": "192.168.0.24",
\
"creole.interface_0.interface_gw": "ens4"}'
server
.
update_configuration
(
cursor
,
rserver
[
'serverid'
],
configuration
)
assert
server
.
fetch_configuration
(
cursor
,
rserver
[
'serverid'
])
==
json
.
loads
(
configuration
)
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