SIENTIAPDE-1314

Refactor IngestorManager and OpcManager for improved server management

- Introduced a new method `remove_server` in IngestorManager to encapsulate server removal logic, enhancing code clarity and reusability.
- Updated `update_opc_servers` to utilize the new `remove_server` method for better maintainability.
- Refactored security settings in OpcManager to use direct attribute assignments instead of method calls, streamlining the code.
- Adjusted unit tests to reflect changes in the IngestorManager and OpcManager, ensuring proper asynchronous behavior and mocking.

ingestor/managers/ingestor_manager.py

@@ -189,7 +189,17 @@ class IngestorManager(BaseActivity):
     def __del__(self):
         asyncio.run(self.shutdown())
 
-    async def update_opc_servers(self):  # NOSONAR
+    async def remove_server(self, server: str):
+        """
+        Removes an OPC server from the ingestor.
+        """
+        if server in self.opc_managers:
+            await self.opc_managers[server].shutdown()
+            del self.opc_managers[server]
+        for slot, _config in self.managed_tags.items():
+            self.managed_tags[slot].pop(server, None)
+
+    async def update_opc_servers(self):
         """
         Updates the OPC (OLE for Process Control) server connections managed by the ingestor.
         This method ensures that the OPC servers defined in `self.managed_tags` are properly
@@ -244,11 +254,7 @@ class IngestorManager(BaseActivity):
                         f'removing server from managed tags.'
                     )
 
-                    for slot, _value in current_managed_tags.items():
-                        if server in self.opc_managers:
-                            await self.opc_managers[server].shutdown()
-                            del self.opc_managers[server]
-                        self.managed_tags[slot].pop(server, None)
+                    await self.remove_server(server)
 
         servers = list(self.opc_managers.keys())
         for server in servers:
@@ -256,8 +262,7 @@ class IngestorManager(BaseActivity):
                 self.logger.warning(
                     f'Server {server} not found in managed tags. Desconnecting from server.'
                 )
-                await self.opc_managers[server].shutdown()
-                self.opc_managers.pop(server, None)
+                await self.remove_server(server)
 
         metrics.OPC_MANAGERS_ACTIVE.labels(pod_id=self.pod_id).set(len(self.opc_managers))
 
@@ -276,6 +281,7 @@ class IngestorManager(BaseActivity):
             - Removes lost servers from managed tags
             - Updates OPC manager metrics
         """
+        to_disconnect: list[str] = []
         for server, opc_manager in self.opc_managers.items():
             opc_manager.check_cycles()
 
@@ -284,11 +290,14 @@ class IngestorManager(BaseActivity):
                 self.logger.warning(f'OPC server {server} is lost. Server will be disconnected.')
 
                 for slot, _config in self.managed_tags.items():
-                    if server in self.opc_managers:
-                        await self.opc_managers[server].shutdown()
-                        del self.opc_managers[server]
+                    to_disconnect.append(server)
                     self.managed_tags[slot].pop(server, None)
 
+        for server in to_disconnect:
+            if server in self.opc_managers:
+                await self.opc_managers[server].shutdown()
+                del self.opc_managers[server]
+
         metrics.OPC_MANAGERS_ACTIVE.labels(pod_id=self.pod_id).set(len(self.opc_managers))
 
     def declare_active(self):