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

updates to session.clear to clear out all configuration data as well, updated session.shutdown to use clear, updated tests to account for this

Browse source
This commit is contained in:
bharnden 2019-10-24 13:05:02 -07:00
parent dc27fadb10
commit 5c12651e4e
5 changed files with 18 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
daemon/core/api/tlv/corehandlers.py
View file

@ -1092,10 +1092,14 @@ class CoreHandler(socketserver.BaseRequestHandler):
if message_type == ConfigFlags.RESET: if message_type == ConfigFlags.RESET:
node_id = config_data.node node_id = config_data.node
self.session.location.reset() if node_id is not None:
self.session.services.reset() self.session.mobility.config_reset(node_id)
self.session.mobility.config_reset(node_id) self.session.emane.config_reset(node_id)
self.session.emane.config_reset(node_id) else:
self.session.location.reset()
self.session.services.reset()
self.session.mobility.config_reset()
self.session.emane.config_reset()
else: else:
raise Exception(f"cant handle config all: {message_type}") raise Exception(f"cant handle config all: {message_type}")

1
daemon/core/emane/emanemanager.py
View file

@ -376,7 +376,6 @@ class EmaneManager(ModelManager):
with self._emane_node_lock: with self._emane_node_lock:
self._emane_nets.clear() self._emane_nets.clear()
# don't clear self._ifccounts here; NEM counts are needed for buildxml
self.platformport = self.session.options.get_config_int( self.platformport = self.session.options.get_config_int(
"emane_platform_port", 8100 "emane_platform_port", 8100
) )

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

@ -876,10 +876,15 @@ class Session:
:return: nothing :return: nothing
""" """
self.emane.shutdown()
self.delete_nodes() self.delete_nodes()
self.distributed.shutdown() self.distributed.shutdown()
self.del_hooks() self.del_hooks()
self.emane.reset() self.emane.reset()
self.emane.config_reset()
self.location.reset()
self.services.reset()
self.mobility.config_reset()
def start_events(self): def start_events(self):
""" """
@ -919,13 +924,11 @@ class Session:
self.set_state(EventTypes.DATACOLLECT_STATE, send_event=True) self.set_state(EventTypes.DATACOLLECT_STATE, send_event=True)
self.set_state(EventTypes.SHUTDOWN_STATE, send_event=True) self.set_state(EventTypes.SHUTDOWN_STATE, send_event=True)
# shutdown/cleanup feature helpers # clear out current core session
self.emane.shutdown() self.clear()
self.sdt.shutdown()
# remove and shutdown all nodes and tunnels # shutdown sdt
self.delete_nodes() self.sdt.shutdown()
self.distributed.shutdown()
# remove this sessions working directory # remove this sessions working directory
preserve = self.options.get_config("preservedir") == "1" preserve = self.options.get_config("preservedir") == "1"

9
daemon/tests/conftest.py
View file

@ -120,10 +120,6 @@ def session(global_session):
global_session.set_state(EventTypes.CONFIGURATION_STATE) global_session.set_state(EventTypes.CONFIGURATION_STATE)
yield global_session yield global_session
global_session.clear() global_session.clear()
global_session.location.reset()
global_session.services.reset()
global_session.mobility.config_reset()
global_session.emane.config_reset()
@pytest.fixture @pytest.fixture
@ -133,11 +129,6 @@ def coretlv(module_coretlv):
coreemu.sessions[session.id] = session coreemu.sessions[session.id] = session
yield module_coretlv yield module_coretlv
coreemu.shutdown() coreemu.shutdown()
session.clear()
session.location.reset()
session.services.reset()
session.mobility.config_reset()
session.emane.config_reset()
def pytest_addoption(parser): def pytest_addoption(parser):

7
daemon/tests/test_gui.py
View file

@ -645,14 +645,9 @@ class TestGui:
assert len(coretlv.session.nodes) == 1 assert len(coretlv.session.nodes) == 1
def test_config_all(self, coretlv): def test_config_all(self, coretlv):
node = coretlv.session.add_node()
message = coreapi.CoreConfMessage.create( message = coreapi.CoreConfMessage.create(
MessageFlags.ADD.value, MessageFlags.ADD.value,
[ [(ConfigTlvs.OBJECT, "all"), (ConfigTlvs.TYPE, ConfigFlags.RESET.value)],
(ConfigTlvs.OBJECT, "all"),
(ConfigTlvs.NODE, node.id),
(ConfigTlvs.TYPE, ConfigFlags.RESET.value),
],
) )
coretlv.session.location.refxyz = (10, 10, 10) coretlv.session.location.refxyz = (10, 10, 10)