Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ycai
simbricks
Commits
6dea32cb
Unverified
Commit
6dea32cb
authored
Jan 14, 2025
by
Marvin Meiers
Browse files
symphony/orchestration: move app wait flag to base class Application
parent
2451c80b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
5 deletions
+2
-5
symphony/orchestration/simbricks/orchestration/simulation/base.py
.../orchestration/simbricks/orchestration/simulation/base.py
+1
-4
symphony/orchestration/simbricks/orchestration/system/host/app.py
.../orchestration/simbricks/orchestration/system/host/app.py
+1
-1
No files found.
symphony/orchestration/simbricks/orchestration/simulation/base.py
View file @
6dea32cb
...
@@ -91,10 +91,7 @@ class Simulator(utils_base.IdObj, abc.ABC):
...
@@ -91,10 +91,7 @@ class Simulator(utils_base.IdObj, abc.ABC):
host_comps
=
self
.
filter_components_by_type
(
ty
=
sys_conf
.
Host
)
host_comps
=
self
.
filter_components_by_type
(
ty
=
sys_conf
.
Host
)
for
host
in
host_comps
:
for
host
in
host_comps
:
for
app
in
host
.
applications
:
for
app
in
host
.
applications
:
if
not
isinstance
(
app
,
sys_conf
.
BaseLinuxApplication
):
if
app
.
wait
:
continue
lin_app
:
sys_conf
.
BaseLinuxApplication
=
app
if
lin_app
.
wait
:
return
True
return
True
return
False
return
False
...
...
symphony/orchestration/simbricks/orchestration/system/host/app.py
View file @
6dea32cb
...
@@ -37,6 +37,7 @@ class Application(utils_base.IdObj):
...
@@ -37,6 +37,7 @@ class Application(utils_base.IdObj):
def
__init__
(
self
,
h
:
sys_host
.
Host
)
->
None
:
def
__init__
(
self
,
h
:
sys_host
.
Host
)
->
None
:
super
().
__init__
()
super
().
__init__
()
self
.
host
:
sys_host
.
Host
=
h
self
.
host
:
sys_host
.
Host
=
h
self
.
wait
:
bool
=
False
self
.
parameters
:
dict
[
tp
.
Any
,
tp
.
Any
]
=
{}
self
.
parameters
:
dict
[
tp
.
Any
,
tp
.
Any
]
=
{}
def
toJSON
(
self
)
->
dict
:
def
toJSON
(
self
)
->
dict
:
...
@@ -65,7 +66,6 @@ class BaseLinuxApplication(Application):
...
@@ -65,7 +66,6 @@ class BaseLinuxApplication(Application):
super
().
__init__
(
h
)
super
().
__init__
(
h
)
self
.
start_delay
:
float
|
None
=
None
self
.
start_delay
:
float
|
None
=
None
self
.
end_delay
:
float
|
None
=
None
self
.
end_delay
:
float
|
None
=
None
self
.
wait
:
bool
=
False
@
abc
.
abstractmethod
@
abc
.
abstractmethod
def
run_cmds
(
self
,
inst
:
inst_base
.
Instantiation
)
->
list
[
str
]:
def
run_cmds
(
self
,
inst
:
inst_base
.
Instantiation
)
->
list
[
str
]:
...
...
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