zebra: Cl to frr upstream zebra json #17532
Open
+295
−88
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
FRR "show evpn es 'esi-id' json" output dont have the 'df' flag.
Modified the code to add the 'df' flag into json output.
Before Fix:
```
torm-11# show evpn es 03:44:38:39:ff:ff:01:00:00:01 json
{
"esi":"03:44:38:39:ff:ff:01:00:00:01",
"accessPort":"hostbond1",
"flags":[
"local",
"remote",
"readyForBgp",
"bridgePort",
"operUp",
"nexthopGroupActive"
====================> df is missing
],
"vniCount":10,
"macCount":13,
"dfPreference":50000,
"nexthopGroup":536870913,
"vteps":[
{
"vtep":"27.0.0.16",
"dfAlgorithm":"preference",
"dfPreference":32767,
"nexthopId":268435460
},
{
"vtep":"27.0.0.17",
"dfAlgorithm":"preference",
"dfPreference":32767,
"nexthopId":268435461
}
]
}
torm-11#
```
After Fix:-
```
torm-11# show evpn es 03:44:38:39:ff:ff:01:00:00:01 json
{
"esi":"03:44:38:39:ff:ff:01:00:00:01",
"accessPort":"hostbond1",
"flags":[
"local",
"remote",
"readyForBgp",
"bridgePort",
"operUp",
"nexthopGroupActive",
"df" ========================> designated-forward flag added
],
"vniCount":10,
"macCount":13,
"dfPreference":50000,
"nexthopGroup":536870913,
"vteps":[
{
"vtep":"27.0.0.16",
"dfAlgorithm":"preference",
"dfPreference":32767,
"nexthopId":268435460
},
{
"vtep":"27.0.0.17",
"dfAlgorithm":"preference",
"dfPreference":32767,
"nexthopId":268435461
}
]
}
torm-11#
```
Ticket:# 3447935
Issue: 3447935
Testing: UT done
Signed-off-by: Sindhu Parvathi Gopinathan's <[email protected]>
Signed-off-by: Chirag Shah <[email protected]>
Add VNI's associated bridge and vlan info in json
output format.
torm-11# show evpn vni detail
VNI: 1008
Type: L2
Vlan: 1008
Bridge: bridge
...
Ticket:#3208813
Reviewed By:
Testing Done:
torm-11# show evpn vni detail json
[
{
"vni":1008,
"type":"L2",
"vlan":1008, <<< New field
"bridge":"bridge", <<< New field
"vrf":"vrf3",
"vxlanInterface":"vxlan0",
"ifindex":15,
"vtepIp":"27.0.0.15",
"mcastGroup":"239.1.1.108",
"advertiseGatewayMacip":"No",
"advertiseSviMacip":"No",
"numMacs":18,
"numArpNd":42,
"numRemoteVteps":[
"27.0.0.18",
"27.0.0.17",
"27.0.0.16"
]
},
]
Signed-off-by: Chirag Shah <[email protected]>
Reorganize common vlxan dump api to handle
both screen rending and json data object.
Testing Done:
"interfaceType":"Vxlan",
"vtepIp":"27.0.0.16",
"vxlanId":{
"1006":{
"accessVlan":1006,
"mcastGroup":"239.1.1.106"
}
},
"linkInterface":"ipmr-lo",
"masterInterface":"bridge",
SVD interface output:
"interfaceType":"Vxlan",
"vtepIp":"27.0.0.16",
"vxlanId":{
"1005":{
"accessVlan":1005,
"mcastGroup":"0.0.0.0"
},
"1001":{
"accessVlan":1001,
"mcastGroup":"0.0.0.0"
},
"4001":{
"accessVlan":4001,
"mcastGroup":"0.0.0.0"
},
"1003":{
"accessVlan":1003,
"mcastGroup":"0.0.0.0"
},
"1007":{
"accessVlan":1007,
"mcastGroup":"0.0.0.0"
}
},
"masterInterface":"bridge",
Signed-off-by: Chirag Shah <[email protected]>
Handles json brief/tiny output for scaled nexthop-group rib entries. Commands supported: ``` show nexthop-group rib brief json show nexthop-group rib 117 brief json show nexthop-group rib singleton ip brief json show nexthop-group rib singleton ipv6 brief json show nexthop-group rib zebra brief json ``` Ticket: #3710394 Issue: 3710394 Signed-off-by: Sindhu Parvathi Gopinathan's <[email protected]>
Define a MAC cache to store local MACs upon notification from the kernel. Signed-off-by: Vivek Venkatraman <[email protected]>
Add vtysh handler and backend function to display the local MAC cache. Signed-off-by: Vivek Venkatraman <[email protected]>
Added json support for 'show evpn local-mac intf vlan.' Signed-off-by: Ashwini Reddy <[email protected]>
|
CI:rerun |
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.
Added Zebra json