Skip to content

Set NTP service name based on type #18627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wangxin merged 1 commit into from
May 28, 2025
Merged

Set NTP service name based on type #18627

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions tests/common/helpers/ntp_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,21 @@ def setup_ntp_context(ptfhost, duthost, ptf_use_ipv6):
"""setup ntp client and server"""
ntp_daemon_type = get_ntp_daemon_in_use(ptfhost)
ntp_conf_path = None
ntp_service_name = None
if ntp_daemon_type == NtpDaemon.NTPSEC:
ntp_conf_path = '/etc/ntpsec/ntp.conf'
ntp_service_name = 'ntpsec'
elif ntp_daemon_type == NtpDaemon.CHRONY:
ntp_conf_path = '/etc/chrony/chrony.conf'
ntp_service_name = 'chrony'
elif ntp_daemon_type == NtpDaemon.NTP:
ntp_conf_path = '/etc/ntp.conf'
ntp_service_name = 'ntp'

ptfhost.lineinfile(path=ntp_conf_path, line="server 127.127.1.0 prefer")

# restart ntp server
ntp_en_res = ptfhost.service(name="ntp", state="restarted")
ntp_en_res = ptfhost.service(name=ntp_service_name, state="restarted")

pytest_assert(wait_until(120, 5, 0, check_ntp_status, ptfhost, ntp_daemon_type),
"NTP server was not started in PTF container {}; NTP service start result {}"
Expand Down Expand Up @@ -58,7 +62,7 @@ def setup_ntp_context(ptfhost, duthost, ptf_use_ipv6):
yield

# stop ntp server
ptfhost.service(name="ntp", state="stopped")
ptfhost.service(name=ntp_service_name, state="stopped")
# reset ntp client configuration
duthost.command("config ntp del %s" % (ptfhost.mgmt_ipv6 if ptf_use_ipv6 else ptfhost.mgmt_ip))
for ntp_server in ntp_servers:
Expand Down
Loading