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

#2405 refactor application_uninstall_action to re-use existing code in uninstall_application

Browse Source
This commit is contained in:
Cristian-VM2
2024-03-28 12:14:05 +00:00
parent 8612842b74
commit f83d9cb1b0
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -849,7 +849,9 @@ class Node(SimComponent):
self._software_request_manager = RequestManager() self._software_request_manager = RequestManager()
rm.add_request("software_manager", RequestType(func=self._software_request_manager, validator=_node_is_on)) rm.add_request("software_manager", RequestType(func=self._software_request_manager, validator=_node_is_on))
self._application_manager = RequestManager() self._application_manager = RequestManager()
self._software_request_manager.add_request(name="application", request_type=RequestType(func=self._application_manager)) self._software_request_manager.add_request(
name="application", request_type=RequestType(func=self._application_manager)
)
self._application_manager.add_request( self._application_manager.add_request(
name="install", name="install",
@@ -1321,8 +1323,9 @@ class Node(SimComponent):
_LOGGER.warning( _LOGGER.warning(
f"Can't add application {application.__name__}" + f"to node {self.hostname}. It's already installed." f"Can't add application {application.__name__}" + f"to node {self.hostname}. It's already installed."
) )
self.software_manager.install(application) return True
self.software_manager.install(application)
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
self.sys_log.info(f"Installed application {application_instance.name}") self.sys_log.info(f"Installed application {application_instance.name}")
@@ -1360,14 +1363,11 @@ class Node(SimComponent):
f"Can't remove application {application.__name__}" + f"from node {self.hostname}. It's not installed." f"Can't remove application {application.__name__}" + f"from node {self.hostname}. It's not installed."
) )
return True return True
application_instance = self.software_manager.software.get( application_instance = self.software_manager.software.get(
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.uninstall_application(application_instance)
application_instance.parent = None
self.sys_log.info(f"Uninstalled application {application_instance.name}")
_LOGGER.info(f"Removed application {application_instance.name} from node {self.hostname}")
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: