2041: Remove NTPRequest class (review comment)

src/primaite/simulator/network/protocols/ntp.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from datetime import datetime
-from ipaddress import IPv4Address
 from typing import Optional
 
 from pydantic import BaseModel
@@ -9,12 +8,6 @@ from pydantic import BaseModel
 from primaite.simulator.network.protocols.packet import DataPacket
 
 
-class NTPRequest(BaseModel):
-    """Represents a NTP Request packet."""
-
-    ntp_client: Optional[IPv4Address] = None
-
-
 class NTPReply(BaseModel):
     """Represents a NTP Reply packet."""
 
@@ -30,8 +23,6 @@ class NTPPacket(DataPacket):
     :param ntp_reply: NTPReply packet from NTP Server.
     """
 
-    ntp_request: NTPRequest
-    "NTP Request packet sent by NTP Client."
     ntp_reply: Optional[NTPReply] = None
 
     def generate_reply(self, ntp_server_time: datetime) -> NTPPacket:

src/primaite/simulator/system/services/ntp/ntp_client.py

@@ -3,7 +3,7 @@ from ipaddress import IPv4Address
 from typing import Dict, Optional
 
 from primaite import getLogger
-from primaite.simulator.network.protocols.ntp import NTPPacket, NTPRequest
+from primaite.simulator.network.protocols.ntp import NTPPacket
 from primaite.simulator.network.transmission.network_layer import IPProtocol
 from primaite.simulator.network.transmission.transport_layer import Port
 from primaite.simulator.system.services.service import Service, ServiceOperatingState
@@ -108,8 +108,8 @@ class NTPClient(Service):
 
     def request_time(self) -> None:
         """Send request to ntp_server."""
-        ntp_request = NTPRequest()
-        ntp_server_packet = NTPPacket(ntp_request=ntp_request)
+        ntp_server_packet = NTPPacket()
+
         self.send(payload=ntp_server_packet, dest_ip_address=self.ntp_server)
 
     def apply_timestep(self, timestep: int) -> None:

tests/integration_tests/system/test_ntp_client_server.py

@@ -7,7 +7,7 @@ import pytest
 from primaite.simulator.network.container import Network
 from primaite.simulator.network.hardware.nodes.computer import Computer
 from primaite.simulator.network.hardware.nodes.server import Server
-from primaite.simulator.network.protocols.ntp import NTPPacket, NTPRequest
+from primaite.simulator.network.protocols.ntp import NTPPacket
 from primaite.simulator.system.services.ntp.ntp_client import NTPClient
 from primaite.simulator.system.services.ntp.ntp_server import NTPServer
 from primaite.simulator.system.services.service import ServiceOperatingState