Skip to content

[GCU] [MA] Adding support in existing tests - syslog #15239

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 - syslog #15239

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e309b4
[GCU] [MA] Adding support in existing tests - syslog
okaravasi Oct 29, 2024
51f21f6
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
26 changes: 15 additions & 11 deletions tests/generic_config_updater/test_syslog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,11 @@ def syslog_server_tc1_add_init(duthost):
[10.11.0.5]
[cc98:2008::1]
"""
json_namespace = '/localhost' if duthost.is_multi_asic else ''
json_patch = [
{
"op": "add",
"path": "/SYSLOG_SERVER",
"path": "{}/SYSLOG_SERVER".format(json_namespace),
"value": {
SYSLOG_DUMMY_IPV4_SERVER: {},
SYSLOG_DUMMY_IPV6_SERVER: {}
Expand Down Expand Up @@ -152,15 +153,16 @@ def syslog_server_tc1_add_duplicate(duthost):
[10.11.0.5]
[cc98:2008::1]
"""
json_namespace = '/localhost' if duthost.is_multi_asic else ''
json_patch = [
{
"op": "add",
"path": "/SYSLOG_SERVER/{}".format(SYSLOG_DUMMY_IPV4_SERVER),
"path": "{}/SYSLOG_SERVER/{}".format(json_namespace, SYSLOG_DUMMY_IPV4_SERVER),
"value": {}
},
{
"op": "add",
"path": "/SYSLOG_SERVER/{}".format(SYSLOG_DUMMY_IPV6_SERVER),
"path": "{}/SYSLOG_SERVER/{}".format(json_namespace, SYSLOG_DUMMY_IPV6_SERVER),
"value": {}
}
]
Expand Down Expand Up @@ -194,17 +196,17 @@ def syslog_server_tc1_xfail(duthost):
("remove", "10.11.0.6", "cc98:2008:1"),
("remove", "10.11.0.5", "cc98:2008::2")
]

json_namespace = '/localhost' if duthost.is_multi_asic else ''
for op, dummy_syslog_server_hostname, dummy_syslog_server_v6 in xfail_input:
json_patch = [
{
"op": "{}".format(op),
"path": "/SYSLOG_SERVER/{}".format(dummy_syslog_server_hostname),
"path": "{}/SYSLOG_SERVER/{}".format(json_namespace, dummy_syslog_server_hostname),
"value": {}
},
{
"op": "{}".format(op),
"path": "/SYSLOG_SERVER/{}".format(dummy_syslog_server_v6),
"path": "{}/SYSLOG_SERVER/{}".format(json_namespace, dummy_syslog_server_v6),
"value": {}
}
]
Expand All @@ -229,23 +231,24 @@ def syslog_server_tc1_replace(duthost):
[10.11.0.6]
[cc98:2008::2]
"""
json_namespace = '/localhost' if duthost.is_multi_asic else ''
json_patch = [
{
"op": "remove",
"path": "/SYSLOG_SERVER/{}".format(SYSLOG_DUMMY_IPV6_SERVER)
"path": "{}/SYSLOG_SERVER/{}".format(json_namespace, SYSLOG_DUMMY_IPV6_SERVER)
},
{
"op": "remove",
"path": "/SYSLOG_SERVER/{}".format(SYSLOG_DUMMY_IPV4_SERVER)
"path": "{}/SYSLOG_SERVER/{}".format(json_namespace, SYSLOG_DUMMY_IPV4_SERVER)
},
{
"op": "add",
"path": "/SYSLOG_SERVER/{}".format(REPLACE_SYSLOG_SERVER_v4),
"path": "{}/SYSLOG_SERVER/{}".format(json_namespace, REPLACE_SYSLOG_SERVER_v4),
"value": {}
},
{
"op": "add",
"path": "/SYSLOG_SERVER/{}".format(REPLACE_SYSLOG_SERVER_v6),
"path": "{}/SYSLOG_SERVER/{}".format(json_namespace, REPLACE_SYSLOG_SERVER_v6),
"value": {}
}
]
Expand Down Expand Up @@ -275,10 +278,11 @@ def syslog_server_tc1_remove(duthost):
Syslog Servers
----------------
"""
json_namespace = '/localhost' if duthost.is_multi_asic else ''
json_patch = [
{
"op": "remove",
"path": "/SYSLOG_SERVER"
"path": "{}/SYSLOG_SERVER".format(json_namespace)
}
]
json_patch = format_json_patch_for_multiasic(duthost=duthost, json_data=json_patch)
Expand Down