afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

daemon: added convenience method to check if a session is running, which is used in multiple places, providing a cleaner and easier to read experience

Browse source
This commit is contained in:
Blake Harnden 2023-04-12 14:44:51 -07:00
parent cdc8c7360d
commit b6b300207b
3 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
daemon/core/emulator/session.py
View file

@ -520,8 +520,7 @@ class Session:
if isinstance(node, WlanNode):
self.mobility.set_model_config(node.id, BasicRangeModel.name)
# boot core nodes after runtime
is_runtime = self.state == EventTypes.RUNTIME_STATE
if is_runtime and isinstance(node, CoreNode):
if self.is_running() and isinstance(node, CoreNode):
self.add_remove_control_iface(node, remove=False)
self.boot_node(node)
self.sdt.add_node(node)
@ -1011,7 +1010,7 @@ class Session:
:return: list of service boot errors during startup
"""
if self.state == EventTypes.RUNTIME_STATE:
if self.is_running():
logger.warning("ignoring instantiate, already in runtime state")
return []
# create control net interfaces and network tunnels
@ -1365,7 +1364,7 @@ class Session:
Return the current time we have been in the runtime state, or zero
if not in runtime.
"""
if self.state == EventTypes.RUNTIME_STATE:
if self.is_running():
return time.monotonic() - self.state_time
else:
return 0.0
@ -1442,3 +1441,11 @@ class Session:
color = LINK_COLORS[index]
self.link_colors[network_id] = color
return color
def is_running(self) -> bool:
"""
Convenience for checking if this session is in the runtime state.
:return: True if in the runtime state, False otherwise
"""
return self.state == EventTypes.RUNTIME_STATE