From 02dc49a3ccc8d4715f8e8fb148197ea24d4c5504 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Fri, 5 Jan 2024 15:14:43 +0800
Subject: [PATCH 1/4] [submodule] Update submodule linkmgrd to the latest HEAD
automatically (#17687)
---
src/linkmgrd | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/linkmgrd b/src/linkmgrd
index 2cf510b09f..b9d33d5e5c 160000
--- a/src/linkmgrd
+++ b/src/linkmgrd
@@ -1 +1 @@
-Subproject commit 2cf510b09f13396e4e1f72e2983120860b68adcd
+Subproject commit b9d33d5e5c9c05ba9322dffcc75431da6cbada9e
From b54996246a930a3747cb9e836612bc8ba484f99b Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 6 Jan 2024 01:00:55 +0800
Subject: [PATCH 2/4] [submodule] Update submodule sonic-gnmi to the latest
HEAD automatically (#17690)
---
src/sonic-gnmi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sonic-gnmi b/src/sonic-gnmi
index a49ca56141..d80cadd6f1 160000
--- a/src/sonic-gnmi
+++ b/src/sonic-gnmi
@@ -1 +1 @@
-Subproject commit a49ca5614163a210c95dadb2116d5e487133de32
+Subproject commit d80cadd6f17ed137c2c30c55ae15e0ca4a8d4c34
From 8defdfefe66bc5d1f33247462213620798ba1e25 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 6 Jan 2024 01:15:01 +0800
Subject: [PATCH 3/4] [submodule] Update submodule sonic-sairedis to the latest
HEAD automatically (#17691)
---
src/sonic-sairedis | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index 7efc49d11d..412d56aa47 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit 7efc49d11d80d100b64d1aec529b35822103e43a
+Subproject commit 412d56aa47415d107f085a3d8ad2094341c3bf3d
From 7ccef97d308839e6430d244cf2e144ce1eb947d9 Mon Sep 17 00:00:00 2001
From: mssonicbld <79238446+mssonicbld@users.noreply.github.com>
Date: Sat, 6 Jan 2024 03:37:17 +0800
Subject: [PATCH 4/4] [YANG] Enable Yang model for BGP_BBR config entry
(#17622) (#17692)
---
src/sonic-yang-models/doc/Configuration.md | 15 +++++++
src/sonic-yang-models/setup.py | 1 +
.../tests/files/sample_config_db.json | 5 +++
.../tests/yang_model_tests/tests/bgp_bbr.json | 9 ++++
.../tests_config/bgp_bbr.json | 22 ++++++++++
.../yang-models/sonic-bgp-bbr.yang | 41 +++++++++++++++++++
6 files changed, 93 insertions(+)
create mode 100644 src/sonic-yang-models/tests/yang_model_tests/tests/bgp_bbr.json
create mode 100644 src/sonic-yang-models/tests/yang_model_tests/tests_config/bgp_bbr.json
create mode 100644 src/sonic-yang-models/yang-models/sonic-bgp-bbr.yang
diff --git a/src/sonic-yang-models/doc/Configuration.md b/src/sonic-yang-models/doc/Configuration.md
index 6106586dfa..a93505a054 100644
--- a/src/sonic-yang-models/doc/Configuration.md
+++ b/src/sonic-yang-models/doc/Configuration.md
@@ -7,9 +7,12 @@ Table of Contents
* [Introduction](#introduction)
* [Configuration](#configuration)
* [Config Load and Save](#config-load-and-save)
+
* [Incremental Configuration](#incremental-configuration)
* [Redis and Json Schema](#redis-and-json-schema)
+
* [ACL and Mirroring](#acl-and-mirroring)
+ * [BGP BBR](#bgp-bbr)
* [BGP Device Global](#bgp-device-global)
* [BGP Sessions](#bgp-sessions)
* [BUFFER_PG](#buffer_pg)
@@ -365,6 +368,18 @@ and migration plan
}
}
```
+### BGP BBR
+
+The **BGP_BBR** table contains device-level BBR state.
+```
+{
+ "BGP_BBR": {
+ "all": {
+ "status": "enabled"/"disabled"
+ }
+ }
+}
+```
### BGP Device Global
The **BGP_DEVICE_GLOBAL** table contains device-level BGP global state.
diff --git a/src/sonic-yang-models/setup.py b/src/sonic-yang-models/setup.py
index d94b7a33d3..550576a3d6 100644
--- a/src/sonic-yang-models/setup.py
+++ b/src/sonic-yang-models/setup.py
@@ -79,6 +79,7 @@ def run(self):
data_files=[
('yang-models', ['./yang-models/sonic-acl.yang',
'./yang-models/sonic-auto_techsupport.yang',
+ './yang-models/sonic-bgp-bbr.yang',
'./yang-models/sonic-bgp-common.yang',
'./yang-models/sonic-bgp-device-global.yang',
'./yang-models/sonic-bgp-global.yang',
diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json
index fddd788754..0228eb3a93 100644
--- a/src/sonic-yang-models/tests/files/sample_config_db.json
+++ b/src/sonic-yang-models/tests/files/sample_config_db.json
@@ -1573,6 +1573,11 @@
"local_ip": "12.12.0.2"
}
},
+ "BGP_BBR": {
+ "all": {
+ "status": "enabled"
+ }
+ },
"BGP_GLOBALS": {
"default": {
"router_id": "5.5.5.5",
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests/bgp_bbr.json b/src/sonic-yang-models/tests/yang_model_tests/tests/bgp_bbr.json
new file mode 100644
index 0000000000..50d1c40b11
--- /dev/null
+++ b/src/sonic-yang-models/tests/yang_model_tests/tests/bgp_bbr.json
@@ -0,0 +1,9 @@
+{
+ "BGP_BBR_TABLE": {
+ "desc": "BGP BBR Table"
+ },
+ "BGP_BBR_INVALID_STATUS": {
+ "desc": "Configure status key with invalid value",
+ "eStrKey": "InvalidValue"
+ }
+}
\ No newline at end of file
diff --git a/src/sonic-yang-models/tests/yang_model_tests/tests_config/bgp_bbr.json b/src/sonic-yang-models/tests/yang_model_tests/tests_config/bgp_bbr.json
new file mode 100644
index 0000000000..f5379a4091
--- /dev/null
+++ b/src/sonic-yang-models/tests/yang_model_tests/tests_config/bgp_bbr.json
@@ -0,0 +1,22 @@
+{
+ "BGP_BBR_TABLE": {
+ "sonic-bgp-bbr:sonic-bgp-bbr": {
+ "sonic-bgp-bbr:BGP_BBR": {
+ "all":
+ {
+ "status": "enabled"
+ }
+ }
+ }
+ },
+ "BGP_BBR_INVALID_STATUS": {
+ "sonic-bgp-bbr:sonic-bgp-bbr": {
+ "sonic-bgp-bbr:BGP_BBR": {
+ "all":
+ {
+ "status": "true"
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/sonic-yang-models/yang-models/sonic-bgp-bbr.yang b/src/sonic-yang-models/yang-models/sonic-bgp-bbr.yang
new file mode 100644
index 0000000000..58cc8823d3
--- /dev/null
+++ b/src/sonic-yang-models/yang-models/sonic-bgp-bbr.yang
@@ -0,0 +1,41 @@
+module sonic-bgp-bbr {
+ namespace "http://github.com/sonic-net/sonic-bgp-bbr";
+ prefix bgpbbr;
+ yang-version 1.1;
+
+ import sonic-types {
+ prefix stypes;
+ }
+
+ organization
+ "SONiC";
+
+ contact
+ "SONiC";
+
+ description
+ "SONIC BGP BBR";
+
+ revision 2023-12-25 {
+ description
+ "Initial revision.";
+ }
+
+ container sonic-bgp-bbr {
+ container BGP_BBR {
+
+ description "BGP_BBR table part of config_db.json";
+
+ container all {
+ leaf status {
+ type stypes:admin_mode;
+ default enabled;
+ description "bgp bbr status";
+ }
+ }
+ /* end of container all */
+ }
+ /* end of container BGP_BBR */
+ }
+ /* end of container sonic-bgp-bbr */
+}
\ No newline at end of file