Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305 #241

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
mssonicbld merged 5 commits into from
Jan 31, 2024
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305 #241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2a9391a
[submodule] Update submodule sonic-utilities to the latest HEAD autom…
mssonicbld Jan 30, 2024
06c27e5
[dualtor] Disable zebra link-detect for vlan interfaces (#17784)
lolyu Jan 18, 2024
c5086a0
[TACACS] Fix when set TACACS to "tacacs+, local" user can run blocked…
liuh-80 Jan 26, 2024
77d2b28
[202305] Upgrade xgs SAI version to 8.4.41.0 (#17937)
Gfrom2016 Jan 31, 2024
bf65747
Merge branch '202305' of https://github.com/sonic-net/sonic-buildimag…
mssonicbld Jan 31, 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
8 changes: 8 additions & 0 deletions dockers/docker-fpm-frr/frr/zebra/zebra.interfaces.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,13 @@ interface {{ pc }}
link-detect
!
{% endfor %}
{% if (DEVICE_METADATA is defined) and ('localhost' in DEVICE_METADATA) and ('subtype' in DEVICE_METADATA['localhost']) and (DEVICE_METADATA['localhost']['subtype'].lower() == 'dualtor') %}
! Disable link-detect on VLAN interfaces for dualtor
{% for (name, prefix) in VLAN_INTERFACE|pfx_filter|unique(attribute=0) %}
interface {{ name }}
no link-detect
!
{% endfor %}
{% endif %}
{% endblock interfaces %}
!
2 changes: 1 addition & 1 deletion platform/broadcom/sai.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LIBSAIBCM_XGS_VERSION = 8.4.39.2
LIBSAIBCM_XGS_VERSION = 8.4.41.0
LIBSAIBCM_DNX_VERSION = 9.2.12.1
LIBSAIBCM_XGS_BRANCH_NAME = SAI_8.4.0_GA
LIBSAIBCM_DNX_BRANCH_NAME = SAI_9.2.0.3
Expand Down
49 changes: 49 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py2/zebra_frr_dualtor.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
!
! =========== Managed by sonic-cfggen DO NOT edit manually! ====================
! generated by templates/zebra/zebra.conf.j2 using config DB data
! file: zebra.conf
!
!
! Force disable next hop group support
no zebra nexthop kernel enable
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
no fpm use-next-hop-groups
!
fpm address 127.0.0.1
!
! template: common/daemons.common.conf.j2
!
hostname switch-t0
password zebra
enable password zebra
!
log syslog informational
log facility local4
!
! end of template: common/daemons.common.conf.j2!
!
!
! Enable nht through default route
ip nht resolve-via-default
ipv6 nht resolve-via-default
! Enable link-detect (default disabled)
interface PortChannel03
link-detect
!
interface PortChannel02
link-detect
!
interface PortChannel01
link-detect
!
interface PortChannel04
link-detect
!
! Disable link-detect on VLAN interfaces for dualtor
interface Vlan2000
no link-detect
!
interface Vlan1000
no link-detect
!
!!
49 changes: 49 additions & 0 deletions src/sonic-config-engine/tests/sample_output/py3/zebra_frr_dualtor.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
!
! =========== Managed by sonic-cfggen DO NOT edit manually! ====================
! generated by templates/zebra/zebra.conf.j2 using config DB data
! file: zebra.conf
!
!
! Force disable next hop group support
no zebra nexthop kernel enable
! Uses the old known FPM behavior of including next hop information in the route (e.g. RTM_NEWROUTE) messages
no fpm use-next-hop-groups
!
fpm address 127.0.0.1
!
! template: common/daemons.common.conf.j2
!
hostname switch-t0
password zebra
enable password zebra
!
log syslog informational
log facility local4
!
! end of template: common/daemons.common.conf.j2!
!
!
! Enable nht through default route
ip nht resolve-via-default
ipv6 nht resolve-via-default
! Enable link-detect (default disabled)
interface PortChannel01
link-detect
!
interface PortChannel02
link-detect
!
interface PortChannel03
link-detect
!
interface PortChannel04
link-detect
!
! Disable link-detect on VLAN interfaces for dualtor
interface Vlan1000
no link-detect
!
interface Vlan2000
no link-detect
!
!!
4 changes: 4 additions & 0 deletions src/sonic-config-engine/tests/test_frr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,3 +74,7 @@ def test_zebra_frr(self):
def test_bgpd_frr_dualtor(self):
extra_data = {"DEVICE_METADATA": {"localhost": {"subtype": "DualToR"}}}
self.assertTrue(*self.run_case('bgpd/bgpd.conf.j2', 'bgpd_frr_dualtor.conf', extra_data=extra_data))

def test_zebra_frr_dualtor(self):
extra_data = {"DEVICE_METADATA": {"localhost": {"subtype": "DualToR"}}}
self.assertTrue(*self.run_case('zebra/zebra.conf.j2', 'zebra_frr_dualtor.conf', extra_data=extra_data))
3 changes: 2 additions & 1 deletion src/tacacs/bash_tacplus/bash_tacplus.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,8 +471,9 @@ int on_shell_execve (char *user, int shell_level, char *cmd, char **argv)
fprintf(stdout, "%s not authorized by TACACS+ with given arguments, not executing\n", cmd);
break;
default:
// when command reject by server, authorization will failed immediately
fprintf(stdout, "%s authorize failed by TACACS+ with given arguments, not executing\n", cmd);
break;
return ret;
}

if ((tacacs_ctrl & AUTHORIZATION_FLAG_LOCAL) == 0) {
Expand Down