Vxlan tunnel endpoint custom monitoring APPL DB table. by siqbal1986 · Pull Request #2589 · sonic-net/sonic-swss

siqbal1986 · 2022-12-23T00:28:40Z

What I did
Added logic to Write to VNET_MONITOR table in appl DB.
Why I did it
This effort is done so that we can have a custom endpoint monitoring solution in place of BFD if required.
How I verified it
Manual Test.
Details if related

…mac to overlay_dmac Signed-off-by: siqbal1486 <shahzad.iqbal@microsoft.com>

…or custom monitoring of Vxlan tunnel endpoints.

Signed-off-by: siqbal1486 <shahzad.iqbal@microsoft.com>

siqbal1986 · 2023-01-18T19:44:36Z

/azp run

azure-pipelines · 2023-01-18T19:44:46Z

Azure Pipelines successfully started running 1 pipeline(s).

Signed-off-by: siqbal1486 <shahzad.iqbal@microsoft.com>

prsunny · 2023-01-19T19:25:11Z

orchagent/vnetorch.cpp

+    if (monitor_info_[vnet].find(ipPrefix) != monitor_info_[vnet].end() &&
+        monitor_info_[vnet][ipPrefix].find(endpoint) != monitor_info_[vnet][ipPrefix].end())
+    {
+        SWSS_LOG_ERROR("Monitoring session for prefix %s endpoint %s already exist", ipPrefix.to_string().c_str(), endpoint_addr.to_string().c_str());


Please change this to NOTICE. This could happen in a normal flow as well.

prsunny · 2023-01-19T19:55:29Z

orchagent/vnetorch.h

+{
+    MONITOR_SESSION_STATE_UP,
+    MONITOR_SESSION_STATE_DOWN,
+    MONITOR_SESSION_STATE_INVALID,


Suggest to keep as "UNKNOWN" for consistency with other states in orchagent

prsunny · 2023-01-19T19:59:25Z

orchagent/vnetorch.cpp

        NextHopKey nh = monitor.first;
        IpAddress monitor_ip = monitor.second;
-        if (nexthop_info_[vnet].find(nh.ip_address) == nexthop_info_[vnet].end())
+        if (monitoring =="custom")


space after ==

prsunny · 2023-01-19T20:06:39Z

orchagent/vnetorch.cpp

+    if (monitor_info_[vnet].find(ipPrefix) == monitor_info_[vnet].end() ||
+        monitor_info_[vnet][ipPrefix].find(endpoint) == monitor_info_[vnet][ipPrefix].end())
+    {
+        SWSS_LOG_ERROR("Monitor session for prefix %s endpoint %s does not exist", ipPrefix.to_string().c_str(), endpoint_addr.to_string().c_str());


Please change to NOTICE

prsunny · 2023-01-19T20:11:04Z

orchagent/vnetorch.cpp

-            {
-                IpAddress monitor_addr = nexthop_info_[vnet][ip].monitor_addr;
-                removeBfdSession(vnet, nhk, monitor_addr);
+        if (is_custom_monitoring && monitor_info_[vnet][ipPrefix].find(nhk) != monitor_info_[vnet][ipPrefix].end())


this should be in an outside if. What if custom monitoring is true but find(nhk) == end(). It will take the BFD path. Please correct.

Signed-off-by: siqbal1486 <shahzad.iqbal@microsoft.com>

prsunny · 2023-01-20T22:03:03Z

orchagent/vnetorch.cpp

        NextHopKey nh = monitor.first;
        IpAddress monitor_ip = monitor.second;
-        if (monitoring =="custom")
+            if (monitoring == "custom")


please fix alignment

Signed-off-by: siqbal1486 <shahzad.iqbal@microsoft.com>

siqbal1986 · 2023-01-22T06:37:26Z

/azp run

azure-pipelines · 2023-01-22T06:37:37Z

Azure Pipelines successfully started running 1 pipeline(s).

swss: * f28d6622 2023-01-25 | [portinit] Do not call GET on SAI_PORT_ATTR_SPEED when AUTONEG is enabled (sonic-net#2484) (sonic-net#2639) (github/202012, 202012) [Ying Xie] * 217f7f00 2023-01-21 | Cherry pick of sonic-net/sonic-swss#2589 (sonic-net#2627) [siqbal1986] Signed-off-by: Ying Xie <ying.xie@microsoft.com>

swss: * f28d6622 2023-01-25 | [portinit] Do not call GET on SAI_PORT_ATTR_SPEED when AUTONEG is enabled (#2484) (#2639) (github/202012, 202012) [Ying Xie] * 217f7f00 2023-01-21 | Cherry pick of sonic-net/sonic-swss#2589 (#2627) [siqbal1986] Signed-off-by: Ying Xie <ying.xie@microsoft.com> Signed-off-by: Ying Xie <ying.xie@microsoft.com>

Update sonic-swss submodule pointer to include the following: * a2a483d [acl] Add new ACL key BTH_OPCODE and AETH_SYNDROME ([sonic-net#2617](sonic-net/sonic-swss#2617)) * 9d1f66b [bfdorch] add local discriminator to state DB ([sonic-net#2629](sonic-net/sonic-swss#2629)) * c54b3d1 Vxlan tunnel endpoint custom monitoring APPL DB table. ([sonic-net#2589](sonic-net/sonic-swss#2589)) * 7f03db2 Fix potential risks ([sonic-net#2516](sonic-net/sonic-swss#2516)) * 383ee68 [refactor]Refactoring sai handle status ([sonic-net#2621](sonic-net/sonic-swss#2621)) * cd95972 Fix issue 13341 ARP entry can be out of sync between kernel and APPL_DB if multiple updates are received from RTNL ([sonic-net#2619](sonic-net/sonic-swss#2619)) * a01470f Remove TODO comments that are no longer relevant ([sonic-net#2622](sonic-net/sonic-swss#2622)) * d058390 Changed the BFD default detect multiplier to 10x ([sonic-net#2614](sonic-net/sonic-swss#2614)) * d78b528 [MuxOrch] Enabling neighbor when adding in active state ([sonic-net#2601](sonic-net/sonic-swss#2601)) * 4ebdad1 [routesync] Fix for stale dynamic neighbor ([sonic-net#2553](sonic-net/sonic-swss#2553)) * 8857f92 Added new attributes for Vnet and Vxlan ecmp configurations. ([sonic-net#2584](sonic-net/sonic-swss#2584)) * b6bbc3e Revert [voq][chassis]Add show fabric counters port/queue commands (2522) ([sonic-net#2611](sonic-net/sonic-swss#2611)) * 52406e2 Add missing parameter to on_switch_shutdown_request method. ([sonic-net#2567](sonic-net/sonic-swss#2567)) * 4ac9ad9 Increase diff coverage to 80% ([sonic-net#2599](sonic-net/sonic-swss#2599)) * 8a0bb36 Handle Mac address 'none' ([sonic-net#2593](sonic-net/sonic-swss#2593)) * f496ab3 [vstest] Only collect stdout of orchagent_restart_check in vstest ([sonic-net#2597](sonic-net/sonic-swss#2597)) * 1dab495 Avoid aborting orchagent when setting TUNNEL attributes ([sonic-net#2591](sonic-net/sonic-swss#2591)) * 4395cea Fix neighbor doesn't update all attribute ([sonic-net#2577](sonic-net/sonic-swss#2577)) Signed-off-by: dprital <drorp@nvidia.com>

Update sonic-swss submodule pointer to include the following: * a2a483d [acl] Add new ACL key BTH_OPCODE and AETH_SYNDROME ([#2617](sonic-net/sonic-swss#2617)) * 9d1f66b [bfdorch] add local discriminator to state DB ([#2629](sonic-net/sonic-swss#2629)) * c54b3d1 Vxlan tunnel endpoint custom monitoring APPL DB table. ([#2589](sonic-net/sonic-swss#2589)) * 7f03db2 Fix potential risks ([#2516](sonic-net/sonic-swss#2516)) * 383ee68 [refactor]Refactoring sai handle status ([#2621](sonic-net/sonic-swss#2621)) * cd95972 Fix issue 13341 ARP entry can be out of sync between kernel and APPL_DB if multiple updates are received from RTNL ([#2619](sonic-net/sonic-swss#2619)) * a01470f Remove TODO comments that are no longer relevant ([#2622](sonic-net/sonic-swss#2622)) * d058390 Changed the BFD default detect multiplier to 10x ([#2614](sonic-net/sonic-swss#2614)) * d78b528 [MuxOrch] Enabling neighbor when adding in active state ([#2601](sonic-net/sonic-swss#2601)) * 4ebdad1 [routesync] Fix for stale dynamic neighbor ([#2553](sonic-net/sonic-swss#2553)) * 8857f92 Added new attributes for Vnet and Vxlan ecmp configurations. ([#2584](sonic-net/sonic-swss#2584)) * b6bbc3e Revert [voq][chassis]Add show fabric counters port/queue commands (2522) ([#2611](sonic-net/sonic-swss#2611)) * 52406e2 Add missing parameter to on_switch_shutdown_request method. ([#2567](sonic-net/sonic-swss#2567)) * 4ac9ad9 Increase diff coverage to 80% ([#2599](sonic-net/sonic-swss#2599)) * 8a0bb36 Handle Mac address 'none' ([#2593](sonic-net/sonic-swss#2593)) * f496ab3 [vstest] Only collect stdout of orchagent_restart_check in vstest ([#2597](sonic-net/sonic-swss#2597)) * 1dab495 Avoid aborting orchagent when setting TUNNEL attributes ([#2591](sonic-net/sonic-swss#2591)) * 4395cea Fix neighbor doesn't update all attribute ([#2577](sonic-net/sonic-swss#2577)) Signed-off-by: dprital <drorp@nvidia.com>

* added support for monitoring, primary and adv_prefix. changed filter_mac to overlay_dmac * Data Structures and code to write APP_DB VNET_MONITOR table entries for custom monitoring of Vxlan tunnel endpoints.

StormLiangMS · 2023-02-10T14:42:36Z

@siqbal1986 cherry-picked failed for 202211, could you raise new PR for 202211?

*Merge remote-tracking branch 'upstream/master' into dash (#2663) * Modify coppmgr mergeConfig to support preserving copp tables through reboot. (#2548) * Avoid aborting orchagent when setting TUNNEL attributes (#2591) * Handle Mac address 'none' (#2593) * Increase diff coverage to 80% (#2599) * Add missing parameter to on_switch_shutdown_request method. (#2567) * Add ZMQ based ProducerStateTable and CustomerStateTable. * Revert "[voq][chassis]Add show fabric counters port/queue commands (#2522)" (#2611) * Added new attributes for Vnet and Vxlan ecmp configurations. (#2584) * added support for monitoring, primary and adv_prefix and overlay_dmac. * [routesync] Fix for stale dynamic neighbor (#2553) * [MuxOrch] Enabling neighbor when adding in active state (#2601) * Changed the BFD default detect multiplier to 10x (#2614) * Remove TODO comments that are no longer relevant (#2622) * Fix issue #13341 ARP entry can be out of sync between kernel and APPL_DB if multiple updates are received from RTNL (#2619) * [refactor]Refactoring sai handle status (#2621) * Vxlan tunnel endpoint custom monitoring APPL DB table. (#2589) * added support for monitoring, primary and adv_prefix. changed filter_mac to overlay_dmac * Data Structures and code to write APP_DB VNET_MONITOR table entries for custom monitoring of Vxlan tunnel endpoints. * [bfdorch] add local discriminator to state DB (#2629) * [acl] Add new ACL key BTH_OPCODE and AETH_SYNDROME (#2617) * [voq][chassis] Remove created ports from the default vlan. (#2607) * [EVPN]Handling race condition when remote VNI arrives before tunnel map entry (#2642) *Added check in remote VNI add to ensure vxlan tunnel map is created before adding the remote end point. * [test_mux] add sleep in test_NH (#2648) * [autoneg]Fixing adv interface types to be set when AN is disabled (#2638) * [hash]: Add UT infra. (#2660) *Added UT infra for Generic Hash feature *Aligned PBH tests with Generic Hash UT infra * [sai_failure_dump]Invoking dump during SAI failure (#2644) * [ResponsePublisher] add pipeline support (#2511) * [dash] Fix compilation issue caused by missing include.

) *Merge remote-tracking branch 'upstream/master' into dash (sonic-net#2663) * Modify coppmgr mergeConfig to support preserving copp tables through reboot. (sonic-net#2548) * Avoid aborting orchagent when setting TUNNEL attributes (sonic-net#2591) * Handle Mac address 'none' (sonic-net#2593) * Increase diff coverage to 80% (sonic-net#2599) * Add missing parameter to on_switch_shutdown_request method. (sonic-net#2567) * Add ZMQ based ProducerStateTable and CustomerStateTable. * Revert "[voq][chassis]Add show fabric counters port/queue commands (sonic-net#2522)" (sonic-net#2611) * Added new attributes for Vnet and Vxlan ecmp configurations. (sonic-net#2584) * added support for monitoring, primary and adv_prefix and overlay_dmac. * [routesync] Fix for stale dynamic neighbor (sonic-net#2553) * [MuxOrch] Enabling neighbor when adding in active state (sonic-net#2601) * Changed the BFD default detect multiplier to 10x (sonic-net#2614) * Remove TODO comments that are no longer relevant (sonic-net#2622) * Fix issue #13341 ARP entry can be out of sync between kernel and APPL_DB if multiple updates are received from RTNL (sonic-net#2619) * [refactor]Refactoring sai handle status (sonic-net#2621) * Vxlan tunnel endpoint custom monitoring APPL DB table. (sonic-net#2589) * added support for monitoring, primary and adv_prefix. changed filter_mac to overlay_dmac * Data Structures and code to write APP_DB VNET_MONITOR table entries for custom monitoring of Vxlan tunnel endpoints. * [bfdorch] add local discriminator to state DB (sonic-net#2629) * [acl] Add new ACL key BTH_OPCODE and AETH_SYNDROME (sonic-net#2617) * [voq][chassis] Remove created ports from the default vlan. (sonic-net#2607) * [EVPN]Handling race condition when remote VNI arrives before tunnel map entry (sonic-net#2642) *Added check in remote VNI add to ensure vxlan tunnel map is created before adding the remote end point. * [test_mux] add sleep in test_NH (sonic-net#2648) * [autoneg]Fixing adv interface types to be set when AN is disabled (sonic-net#2638) * [hash]: Add UT infra. (sonic-net#2660) *Added UT infra for Generic Hash feature *Aligned PBH tests with Generic Hash UT infra * [sai_failure_dump]Invoking dump during SAI failure (sonic-net#2644) * [ResponsePublisher] add pipeline support (sonic-net#2511) * [dash] Fix compilation issue caused by missing include.

* added support for monitoring, primary and adv_prefix. changed filter_mac to overlay_dmac * Data Structures and code to write APP_DB VNET_MONITOR table entries for custom monitoring of Vxlan tunnel endpoints.

siqbal1986 and others added 5 commits December 20, 2022 14:49

Added support for filter_mac and monitoring attributes.

996bb0e

Merge branch 'sonic-net:master' into Sirius_vnet_config_update

9bfb784

added support for monitoring, primary and adv_prefix. changed filter_…

85905e9

…mac to overlay_dmac Signed-off-by: siqbal1486 <shahzad.iqbal@microsoft.com>

Data Structures and code to write APP_DB VNET_MONITOR table entries f…

197347a

…or custom monitoring of Vxlan tunnel endpoints.

Disabled a failing test. Full test fix to follow.

28eecfe

Signed-off-by: siqbal1486 <shahzad.iqbal@microsoft.com>

siqbal1986 requested a review from prsunny as a code owner December 23, 2022 00:28

siqbal1986 and others added 3 commits January 3, 2023 11:44

Merge branch 'sonic-net:master' into Sirius_vnet_config_update_2

861bbb3

Merge branch 'master' into Sirius_vnet_config_update_2

aae8a78

added test for Monitor config write and delete.

f45dcb4

Signed-off-by: siqbal1486 <shahzad.iqbal@microsoft.com>

prsunny added the Request for 202205 Branch label Jan 17, 2023

siqbal1986 added 2 commits January 17, 2023 15:01

Changed the name of the table.

f7ce97d

Signed-off-by: siqbal1486 <shahzad.iqbal@microsoft.com>

Merge branch 'master' into Sirius_vnet_config_update_2

57c9339

fixed a test causing failure after new changes.

8ec790b

Signed-off-by: siqbal1486 <shahzad.iqbal@microsoft.com>

prsunny reviewed Jan 19, 2023

View reviewed changes

Fixed issues raised in review.

90449b7

Signed-off-by: siqbal1486 <shahzad.iqbal@microsoft.com>

prsunny reviewed Jan 20, 2023

View reviewed changes

prsunny added the Request for 202211 Branch label Jan 20, 2023

siqbal1986 added 2 commits January 20, 2023 14:29

fixed a mistake added in last commit.

29570ad

Signed-off-by: siqbal1486 <shahzad.iqbal@microsoft.com>

Merge branch 'master' into Sirius_vnet_config_update_2

cd005b9

prsunny approved these changes Jan 20, 2023

View reviewed changes

siqbal1986 added a commit to siqbal1986/sonic-swss that referenced this pull request Jan 20, 2023

Cherry pick of sonic-net#2589

5881a24

Signed-off-by: siqbal1486 <shahzad.iqbal@microsoft.com>

siqbal1986 mentioned this pull request Jan 20, 2023

[202012] Vxlan tunnel endpoint custom monitoring APPL DB table #2627

Merged

siqbal1986 added a commit that referenced this pull request Jan 22, 2023

Cherry pick of #2589 (#2627)

217f7f0

Merge branch 'sonic-net:master' into Sirius_vnet_config_update_2

e17f435

siqbal1986 merged commit c54b3d1 into sonic-net:master Jan 25, 2023

yxieca mentioned this pull request Jan 25, 2023

[202012][swss] advance submodule head sonic-net/sonic-buildimage#13519

Merged

Junchao-Mellanox mentioned this pull request Jan 30, 2023

[submodule] Update sonic-swss pointer sonic-net/sonic-buildimage#13538

Closed

dprital mentioned this pull request Jan 30, 2023

[submodule] Advance sonic-swss pointer sonic-net/sonic-buildimage#13551

Merged

8 tasks

yxieca added the Included in 202205 Branch label Feb 2, 2023

StormLiangMS added the Cherry Pick Conflict_202211 label Feb 10, 2023

Conversation

siqbal1986 commented Dec 23, 2022

Uh oh!

siqbal1986 commented Jan 18, 2023

Uh oh!

azure-pipelines bot commented Jan 18, 2023

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

siqbal1986 commented Jan 22, 2023

Uh oh!

azure-pipelines bot commented Jan 22, 2023

Uh oh!

StormLiangMS commented Feb 10, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants