#2682 Backport changes to core PrimAITE

src/primaite/simulator/network/hardware/base.py

@@ -11,6 +11,7 @@ from typing import Any, Dict, Optional, Type, TypeVar, Union
 from prettytable import MARKDOWN, PrettyTable
 from pydantic import BaseModel, Field
 
+import primaite.simulator.network.nmne
 from primaite import getLogger
 from primaite.exceptions import NetworkError
 from primaite.interface.request import RequestResponse
@@ -1049,7 +1050,7 @@ class Node(SimComponent):
 
     def show_nic(self, markdown: bool = False):
         """Prints a table of the NICs on the Node."""
-        table = PrettyTable(["Port", "Type", "MAC Address", "Address", "Speed", "Status"])
+        table = PrettyTable(["Port", "Type", "MAC Address", "Address", "Speed", "Status", "NMNE"])
         if markdown:
             table.set_style(MARKDOWN)
         table.align = "l"
@@ -1066,6 +1067,7 @@ class Node(SimComponent):
                     ip_address,
                     network_interface.speed,
                     "Enabled" if network_interface.enabled else "Disabled",
+                    network_interface.nmne if primaite.simulator.network.nmne.CAPTURE_NMNE else "Disabled",
                 ]
             )
         print(table)

src/primaite/simulator/network/networks.py

@@ -185,7 +185,10 @@ def arcd_uc2_network() -> Network:
     db_client_2.run()
     web_browser_2 = client_2.software_manager.software.get("WebBrowser")
     web_browser_2.target_url = "http://arcd.com/users/"
-    network.connect(endpoint_b=client_2.network_interface[1], endpoint_a=switch_2.network_interface[2])
+    network.connect(
+        endpoint_b=client_2.network_interface[1],
+        endpoint_a=switch_2.network_interface[2],
+    )
 
     # Domain Controller
     domain_controller = Server(

src/primaite/simulator/network/transmission/network_layer.py

@@ -25,6 +25,10 @@ class IPProtocol(Enum):
     ICMP = "icmp"
     """Internet Control Message Protocol."""
 
+    def model_dump(self) -> str:
+        """Return as JSON-serialisable string."""
+        return self.name
+
 
 class Precedence(Enum):
     """

src/primaite/simulator/network/transmission/transport_layer.py

@@ -72,6 +72,10 @@ class Port(Enum):
     POSTGRES_SERVER = 5432
     "Postgres SQL Server."
 
+    def model_dump(self) -> str:
+        """Return a json-serialisable string."""
+        return self.name
+
 
 class UDPHeader(BaseModel):
     """