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

2041: Remove NTPRequest class (review comment)

Browse Source
This commit is contained in:
Nick Todd
2023-12-13 10:34:52 +00:00
parent e620771c8d
commit f7b5c8ae2f
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/primaite/simulator/network/protocols/ntp.py
View File

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

6
src/primaite/simulator/system/services/ntp/ntp_client.py
View File

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

2
tests/integration_tests/system/test_ntp_client_server.py
View File

@@ -7,7 +7,7 @@ import pytest
from primaite.simulator.network.container import Network from primaite.simulator.network.container import Network
from primaite.simulator.network.hardware.nodes.computer import Computer from primaite.simulator.network.hardware.nodes.computer import Computer
from primaite.simulator.network.hardware.nodes.server import Server 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_client import NTPClient
from primaite.simulator.system.services.ntp.ntp_server import NTPServer from primaite.simulator.system.services.ntp.ntp_server import NTPServer
from primaite.simulator.system.services.service import ServiceOperatingState from primaite.simulator.system.services.service import ServiceOperatingState