diff --git a/src/primaite/simulator/network/protocols/ntp.py b/src/primaite/simulator/network/protocols/ntp.py index 89a26961..286c5664 100644 --- a/src/primaite/simulator/network/protocols/ntp.py +++ b/src/primaite/simulator/network/protocols/ntp.py @@ -1,10 +1,12 @@ from __future__ import annotations +from datetime import datetime from ipaddress import IPv4Address from typing import Optional + from pydantic import BaseModel + from primaite.simulator.network.protocols.packet import DataPacket -from datetime import datetime class NTPRequest(BaseModel): @@ -33,7 +35,7 @@ class NTPPacket(DataPacket): ntp_reply: Optional[NTPReply] = None def generate_reply(self, time: datetime) -> NTPPacket: - """ Generate a NTPPacket containing the time in a NTPReply object + """Generate a NTPPacket containing the time in a NTPReply object. :param time: datetime object representing the time from the NTP server. :return: A new NTPPacket object. diff --git a/src/primaite/simulator/system/services/ntp/ntp_server.py b/src/primaite/simulator/system/services/ntp/ntp_server.py index 50a582a4..d4be6924 100644 --- a/src/primaite/simulator/system/services/ntp/ntp_server.py +++ b/src/primaite/simulator/system/services/ntp/ntp_server.py @@ -1,4 +1,4 @@ -from ipaddress import IPv4Address +from datetime import datetime from typing import Any, Dict, Optional from primaite import getLogger @@ -6,13 +6,12 @@ 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 -from datetime import datetime _LOGGER = getLogger(__name__) class NTPServer(Service): - """Represents a NTP server as a service""" + """Represents a NTP server as a service.""" def __init__(self, **kwargs): kwargs["name"] = "NTPServer" @@ -46,10 +45,10 @@ class NTPServer(Service): pass def receive( - self, - payload: Any, - session_id: Optional[str] = None, - **kwargs, + self, + payload: Any, + session_id: Optional[str] = None, + **kwargs, ) -> bool: """Receives a request from NTPClient. @@ -60,15 +59,13 @@ class NTPServer(Service): :return: True if valid NTP request else False. """ - if not (isinstance(payload, NTPPacket) and - payload.ntp_request.ntp_client): + if not (isinstance(payload, NTPPacket) and payload.ntp_request.ntp_client): _LOGGER.debug(f"{payload} is not a NTPPacket") return False payload: NTPPacket = payload if payload.ntp_request.ntp_client: self.sys_log.info( - f"{self.name}: Received request for {payload.ntp_request.ntp_client} " - f"from session {session_id}" + f"{self.name}: Received request for {payload.ntp_request.ntp_client} " f"from session {session_id}" ) # generate a reply with the current time time = datetime.now()