Apply PR suggestions

src/primaite/config/_package_data/example_config.yaml

@@ -14,7 +14,7 @@ io_settings:
   save_checkpoints: true
   checkpoint_interval: 5
   save_step_metadata: false
-  save_pcap_logs: true
+  save_pcap_logs: false
   save_sys_logs: true
 
 

src/primaite/config/_package_data/example_config_2_rl_agents.yaml

@@ -16,7 +16,7 @@ io_settings:
   save_checkpoints: true
   checkpoint_interval: 5
   save_step_metadata: false
-  save_pcap_logs: true
+  save_pcap_logs: false
   save_sys_logs: true
 
 

src/primaite/game/game.py

@@ -133,7 +133,7 @@ class PrimaiteGame:
         self.update_agents(sim_state)
 
         # Apply all actions to simulation as requests
-        agent_actions = self.apply_agent_actions()  # noqa
+        self.apply_agent_actions()
 
         # Advance timestep
         self.advance_timestep()
@@ -144,7 +144,7 @@ class PrimaiteGame:
 
     def update_agents(self, state: Dict) -> None:
         """Update agents' observations and rewards based on the current state."""
-        for name, agent in self.agents.items():
+        for _, agent in self.agents.items():
             agent.update_observation(state)
             agent.update_reward(state)
             agent.reward_function.total_reward += agent.reward_function.current_reward
@@ -158,7 +158,7 @@ class PrimaiteGame:
 
         """
         agent_actions = {}
-        for name, agent in self.agents.items():
+        for _, agent in self.agents.items():
             obs = agent.observation_manager.current_observation
             rew = agent.reward_function.current_reward
             action_choice, options = agent.get_action(obs, rew)
@@ -414,7 +414,9 @@ class PrimaiteGame:
                     agent_settings=agent_settings,
                 )
             else:
-                _LOGGER.warning(f"agent type {agent_type} not found")
+                msg(f"Configuration error: {agent_type} is not a valid agent type.")
+                _LOGGER.error(msg)
+                raise ValueError(msg)
             game.agents[agent_cfg["ref"]] = new_agent
 
         return game

src/primaite/simulator/network/hardware/nodes/network/router.py

@@ -1076,7 +1076,6 @@ class Router(NetworkNode):
         :param episode: The episode number for which the router is being reset.
         """
         self.software_manager.arp.clear()
-        # self.acl.reset_component_for_episode(episode)
         for i, _ in self.network_interface.items():
             self.enable_port(i)
 

src/primaite/simulator/system/services/web_server/web_server.py

@@ -118,7 +118,7 @@ class WebServer(Service):
                     self.set_health_state(SoftwareHealthState.COMPROMISED)
 
             return response
-        except Exception:  # TODO: refactor this. Likely to cause silent bugs.
+        except Exception:  # TODO: refactor this. Likely to cause silent bugs. (ADO ticket #2345 )
             # something went wrong on the server
             response.status_code = HttpStatusCode.INTERNAL_SERVER_ERROR
             return response

tests/e2e_integration_tests/environments/test_sb3_environment.py

@@ -11,7 +11,6 @@ from primaite.game.game import PrimaiteGame
 from primaite.session.environment import PrimaiteGymEnv
 
 
-# @pytest.mark.skip(reason="no way of currently testing this")
 def test_sb3_compatibility():
     """Test that the Gymnasium environment can be used with an SB3 agent."""
     with open(example_config_path(), "r") as f: