VNET and BGP route coexistence #3345
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
siqbal1986
changed the title
|
Can you fix coverage? |
prsunny
reviewed
Oct 30, 2024
|
/azpw run |
|
/AzurePipelines run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
8 tasks
prsunny
reviewed
Nov 25, 2024
| context.vrf_id = gVirtualRouterId; | ||
| if (removeRoute(context)) | ||
| { | ||
| SWSS_LOG_INFO("Could not find the route with prefix %s", prefix.to_string().c_str()); |
| @@ -989,6 +992,7 @@ bool VNetRouteOrch::selectNextHopGroup(const string& vnet, | |||
| // This is followed by an attempt to create a NHG which can be subset of nexthops_primary | |||
| // depending on the endpoint monitor state. If no NHG from primary is created, we attempt | |||
| // the same for secondary. | |||
| SWSS_LOG_NOTICE("Route recieved with monitoring %s and secondary NHG %s.\n",monitoring.c_str(), nexthops_secondary.to_string().c_str()); | |||
There was a problem hiding this comment.
recieved typo. Also this may be frequent, suggest to change to INFO
| if (failed) | ||
| { | ||
| // This is an unrecoverable error, Throw a LOG_ERROR and return | ||
| SWSS_LOG_ERROR("Inconsistant Hardware State. Failed to create tunnel routes\n"); |
| ipPrefixsubnet.to_string().c_str()); | ||
| if (gRouteOrch && !gRouteOrch->removeRouteIfExists(ipPrefixsubnet)) | ||
| { | ||
| SWSS_LOG_ERROR("Couldn't Removed existing bgp route for prefix : %s\n", ipPrefixsubnet.to_string().c_str()); |
| route_state = ""; | ||
| } | ||
| } | ||
| SWSS_LOG_NOTICE("advertisement of prefix: %s with profile:%s, status: %s via %s\n", |
There was a problem hiding this comment.
Revisit the NOTICE logs, prefer to keep it INFO
| auto ipPrefixsubnet = ipPrefix.getSubnet(); | ||
| SWSS_LOG_INFO("Attempting to remove BGP learnt route for prefix : %s\n", | ||
| ipPrefixsubnet.to_string().c_str()); | ||
| if (gRouteOrch && !gRouteOrch->removeRouteIfExists(ipPrefixsubnet)) |
There was a problem hiding this comment.
check for route existence first
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What I did
This PR adds the logic to give Vnet routes precedence over BGP learnt route.
This PR also refactors the test_vnet.py to break out the common code into a library.
Why I did it
Currently if a route is learnt via BGP and added into the hardware, adding a VNET route results in failure. In addition due to a bug in VnetOrch, we start advertising the failed route, This prompts the BGP to remove the learnt route in favor of the local route. Since the Vnet Orch doesn't retry adding the Vnet route, This results in no route being present in the Hardware.
How I verified it
Added 2 tests to verify the learnt route is removed when a Vnet route is added.
One test covers the scnerio where BFD sessions are brought up before the Vnet route is added and the 2nd covers when the Vnet route is added before the BFD sessions are brought up.
Details if related
Tests covering this chage.
sonic-net/sonic-mgmt#15710