Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
adc2019-system
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
adc2019
adc2019-system
Commits
66c1b321
Commit
66c1b321
authored
Aug 14, 2019
by
Kento HASEGAWA
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make it possible to re-configure roles
parent
2fb0703d
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
8 deletions
+17
-8
adc2019system.py
adc2019system.py
+14
-8
solver.py
roles/solver.py
+3
-0
No files found.
adc2019system.py
View file @
66c1b321
...
@@ -26,6 +26,9 @@ def load_config(path):
...
@@ -26,6 +26,9 @@ def load_config(path):
def
set_role
(
role_name
,
config_data
):
def
set_role
(
role_name
,
config_data
):
global
role
global
role
if
role
is
not
None
:
del
role
if
role_name
==
'host'
:
if
role_name
==
'host'
:
role
=
Host
(
config_data
)
role
=
Host
(
config_data
)
elif
role_name
==
'solver'
:
elif
role_name
==
'solver'
:
...
@@ -34,14 +37,17 @@ def set_role(role_name, config_data):
...
@@ -34,14 +37,17 @@ def set_role(role_name, config_data):
def
call_api
(
method
,
cmd
,
params
):
def
call_api
(
method
,
cmd
,
params
):
print
(
f
'I: API Received: {cmd}'
)
print
(
f
'I: API Received: {cmd}'
)
if
role
is
not
None
:
return
role
.
call_api
(
method
,
cmd
,
params
)
else
:
if
cmd
==
'role'
:
if
cmd
==
'role'
:
if
method
==
'POST'
:
if
method
==
'POST'
:
set_role
(
params
[
'role'
],
params
)
set_role
(
params
[
'role'
],
params
)
return
{
'role'
:
role
.
type
}
return
{
'role'
:
role
.
type
}
else
:
else
:
if
role
is
None
:
return
{
'role'
:
'Undefined'
}
return
{
'role'
:
'Undefined'
}
else
:
return
{
'role'
:
self
.
type
}
else
:
if
role
is
not
None
:
return
role
.
call_api
(
method
,
cmd
,
params
)
else
:
else
:
return
None
return
None
roles/solver.py
View file @
66c1b321
...
@@ -17,6 +17,9 @@ class Solver(object):
...
@@ -17,6 +17,9 @@ class Solver(object):
self
.
solver
=
importlib
.
import_module
(
f
"solvers.{config['solver']}"
)
self
.
solver
=
importlib
.
import_module
(
f
"solvers.{config['solver']}"
)
self
.
thread
=
None
self
.
thread
=
None
def
__del__
(
self
):
self
.
stop_solver
()
def
__repr__
(
self
):
def
__repr__
(
self
):
return
"Solver"
return
"Solver"
...
...
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