[multi asic] BGP monitor changes for multi asic #6920

arlakshm · 2021-03-01T02:24:21Z

Why I did it

Add support for BGP Monitors on multi asic SONiC platforms.

How I did it

On multi ASIC SONiC platforms, BGP monitor session will be established from Backend ASIC.
To achieve this following changes are done

Add BGP monitor configuration on the backend ASIC.
The BGP monitor configuration is present in the DPG of the device in minigraph.xml of multi-ASIC device, so this configuration will be added to the config_db of the host, when the minigraph is loaded.
To add configuration for this in the Backend ASIC, a new class MultiAsicBgpMonCfg is added to the hostcfgd service to update the config_db of the backend ASIC when the BGP_MONITOR table of the host config_db is updated.
This way incremental BGP_MONITOR configuration can also be handled.
Changes to establish BGP session with bgp monitor.
- Add route in host main routing table to go to one of pre-define backend asic
- Add IP table rule on front asic to mark the BGP packets with destination as IPv4 Loopback.
- Add IP rule in front asic namespace to match mark BGP packet and lookup default table
- Program the default route in FrontEnd asic name space docker default table as part of start.sh of the BGP container.
  It need to be done as part of start.sh otherwise FRR default route will get over-written.

How to verify it

Run the tests test_bgpmon.py for multi asic.

Which release branch to backport (provide reason below if selected)

201811
[X ] 201911
202006
[X ] 202012

Description for the changelog

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

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <[email protected]>

to make BGPMON work for multi-asic platforms. Signed-off-by: Abhishek Dosi <[email protected]>

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <[email protected]>

abdosi · 2021-03-02T21:21:42Z

@prsunny made some changes for IPTable class to make it generic so can be use for other rules also. please check.

abdosi · 2021-03-05T07:02:14Z

@arlakshm Config DB programming part looks good. Can you review the ip table rule programming part.

arlakshm · 2021-03-05T19:48:40Z

@abdosi, the ip table programming looks good to me.

lguohan · 2021-03-05T20:57:32Z

src/sonic-host-services/scripts/hostcfgd

-from sonic_py_common import device_info
-from swsssdk import ConfigDBConnector
+from sonic_py_common import device_info,multi_asic
+from swsssdk import ConfigDBConnector, SonicDBConfig


for master we no longer use swsssdk, it is depracating. @qiluo-msft

@qiluo-msft , are you going to refactor this?

@arlakshm Could you just replace swsssdk with swsscommon.swsscommon ? we are deprecating swsssdk

change in latest commit

lguohan · 2021-03-05T21:00:45Z

others looks good.

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <[email protected]>

abdosi · 2021-03-06T01:43:50Z

src/sonic-host-services/scripts/hostcfgd

@@ -406,6 +512,9 @@ class HostConfigDaemon:
        self.kdumpCfg = KdumpCfg(self.config_db)
        self.kdumpCfg.load(self.config_db.get_table('KDUMP'))



@arlakshm
we need to do self.masicBgpMonCfg = None .
SIngle asic is getting exception.

Please update.

@arlakshm updated in latest commit. Please check.

@abdosi, lgtm.

Signed-off-by: Abhishek Dosi <[email protected]>

The sonic-net/sonic-buildimage#6920 adds support of adding BGP monitor session on one of the backend ASICs of Multi ASIC platforms. This PR enchances the show ip bgp summary command to display this session Also added unit tests for 'show ip bgp summary' for multi asic platforms

abdosi · 2021-03-06T15:21:02Z

@arlakshm we need to monitor KVM-T0 test failure. I have re-run couple of time but it is failing. Have triggered new re-run.

Meanwhile to get unblock created PR for 201911 #6977. Please review.

This PRis cherry-pick of master sonic-net#6920 Signed-off-by: Abhishek Dosi <[email protected]> Co-authored-by: Arvind <[email protected]>

arlakshm · 2021-03-06T21:00:42Z

@arlakshm we need to monitor KVM-T0 test failure. I have re-run couple of time but it is failing. Have triggered new re-run.

Meanwhile to get unblock created PR for 201911 #6977. Please review.

@abdosi, The T0 failures doesn't seem to related to the changes in the PR. I have retrigger again, I will monitor the tests

This PR is cherry-pick of master #6920 Why I did it Add support for BGP Monitors on multi asic SONiC platforms. How I did it On multi ASIC SONiC platforms, BGP monitor session will be established from Backend ASIC. To achieve this following changes are done Add BGP monitor configuration on the backend ASIC. The BGP monitor configuration is present in the DPG of the device in minigraph.xml of multi-ASIC device, so this configuration will be added to the config_db of the host, when the minigraph is loaded. To add configuration for this in the Backend ASIC, a new class MultiAsicBgpMonCfg is added to the hostcfgd service to update the config_db of the backend ASIC when the BGP_MONITOR table of the host config_db is updated. This way incremental BGP_MONITOR configuration can also be handled. Changes to establish BGP session with bgp monitor. Add route in host main routing table to go to one of pre-define backend asic Add IP table rule on front asic to mark the BGP packets with destination as IPv4 Loopback. Add IP rule in front asic namespace to match mark BGP packet and lookup default table Program the default route in FrontEnd asic name space docker default table as part of start.sh of the BGP container. It need to be done as part of start.sh otherwise FRR default route will get over-written. How to verify it Signed-off-by: Abhishek Dosi <[email protected]> Co-authored-by: Arvind <[email protected]>

arlakshm · 2021-03-08T22:53:42Z

/Azp run

azure-pipelines · 2021-03-08T22:53:54Z

Azure Pipelines successfully started running 1 pipeline(s).

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <[email protected]>

lgtm-com · 2021-04-01T20:15:52Z

This pull request introduces 1 alert when merging 43dc774 into aa63c71 - view on LGTM.com

new alerts:

1 for Variable defined multiple times

The PR sonic-net/sonic-buildimage#6920 adds the support for swsscommon in `hostcfgd`. The PR test failure are seen because the `config_db.subscribe` doesnt work with swsscommon. This PR adds the support for the following python APIs - `config_db.subscribe` - `config_db.unsubscribe`

arlakshm · 2021-06-10T18:42:46Z

/azp run

azure-pipelines · 2021-06-10T18:42:51Z

Pull request contains merge conflicts.

The PR sonic-net/sonic-buildimage#6920 adds the support for swsscommon in `hostcfgd`. The PR test failure are seen because the `config_db.subscribe` doesnt work with swsscommon. This PR adds the support for the following python APIs - `config_db.subscribe` - `config_db.unsubscribe`

arlakshm and others added 3 commits February 11, 2021 20:04

masic bgp config

5984c43

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <[email protected]>

Added Support of ip route/rule/iptable programming

6fa7f82

to make BGPMON work for multi-asic platforms. Signed-off-by: Abhishek Dosi <[email protected]>

minor fix

dce3a20

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <[email protected]>

arlakshm requested a review from lguohan as a code owner March 1, 2021 02:24

arlakshm requested review from abdosi and rlhui March 1, 2021 02:24

arlakshm mentioned this pull request Mar 4, 2021

[multi asic] Display the bgp mon session in the show ip bgp summary sonic-net/sonic-utilities#1480

Open

abdosi previously approved these changes Mar 5, 2021

View reviewed changes

arlakshm mentioned this pull request Mar 5, 2021

[201911][multi asic] show ip bgp summary changes for bgp mon sonic-net/sonic-utilities#1483

Merged

rlhui previously approved these changes Mar 5, 2021

View reviewed changes

lguohan reviewed Mar 5, 2021

View reviewed changes

Replace swssdk with swsscommon

1b5d811

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <[email protected]>

arlakshm dismissed stale reviews from rlhui and abdosi via 1b5d811 March 5, 2021 22:31

qiluo-msft previously approved these changes Mar 5, 2021

View reviewed changes

abdosi reviewed Mar 6, 2021

View reviewed changes

Minor Fix

b62bcb6

Signed-off-by: Abhishek Dosi <[email protected]>

abdosi dismissed qiluo-msft’s stale review via b62bcb6 March 6, 2021 01:48

abdosi previously approved these changes Mar 6, 2021

View reviewed changes

abdosi mentioned this pull request Mar 6, 2021

[201911] Add support for BGP Monitors on multi asic SONiC platforms. #6977

Merged

Merge remote-tracking branch 'upstream/master' into masic_bgp_mon

bf6e520

arlakshm dismissed abdosi’s stale review via bf6e520 March 30, 2021 20:35

fix test failures

43dc774

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <[email protected]>

arlakshm requested a review from xumia as a code owner April 1, 2021 19:32

merge issue

74849b6

arlakshm mentioned this pull request Apr 20, 2021

Add support for config_db subscribe and unsubscribe python apis sonic-net/sonic-swss-common#481

Merged

judyjoseph added the Request for 202106 Branch label Jul 26, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[multi asic] BGP monitor changes for multi asic #6920

[multi asic] BGP monitor changes for multi asic #6920

arlakshm commented Mar 1, 2021 •

edited by abdosi

Loading

abdosi commented Mar 2, 2021

abdosi commented Mar 5, 2021

arlakshm commented Mar 5, 2021

lguohan Mar 5, 2021

lguohan Mar 5, 2021

qiluo-msft Mar 5, 2021

arlakshm Mar 5, 2021

lguohan commented Mar 5, 2021

abdosi Mar 6, 2021

abdosi Mar 6, 2021

arlakshm Mar 6, 2021

abdosi commented Mar 6, 2021 •

edited

Loading

arlakshm commented Mar 6, 2021

arlakshm commented Mar 8, 2021

azure-pipelines bot commented Mar 8, 2021

lgtm-com bot commented Apr 1, 2021

arlakshm commented Jun 10, 2021

azure-pipelines bot commented Jun 10, 2021

		@@ -406,6 +512,9 @@ class HostConfigDaemon:
		self.kdumpCfg = KdumpCfg(self.config_db)
		self.kdumpCfg.load(self.config_db.get_table('KDUMP'))

[multi asic] BGP monitor changes for multi asic #6920

Are you sure you want to change the base?

[multi asic] BGP monitor changes for multi asic #6920

Conversation

arlakshm commented Mar 1, 2021 • edited by abdosi Loading

Why I did it

How I did it

How to verify it

Which release branch to backport (provide reason below if selected)

Description for the changelog

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

abdosi commented Mar 2, 2021

abdosi commented Mar 5, 2021

arlakshm commented Mar 5, 2021

lguohan Mar 5, 2021

Choose a reason for hiding this comment

lguohan Mar 5, 2021

Choose a reason for hiding this comment

qiluo-msft Mar 5, 2021

Choose a reason for hiding this comment

arlakshm Mar 5, 2021

Choose a reason for hiding this comment

lguohan commented Mar 5, 2021

abdosi Mar 6, 2021

Choose a reason for hiding this comment

abdosi Mar 6, 2021

Choose a reason for hiding this comment

arlakshm Mar 6, 2021

Choose a reason for hiding this comment

abdosi commented Mar 6, 2021 • edited Loading

arlakshm commented Mar 6, 2021

arlakshm commented Mar 8, 2021

azure-pipelines bot commented Mar 8, 2021

lgtm-com bot commented Apr 1, 2021

arlakshm commented Jun 10, 2021

azure-pipelines bot commented Jun 10, 2021

arlakshm commented Mar 1, 2021 •

edited by abdosi

Loading

abdosi commented Mar 6, 2021 •

edited

Loading