Skip to content

[pytest/ntp] Use local time when testbed is behind proxy #1640

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
lguohan merged 1 commit into from
May 12, 2020
Merged

[pytest/ntp] Use local time when testbed is behind proxy #1640

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
6 changes: 4 additions & 2 deletions tests/ntp/test_ntp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@
]

@pytest.fixture(scope="module")
def setup_ntp(ptfhost, duthost):
def setup_ntp(ptfhost, duthost, creds):
"""setup ntp client and server"""
if creds.get('proxy_env'):
# If testbed is behaind proxy then force ntpd inside ptf use local time
ptfhost.lineinfile(path="/etc/ntp.conf", line="server 127.127.1.0 prefer")

# enable ntp server
ptfhost.service(name="ntp", state="started")
Expand All @@ -31,7 +34,6 @@ def setup_ntp(ptfhost, duthost):

# stop ntp server
ptfhost.service(name="ntp", state="stopped")

# reset ntp client configuration
duthost.command("sudo config ntp del %s" % ptfip)
for ntp_server in ntp_servers:
Expand Down