From 56eda38a6ed4689b2ba03fc0e0b687c958309b6b Mon Sep 17 00:00:00 2001 From: "Czar.Echavez" Date: Tue, 10 Oct 2023 09:52:40 +0100 Subject: [PATCH] #1947: git merge did not change add_action -> add_request --- docs/source/action_system.rst | 12 ++++++------ docs/source/simulation_structure.rst | 2 +- src/primaite/simulator/system/services/service.py | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/source/action_system.rst b/docs/source/action_system.rst index 11b74abf..f6d237ba 100644 --- a/docs/source/action_system.rst +++ b/docs/source/action_system.rst @@ -50,9 +50,9 @@ A simple example without chaining can be seen in the :py:class:`primaite.simulat ... def _init_request_manager(self): ... - request_manager.add_action("scan", Action(func=lambda request, context: self.scan())) - request_manager.add_action("repair", Action(func=lambda request, context: self.repair())) - request_manager.add_action("restore", Action(func=lambda request, context: self.restore())) + request_manager.add_request("scan", Action(func=lambda request, context: self.scan())) + request_manager.add_request("repair", Action(func=lambda request, context: self.repair())) + request_manager.add_request("restore", Action(func=lambda request, context: self.restore())) *ellipses (``...``) used to omit code impertinent to this explanation* @@ -70,7 +70,7 @@ An example of how this works is in the :py:class:`primaite.simulator.network.har def _init_request_manager(self): ... # a regular action which is processed by the Node itself - request_manager.add_action("turn_on", Action(func=lambda request, context: self.turn_on())) + request_manager.add_request("turn_on", Action(func=lambda request, context: self.turn_on())) # if the Node receives a request where the first word is 'service', it will use a dummy manager # called self._service_request_manager to pass on the reqeust to the relevant service. This dummy @@ -78,11 +78,11 @@ An example of how this works is in the :py:class:`primaite.simulator.network.har # done because the next string after "service" is always the uuid of that service, so we need an # RequestManager to pop that string before sending it onto the relevant service's RequestManager. self._service_request_manager = RequestManager() - request_manager.add_action("service", Action(func=self._service_request_manager)) + request_manager.add_request("service", Action(func=self._service_request_manager)) ... def install_service(self, service): self.services[service.uuid] = service ... # Here, the service UUID is registered to allow passing actions between the node and the service. - self._service_request_manager.add_action(service.uuid, Action(func=service._request_manager)) + self._service_request_manager.add_request(service.uuid, Action(func=service._request_manager)) diff --git a/docs/source/simulation_structure.rst b/docs/source/simulation_structure.rst index 20d2d2d3..2f0a56e8 100644 --- a/docs/source/simulation_structure.rst +++ b/docs/source/simulation_structure.rst @@ -51,7 +51,7 @@ snippet demonstrates usage of the ``ActionPermissionValidator``. def _init_request_manager(self) -> RequestManager: am = super()._init_request_manager() - am.add_action( + am.add_request( "reset_factory_settings", Action( func = lambda request, context: self.reset_factory_settings(), diff --git a/src/primaite/simulator/system/services/service.py b/src/primaite/simulator/system/services/service.py index 1befe33e..597c8cbd 100644 --- a/src/primaite/simulator/system/services/service.py +++ b/src/primaite/simulator/system/services/service.py @@ -45,7 +45,7 @@ class Service(IOSoftware): def _init_request_manager(self) -> RequestManager: am = super()._init_request_manager() - am.add_action("scan", RequestType(func=lambda request, context: self.scan())) + am.add_request("scan", RequestType(func=lambda request, context: self.scan())) am.add_request("stop", RequestType(func=lambda request, context: self.stop())) am.add_request("start", RequestType(func=lambda request, context: self.start())) am.add_request("pause", RequestType(func=lambda request, context: self.pause()))