Skip to content

[GCU] [MA] Adding support in existing tests - ntp #15238

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

Closed
okaravasi wants to merge 2 commits into from
Closed

[GCU] [MA] Adding support in existing tests - ntp #15238

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e7741a6
[GCU] [MA] Adding support in existing tests - ntp
okaravasi Oct 29, 2024
26caf77
Merge remote-tracking branch 'origin/master' into master-gcu_t2_suppo…
okaravasi Nov 29, 2024
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
20 changes: 12 additions & 8 deletions tests/generic_config_updater/test_ntp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,11 @@ def check_ntp_activestate(duthost):
def ntp_server_tc1_add_config(duthost):
""" Test to add NTP_SERVER config
"""
json_namespace = '/localhost' if duthost.is_multi_asic else ''
json_patch = [
{
"op": "add",
"path": "/NTP_SERVER",
"path": "{}/NTP_SERVER".format(json_namespace),
"value": {
NTP_SERVER_INIT: {
"resolve_as": NTP_SERVER_INIT,
Expand All @@ -121,7 +122,7 @@ def ntp_server_tc1_add_config(duthost):
json_patch_bc = [
{
"op": "add",
"path": "/NTP_SERVER",
"path": "{}/NTP_SERVER".format(json_namespace),
"value": {
NTP_SERVER_INIT: {}
}
Expand Down Expand Up @@ -164,11 +165,12 @@ def ntp_server_tc1_xfail(duthost):
# ("add", "10.0.0.256"), # Add invalid server
("remove", NTP_SERVER_DUMMY), # Remove unexisted ntp server
]
json_namespace = '/localhost' if duthost.is_multi_asic else ''
for op, ntp_server in xfail_input:
json_patch = [
{
"op": op,
"path": "/NTP_SERVER/{}".format(ntp_server),
"path": "{}/NTP_SERVER/{}".format(json_namespace, ntp_server),
"value": {}
}
]
Expand All @@ -188,14 +190,15 @@ def ntp_server_tc1_xfail(duthost):
def ntp_server_tc1_replace(duthost):
""" Test to replace ntp server
"""
json_namespace = '/localhost' if duthost.is_multi_asic else ''
json_patch = [
{
"op": "remove",
"path": "/NTP_SERVER/{}".format(NTP_SERVER_INIT)
"path": "{}/NTP_SERVER/{}".format(json_namespace, NTP_SERVER_INIT)
},
{
"op": "add",
"path": "/NTP_SERVER/{}".format(NTP_SERVER_DUMMY),
"path": "{}/NTP_SERVER/{}".format(json_namespace, NTP_SERVER_DUMMY),
"value": {
"resolve_as": NTP_SERVER_DUMMY,
"association_type": "server",
Expand All @@ -208,11 +211,11 @@ def ntp_server_tc1_replace(duthost):
json_patch_bc = [
{
"op": "remove",
"path": "/NTP_SERVER/{}".format(NTP_SERVER_INIT)
"path": "{}/NTP_SERVER/{}".format(json_namespace, NTP_SERVER_INIT)
},
{
"op": "add",
"path": "/NTP_SERVER/{}".format(NTP_SERVER_DUMMY),
"path": "{}/NTP_SERVER/{}".format(json_namespace, NTP_SERVER_DUMMY),
"value": {}
}
]
Expand Down Expand Up @@ -245,10 +248,11 @@ def ntp_server_tc1_replace(duthost):
def ntp_server_tc1_remove(duthost):
""" Test to remove ntp server
"""
json_namespace = '/localhost' if duthost.is_multi_asic else ''
json_patch = [
{
"op": "remove",
"path": "/NTP_SERVER"
"path": "{}/NTP_SERVER".format(json_namespace)
}
]
json_patch = format_json_patch_for_multiasic(duthost=duthost, json_data=json_patch)
Expand Down