fix(evpn-bridge): fix for frr to handle vrf setup and teardown #401
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
Signed-off-by: Venkatesh, Vemula <venkatesh.vemula@intel.com>
| if strings.Contains(data, "Can't find BGP instance") { // Trying to delete non exist VRF return true | ||
| return true | ||
| } | ||
| if err != nil || checkFrrResult(data, false) { |
There was a problem hiding this comment.
if we need to check frr for each frr cmd, why not move that check into FrrBgpCmd/FrrZebraCmd and other frr functions?
as well as strings.Contains(?
| if err != nil { | ||
| data, err = Frr.FrrZebraCmd(ctx, fmt.Sprintf("configure terminal\n %s\n exit\n", delCmd2)) | ||
| if err != nil || checkFrrResult(data, false) { | ||
| log.Printf("FRR: Error %s\n", data) |
There was a problem hiding this comment.
Does data contain error description?
| @@ -437,7 +430,7 @@ func setUpVrf(vrf *infradb.Vrf) (string, bool) { | |||
|
|
|||
| // checkFrrResult checks the vrf result | |||
| func checkFrrResult(cp string, show bool) bool { | |||
| return ((show && reflect.ValueOf(cp).IsZero()) || strings.Contains(cp, "warning") || strings.Contains(cp, "unknown") || strings.Contains(cp, "Unknown") || strings.Contains(cp, "Warning") || strings.Contains(cp, "Ambiguous") || strings.Contains(cp, "specified does not exist")) | |||
| return ((show && reflect.ValueOf(cp).IsZero()) || strings.Contains(cp, "warning") || strings.Contains(cp, "unknown") || strings.Contains(cp, "Unknown") || strings.Contains(cp, "Warning") || strings.Contains(cp, "Ambiguous") || strings.Contains(cp, "specified does not exist") || strings.Contains(cp, "Error")) | |||
There was a problem hiding this comment.
reflect.ValueOf(cp).IsZero()) -> cp == ""
what if cp contains waRning? Will you add a new comparison then? Will it be better to lower case the string and only then check what itcontains?
| } | ||
| hname, _ := os.Hostname() | ||
| L2vpnCmd := strings.Split(cp, "json") | ||
| L2vpnCmd = strings.Split(L2vpnCmd[1], hname) | ||
| cp = L2vpnCmd[0] | ||
| // fmt.Printf("FRR_L2vpn[0]: %s\n",cp) | ||
| if len(cp) != 7 { | ||
| if len(cp) != 7 { // Checking CMD o/p |
There was a problem hiding this comment.
magic number. Rely on string length is very unreliable
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.
fix: frr handle the duplicate vni and deleting of non-existence vrf and svi.