oxbrbtx/PrimAITE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

#2405 simplify implementation

Browse Source
This commit is contained in:
Cristian-VM2
2024-03-28 11:02:26 +00:00
parent cddb39e8e9
commit d5b5c7d47a
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/primaite/simulator/network/hardware/base.py
View File

@@ -1325,23 +1325,17 @@ class Node(SimComponent):
application_instance = self.software_manager.software.get(str(application.__name__)) application_instance = self.software_manager.software.get(str(application.__name__))
self.applications[application_instance.uuid] = application_instance self.applications[application_instance.uuid] = application_instance
application.parent = self self.sys_log.info(f"Installed application {application_instance.name}")
self.sys_log.info(f"Installed application {application.__name__}") _LOGGER.debug(f"Added application {application_instance.name} to node {self.hostname}")
_LOGGER.debug(f"Added application {application.__name__} to node {self.hostname}")
self._application_request_manager.add_request( self._application_request_manager.add_request(
application_instance.name, RequestType(func=application_instance._request_manager) application_instance.name, RequestType(func=application_instance._request_manager)
) )
# Configure application if additional parameters are given # Configure application if additional parameters are given
if ip_address: if ip_address:
from primaite.simulator.system.applications.red_applications.data_manipulation_bot import ( if application_instance.name == "DoSBot":
DataManipulationBot,
)
from primaite.simulator.system.applications.red_applications.dos_bot import DoSBot
if application == DoSBot:
application_instance.configure(target_ip_address=IPv4Address(ip_address)) application_instance.configure(target_ip_address=IPv4Address(ip_address))
elif application == DataManipulationBot: elif application_instance.name == "DataManipulationBot":
application_instance.configure(server_ip_address=IPv4Address(ip_address)) application_instance.configure(server_ip_address=IPv4Address(ip_address))
else: else:
pass pass
@@ -1370,11 +1364,12 @@ class Node(SimComponent):
str(application.__name__) str(application.__name__)
) # This works because we can't have two applications with the same name on the same node ) # This works because we can't have two applications with the same name on the same node
self.applications.pop(application_instance.uuid) self.applications.pop(application_instance.uuid)
application.parent = None application_instance.parent = None
self.sys_log.info(f"Uninstalled application {application.__name__}") self.sys_log.info(f"Uninstalled application {application_instance.name}")
_LOGGER.info(f"Removed application {application.__name__} from node {self.hostname}") _LOGGER.info(f"Removed application {application_instance.name} from node {self.hostname}")
self._application_request_manager.remove_request(application_instance.name) self._application_request_manager.remove_request(application_instance.name)
self.software_manager.uninstall(application_instance.name) self.software_manager.uninstall(application_instance.name)
if application_instance.name not in self.software_manager.software: if application_instance.name not in self.software_manager.software:
return True return True
else: else: