Skip to content
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

Fork Sync: Update from parent repository #4

Closed
wants to merge 8 commits into from
Closed

Fork Sync: Update from parent repository #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
87493db
Revert "Ipmitool bookworm: Fix and patch enterprise-numbers URL (#178…
mssonicbld Nov 19, 2024
38f6fb5
[submodule] Update sonic-sairedis to include SAI v1.14.1 (#20843)
kcudnik Nov 19, 2024
a9d2d0e
[Marvell] Update Prestera SAI deb version (#20770)
nipunjoy Nov 19, 2024
c111c86
Update submodule sonic-ztp (#20674)
bingwang-ms Nov 19, 2024
79c066c
[innovium]: Correcting the debian URL path for sonic202405 (#20769)
Keshavg-marvell Nov 19, 2024
15eb445
[Chassis] [BGP templates] Enhancement for not to send given route to …
abdosi Nov 14, 2024
0a244c1
[submodule] Update submodule sonic-platform-daemons to the latest HEA…
mssonicbld Nov 19, 2024
50ddef8
[submodule] Update submodule sonic-swss to the latest HEAD automatica…
mssonicbld Nov 19, 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
1 change: 1 addition & 0 deletions build_debian.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
mtr-tiny \
locales \
cgroup-tools \
ipmitool \
ndisc6 \
makedumpfile \
conntrack \
Expand Down
33 changes: 33 additions & 0 deletions dockers/docker-fpm-frr/frr/bgpd/templates/general/policies.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
! template: bgpd/templates/general/policies.conf.j2
!
!
ip prefix-list DEFAULT_IPV4 permit 0.0.0.0/0
ipv6 prefix-list DEFAULT_IPV6 permit ::/0
!
{% if constants.bgp.allow_list is defined and constants.bgp.allow_list.enabled is defined and constants.bgp.allow_list.enabled and constants.bgp.allow_list.drop_community is defined %}
!
Expand Down Expand Up @@ -35,13 +37,44 @@ route-map FROM_BGP_PEER_V4 permit 10
!
route-map FROM_BGP_PEER_V4 permit 11
match community allow_list_default_community
{% if CONFIG_DB__DEVICE_METADATA and 'localhost' in CONFIG_DB__DEVICE_METADATA and 'type' in CONFIG_DB__DEVICE_METADATA['localhost'] and 'subtype' in CONFIG_DB__DEVICE_METADATA['localhost'] %}
{% if CONFIG_DB__DEVICE_METADATA['localhost']['type'] == 'SpineRouter' and CONFIG_DB__DEVICE_METADATA['localhost']['subtype'] == 'UpstreamLC' %}
on-match next
!
route-map FROM_BGP_PEER_V4 permit 12
match ip address prefix-list DEFAULT_IPV4
!
route-map FROM_BGP_PEER_V4 permit 13
{% if CONFIG_DB__DEVICE_METADATA['localhost']['switch_type'] != 'chassis-packet' %}
set tag {{ constants.bgp.route_do_not_send_appdb_tag }}
{% else %}
set tag {{ constants.bgp.route_eligible_for_fallback_to_default_tag }}
{% endif %}
set community {{ constants.bgp.internal_fallback_community }} additive
{% endif %}
{% endif %}
!
route-map FROM_BGP_PEER_V6 permit 10
call ALLOW_LIST_DEPLOYMENT_ID_0_V6
on-match next
!
route-map FROM_BGP_PEER_V6 permit 11
match community allow_list_default_community
{% if CONFIG_DB__DEVICE_METADATA and 'localhost' in CONFIG_DB__DEVICE_METADATA and 'type' in CONFIG_DB__DEVICE_METADATA['localhost'] and 'subtype' in CONFIG_DB__DEVICE_METADATA['localhost'] %}
{% if CONFIG_DB__DEVICE_METADATA['localhost']['type'] == 'SpineRouter' and CONFIG_DB__DEVICE_METADATA['localhost']['subtype'] == 'UpstreamLC' %}
on-match next
!
route-map FROM_BGP_PEER_V6 permit 12
match ipv6 address prefix-list DEFAULT_IPV6
!
route-map FROM_BGP_PEER_V6 permit 13
{% if CONFIG_DB__DEVICE_METADATA['localhost']['switch_type'] != 'chassis-packet' %}
set tag {{ constants.bgp.route_do_not_send_appdb_tag }}
{% else %}
set tag {{ constants.bgp.route_eligible_for_fallback_to_default_tag }}
{% endif %}
set community {{ constants.bgp.internal_fallback_community }} additive {% endif %}
{% endif %}
!
{% endif %}
!
Expand Down
23 changes: 23 additions & 0 deletions dockers/docker-fpm-frr/frr/bgpd/templates/internal/policies.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ route-map FROM_BGP_INTERNAL_PEER_V6 permit 2
{% endif %}
{% elif CONFIG_DB__DEVICE_METADATA['localhost']['switch_type'] == 'chassis-packet' %}
bgp community-list standard DEVICE_INTERNAL_COMMUNITY permit {{ constants.bgp.internal_community }}
bgp community-list standard DEVICE_INTERNAL_FALLBACK_COMMUNITY permit {{ constants.bgp.internal_fallback_community }}
bgp community-list standard NO_EXPORT permit no-export
!
route-map FROM_BGP_INTERNAL_PEER_V4 permit 1
Expand All @@ -35,6 +36,17 @@ route-map FROM_BGP_INTERNAL_PEER_V4 permit 1
route-map FROM_BGP_INTERNAL_PEER_V4 permit 2
match community NO_EXPORT
set local-preference 80
on-match next
!
{% if CONFIG_DB__DEVICE_METADATA['localhost']['subtype'] == 'DownstreamLC' %}
route-map FROM_BGP_INTERNAL_PEER_V4 deny 3
match community DEVICE_INTERNAL_FALLBACK_COMMUNITY
{% else %}
route-map FROM_BGP_INTERNAL_PEER_V4 permit 3
match community DEVICE_INTERNAL_FALLBACK_COMMUNITY
set comm-list DEVICE_INTERNAL_FALLBACK_COMMUNITY delete
set tag {{ constants.bgp.route_eligible_for_fallback_to_default_tag }}
{% endif %}
!
route-map FROM_BGP_INTERNAL_PEER_V6 permit 1
set ipv6 next-hop prefer-global
Expand All @@ -48,6 +60,17 @@ route-map FROM_BGP_INTERNAL_PEER_V6 permit 2
route-map FROM_BGP_INTERNAL_PEER_V6 permit 3
match community NO_EXPORT
set local-preference 80
on-match next
!
{% if CONFIG_DB__DEVICE_METADATA['localhost']['subtype'] == 'DownstreamLC' %}
route-map FROM_BGP_INTERNAL_PEER_V6 deny 4
match community DEVICE_INTERNAL_FALLBACK_COMMUNITY
{% else %}
route-map FROM_BGP_INTERNAL_PEER_V6 permit 4
match community DEVICE_INTERNAL_FALLBACK_COMMUNITY
set comm-list DEVICE_INTERNAL_FALLBACK_COMMUNITY delete
set tag {{ constants.bgp.route_eligible_for_fallback_to_default_tag }}
{% endif %}
!
route-map TO_BGP_INTERNAL_PEER_V4 permit 1
match ip address prefix-list PL_LoopbackV4
Expand Down
24 changes: 23 additions & 1 deletion dockers/docker-fpm-frr/frr/bgpd/templates/voq_chassis/policies.conf.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
! template: bgpd/templates/voq_chassis/policies.conf.j2
!
bgp community-list standard DEVICE_INTERNAL_COMMUNITY permit {{ constants.bgp.internal_community }}
bgp community-list standard DEVICE_INTERNAL_FALLBACK_COMMUNITY permit {{ constants.bgp.internal_fallback_community }}
bgp community-list standard NO_EXPORT permit no-export
!
route-map FROM_VOQ_CHASSIS_V4_PEER permit 1
Expand All @@ -12,6 +13,17 @@ route-map FROM_VOQ_CHASSIS_V4_PEER permit 1
route-map FROM_VOQ_CHASSIS_V4_PEER permit 2
match community NO_EXPORT
set local-preference 80
on-match next
!
{% if CONFIG_DB__DEVICE_METADATA['localhost']['subtype'] == 'UpstreamLC' %}
route-map FROM_VOQ_CHASSIS_V4_PEER deny 3
match community DEVICE_INTERNAL_FALLBACK_COMMUNITY
{% else %}
route-map FROM_VOQ_CHASSIS_V4_PEER permit 3
match community DEVICE_INTERNAL_FALLBACK_COMMUNITY
set comm-list DEVICE_INTERNAL_FALLBACK_COMMUNITY delete
set tag {{ constants.bgp.route_eligible_for_fallback_to_default_tag }}
{% endif %}
!
route-map FROM_VOQ_CHASSIS_V4_PEER permit 100
!
Expand All @@ -21,7 +33,6 @@ route-map TO_VOQ_CHASSIS_V4_PEER permit 1
!
route-map TO_VOQ_CHASSIS_V4_PEER permit 100
!
!
route-map FROM_VOQ_CHASSIS_V6_PEER permit 1
set ipv6 next-hop prefer-global
on-match next
Expand All @@ -34,6 +45,17 @@ route-map FROM_VOQ_CHASSIS_V6_PEER permit 2
route-map FROM_VOQ_CHASSIS_V6_PEER permit 3
match community NO_EXPORT
set local-preference 80
on-match next
!
{% if CONFIG_DB__DEVICE_METADATA['localhost']['subtype'] == 'UpstreamLC' %}
route-map FROM_VOQ_CHASSIS_V6_PEER deny 4
match community DEVICE_INTERNAL_FALLBACK_COMMUNITY
{% else %}
route-map FROM_VOQ_CHASSIS_V6_PEER permit 4
match community DEVICE_INTERNAL_FALLBACK_COMMUNITY
set comm-list DEVICE_INTERNAL_FALLBACK_COMMUNITY delete
set tag {{ constants.bgp.route_eligible_for_fallback_to_default_tag }}
{% endif %}
!
route-map FROM_VOQ_CHASSIS_V6_PEER permit 100
!
Expand Down
4 changes: 0 additions & 4 deletions files/build_templates/sonic_debian_extension.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,6 @@ sudo mkdir -p $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/ifupdown2_*.deb || \
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f

# Install a patched version of ipmitool (and its dependencies via 'apt-get -y install -f')
sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/ipmitool_*.deb || \
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f

# Install a patched version of ntp (and its dependencies via 'apt-get -y install -f')
sudo dpkg --root=$FILESYSTEM_ROOT --force-confdef --force-confold -i $debs_path/ntp_*.deb || \
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y \
Expand Down
5 changes: 4 additions & 1 deletion files/image_config/constants/constants.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ constants:
bgp:
traffic_shift_community: 12345:12345
internal_community: 11111:11111
internal_community_match_tag: 1002
internal_fallback_community: 22222:22222
sentinel_community: 12345:12346
internal_community_match_tag: 201
route_do_not_send_appdb_tag: 202
route_eligible_for_fallback_to_default_tag: 203
families:
- ipv4
- ipv6
Expand Down
2 changes: 1 addition & 1 deletion platform/innovium/invm-sai.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# INVM SAI

INVM_SAI_ONLINE = https://github.com/Innovium/SONiC/raw/master/debian/master
INVM_SAI_ONLINE = https://github.com/Innovium/SONiC/raw/master/debian/202405

INVM_LIBSAI = isai.deb
INVM_HSAI = saihdr.deb
Expand Down
6 changes: 3 additions & 3 deletions platform/marvell/sai.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

BRANCH = 202405
ifeq ($(CONFIGURED_ARCH),arm64)
MRVL_SAI_VERSION = 1.14.0-2
MRVL_SAI_VERSION = 1.14.0-3
else ifeq ($(CONFIGURED_ARCH),armhf)
MRVL_SAI_VERSION = 1.14.0-1
MRVL_SAI_VERSION = 1.14.0-2
else
MRVL_SAI_VERSION = 1.14.0-1
MRVL_SAI_VERSION = 1.14.0-2
endif

MRVL_SAI_URL_PREFIX = https://github.com/Marvell-switching/sonic-marvell-binaries/raw/master/$(CONFIGURED_ARCH)/sai-plugin/$(BRANCH)/
Expand Down
11 changes: 0 additions & 11 deletions rules/ipmitool.dep
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions rules/ipmitool.mk
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion slave.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1360,7 +1360,6 @@ $(addprefix $(TARGET_PATH)/, $(SONIC_INSTALLERS)) : $(TARGET_PATH)/% : \
$(LINUX_KERNEL) \
$(SONIC_DEVICE_DATA) \
$(IFUPDOWN2) \
$(IPMITOOL) \
$(KDUMP_TOOLS) \
$(LIBPAM_RADIUS) \
$(LIBNSS_RADIUS) \
Expand Down
28 changes: 0 additions & 28 deletions src/ipmitool/Makefile
View file
Open in desktop

This file was deleted.

113 changes: 0 additions & 113 deletions src/ipmitool/patch/0001-Changes-needed-to-install-enterprise.txt.patch
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/ipmitool/patch/series
View file
Open in desktop

This file was deleted.

Loading