Skip to content

[docker-frr] Load frr.conf automatically with split mode#4132

Closed
zhenggen-xu wants to merge 1 commit intosonic-net:masterfrom
zhenggen-xu:frr-split
Closed

[docker-frr] Load frr.conf automatically with split mode#4132
zhenggen-xu wants to merge 1 commit intosonic-net:masterfrom
zhenggen-xu:frr-split

Conversation

@zhenggen-xu
Copy link
Collaborator

[docker-frr] Load frr.conf automatically with split mode

Signed-off-by: Zhenggen Xu zxu@linkedin.com

This should be back-ported to 201911 branch.

- What I did
In case "docker_routing_config_mode": "split", the frr.conf was not loaded automatically today.
This PR is to fix that so it would load the frr.conf automatically

- How I did it
start.sh in docker frr to load the frr.conf automatically

- How to verify it
Before the fix, not frr.conf was loaded. After the fix, frr.conf was loaded.

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: Zhenggen Xu <zxu@linkedin.com>
@pavel-shirshov
Copy link
Contributor

@zhenggen-xu Where can I read the difference between: "split", "separated", and "unified"?
Thanks

@zhenggen-xu
Copy link
Collaborator Author

@zhenggen-xu Where can I read the difference between: "split", "separated", and "unified"?
Thanks

I am not sure where the document is. My understanding is that
"unified" -- configDB generate frr.conf
"seperated" -- configDB generate bgp.conf, zebra.conf etc...
"split" -- Don't use configDB data for BGP, bgp stack manage by itself with frr.conf.

@zhenggen-xu zhenggen-xu requested a review from lguohan February 13, 2020 01:31
@zhenggen-xu zhenggen-xu deleted the frr-split branch May 24, 2024 19:08
mssonicbld added a commit that referenced this pull request Dec 19, 2025
…atically (#24906)

#### Why I did it
src/sonic-utilities
```
* 23bb5e0 - (HEAD -> master, origin/master, origin/HEAD) [mellanox] [db_migrator] add a migration for tunnel ecn mode (#4132) (8 hours ago) [Yakiv Huryk]
```
#### How I did it
#### How to verify it
#### Description for the changelog
xwjiang-ms pushed a commit to xwjiang-ms/sonic-buildimage that referenced this pull request Dec 22, 2025
…atically (sonic-net#24906)

#### Why I did it
src/sonic-utilities
```
* 23bb5e0 - (HEAD -> master, origin/master, origin/HEAD) [mellanox] [db_migrator] add a migration for tunnel ecn mode (sonic-net#4132) (8 hours ago) [Yakiv Huryk]
```
#### How I did it
#### How to verify it
#### Description for the changelog

Signed-off-by: xiaweijiang <xiaweijiang@microsoft.com>
mssonicbld added a commit that referenced this pull request Jan 18, 2026
…atically (#24992)

#### Why I did it
src/sonic-utilities
```
* 367aba94 - (HEAD -> 202511, origin/202511) [mellanox] [db_migrator] add a migration for tunnel ecn mode (#4132) (#4167) (5 days ago) [Yakiv Huryk]
* 12601e4f - [Mellanox] Fix generate_dump sysfs copy to copy only files with permission (#4191) (5 days ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
jasonbridges pushed a commit to jasonbridges/sonic-buildimage that referenced this pull request Jan 22, 2026
…atically (sonic-net#24906)

#### Why I did it
src/sonic-utilities
```
* 23bb5e0 - (HEAD -> master, origin/master, origin/HEAD) [mellanox] [db_migrator] add a migration for tunnel ecn mode (sonic-net#4132) (8 hours ago) [Yakiv Huryk]
```
#### How I did it
#### How to verify it
#### Description for the changelog
FengPan-Frank pushed a commit to FengPan-Frank/sonic-buildimage that referenced this pull request Mar 6, 2026
…atically (sonic-net#24906)

#### Why I did it
src/sonic-utilities
```
* 23bb5e0 - (HEAD -> master, origin/master, origin/HEAD) [mellanox] [db_migrator] add a migration for tunnel ecn mode (sonic-net#4132) (8 hours ago) [Yakiv Huryk]
```
#### How I did it
#### How to verify it
#### Description for the changelog

Signed-off-by: Feng Pan <fenpan@microsoft.com>
mssonicbld added a commit that referenced this pull request Mar 13, 2026
…lly (#25846)

#### Why I did it
src/sonic-swss
```
* 4b8f6494 - (HEAD -> master, origin/master, origin/HEAD) Merge pull request #4261 from bibhuprasad-hcl/bibhu_swss_p4_branch14 (2 hours ago) [StephenWangGoogle]
|\ 
| failure_prs.log skip_prs.log a367ddb2 - [P4Orch] Remove code associated with old L3 multicast database format. (6 hours ago) [mint570]
|/ 
* f94622ab - Optimize memory usage in ResponsePublisher queue (#4328) (7 hours ago) [Santhosh Thodupunoori]
* dc7210f3 - Merge pull request #4258 from bibhuprasad-hcl/bibhu_swss_p4_branch_11_12_13 (8 hours ago) [StephenWangGoogle]
|\ 
| failure_prs.log skip_prs.log 49df9e7d - [P4Orch]Migrate to use updateMulticastGroupEntries, verifyState to new database schema format, processMulticastGroupEntries and drainMulticastGroupEntries. (13 hours ago) [mint570]
|/ 
* d084258b - Suppressing the ERR logs (#4265) (35 hours ago) [Dhanasekar Rathinavel]
* 6a931d91 - Fix debug flexcounter uninstall to skip non-PHY ports (#4103) (2 days ago) [manish1-arista]
* fa37c5c7 - [Marvell-Teralynx][PFCWD]: Fix pfc_detect filename to align with asic_type (#3968) (2 days ago) [jithenderkondam]
* 57b12c1f - Merge pull request #4238 from ksravani-hcl/p4orch_g3 (4 days ago) [StephenWangGoogle]
|\ 
| failure_prs.log skip_prs.log 6b52aae4 - Add IPv6 src IP as new ternary key field for table ipv6_tunnel_termination_table (6 days ago) [mint570]
|/ 
* e09a0d0f - Merge pull request #4169 from divyagayathri-hcl/ip_multicast_5 (6 days ago) [StephenWangGoogle]
|\ 
| failure_prs.log skip_prs.log b96ec617 - [P4Orch] Implement drain, validate and verifyState entry functions in IP multicast table manager. (6 days ago) [mint570]
|/ 
* bebc9e43 - Merge pull request #4163 from divyagayathri-hcl/ip_multicast_3 (6 days ago) [StephenWangGoogle]
|\ 
| failure_prs.log skip_prs.log 0df5456a - [P4Orch] Implement createIpMulticastEntries, deleteIpMulticastEntries & updateIpMulticastEntries in new IP multicast table manager. (7 days ago) [mint570]
|/ 
* 558a6d81 - Merge pull request #4175 from ksravani-hcl/sws_7 (7 days ago) [StephenWangGoogle]
|\ 
| failure_prs.log skip_prs.log 45a1e14d - Enable use of SAI L2 multicast and add p4orch mocks (7 days ago) [mint570]
|/ 
* 6daa5cea - Merge pull request #4147 from divyagayathri-hcl/sws_4 (7 days ago) [StephenWangGoogle]
|\ 
| failure_prs.log skip_prs.log 2ffdab3c - Add TunnelDecapGroupManager (8 days ago) [mint570]
|/ 
* ef371099 - Merge pull request #4082 from divyagayathri-hcl/set_ip_nexthop_and_disable_rewrites (8 days ago) [StephenWangGoogle]
|\ 
| failure_prs.log skip_prs.log c1f53c5c - Merge branch 'master' into set_ip_nexthop_and_disable_rewrites (8 days ago) [divyagayathri-hcl]
| |\ 
| |/ 
|/| 
* | e108aec3 - [DASH] Add support for multiple trusted VNI ranges and values (#4252) (8 days ago) [Lawrence Lee]
* | 54261942 - Merge pull request #4132 from divyagayathri-hcl/18_multicast (9 days ago) [StephenWangGoogle]
|\ \ 
| failure_prs.log skip_prs.log | dc55967f - [P4Orch] Update route manager & verifyState validate functions and to implement drain rout entried to support multicast action. (9 days ago) [mint570]
|/ / 
| failure_prs.log skip_prs.log aba11043 - [P4Orch] Add support for action set_ip_nexthop_and_disable_rewrites in the next hop manager. (10 days ago) [mint570]
|/ 
* 3f77e90c - Merge pull request #4250 from bibhuprasad-hcl/bibhu_swss_p4_branch_8_9_10 (10 days ago) [StephenWangGoogle]
* 179e86f9 - [P4Orch] Migrate to new schema format for REPLICATION_MULTICAST_TABLE and to use addMulticastGroupEntries and deleteMulticastGroupEntries. (11 days ago) [mint570]
```
#### How I did it
#### How to verify it
#### Description for the changelog
dprital pushed a commit that referenced this pull request Mar 19, 2026
…atically (#24906)

#### Why I did it
src/sonic-utilities
```
* 23bb5e0 - (HEAD -> master, origin/master, origin/HEAD) [mellanox] [db_migrator] add a migration for tunnel ecn mode (#4132) (8 hours ago) [Yakiv Huryk]
```
#### How I did it
#### How to verify it
#### Description for the changelog

Signed-off-by: dprital <drorp@nvidia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants