zebra: Cl to frr upstream zebra json #17532

sougata-github-nvidia · 2024-11-29T06:10:02Z

Added Zebra json

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]>

sougata-github-nvidia · 2024-11-29T13:15:08Z

CI:rerun

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]>

sougata-github-nvidia · 2024-12-03T07:23:02Z

CI:rerun

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]>

sougata-github-nvidia · 2024-12-03T10:09:58Z

CI:rerun

mjstapp

Had some questions.
I really think the new feature proposal should be moved to a separate PR.

mjstapp · 2024-12-03T12:54:41Z

zebra/interface.c

 }

 static void zebra_vxlan_if_vni_hash_dump_vty(struct hash_bucket *bucket,
-					     void *ctxt)
+					     void **args)


no, don't change the signature of this callback - you can do the interpretation of the void* inside the function. if you need to pass more context, then you may need to ... pass a context struct, as is done in many places

mjstapp · 2024-12-03T12:54:56Z

zebra/interface.c

-	if (vxlan_info->vtep_ip.s_addr != INADDR_ANY)
-		vty_out(vty, " VTEP IP: %pI4", &vxlan_info->vtep_ip);
+	if (vxlan_info->vtep_ip.s_addr != INADDR_ANY &&
+	    inet_ntop(AF_INET, &vxlan_info->vtep_ip, buf, sizeof(buf)) != NULL)


no, the existing code is correct

mjstapp · 2024-12-03T12:55:09Z

zebra/interface.c

 		hash_iterate(vni_info->vni_table,
-			     zebra_vxlan_if_vni_hash_dump_vty, vty);
+			     (void (*)(struct hash_bucket *,


no, don't need to do this

mjstapp · 2024-12-03T12:56:52Z

zebra/interface.c

-	if (vni->access_vlan)
-		vty_out(vty, " Access VLAN Id %u\n", vni->access_vlan);
+	if (vty) {
+		vty_out(vty, "\n  VxLAN Id %u", vni->vni);


why are you changing the newlines?

mjstapp · 2024-12-03T12:57:43Z

zebra/interface.c

-	if (vni->mcast_grp.s_addr != INADDR_ANY)
-		vty_out(vty, "  Mcast Group %s",
-			inet_ntop(AF_INET, &vni->mcast_grp, str, sizeof(str)));
+		if (vni->mcast_grp.s_addr != INADDR_ANY &&


if you're going to change this, please use %pI4

newline change - again?

mjstapp · 2024-12-03T13:05:22Z

zebra/zebra_evpn_mh.c

@@ -3101,6 +3101,9 @@ static void zebra_evpn_es_show_entry(struct vty *vty, struct zebra_evpn_es *es,
 				json_array_string_add(json_flags, "local");
 			if (es->flags & ZEBRA_EVPNES_REMOTE)
 				json_array_string_add(json_flags, "remote");
+			if (es->flags & ZEBRA_EVPNES_LOCAL &&


I'm a bit concerned about this: the two flags involved are already represented - do we need to capture this semantic in this way, explicitly? can't the operator decide what the presence or absence of the two flags means?

mjstapp · 2024-12-03T13:09:20Z

zebra/zebra_l2.h

@@ -38,6 +38,13 @@ struct zebra_l2_bridge_vlan {
 	struct zebra_evpn_access_bd *access_bd;
 };

+struct zebra_l2_brvlan_mac {


umm - this commit adds data structures, but ... where's the code that updates them?
frankly, I think you should separate new feature proposals like this out into a separate PR, and offer just the json-specific changes in this PR

mjstapp · 2024-12-03T13:11:32Z

zebra/zebra_vty.c

-						 NULL);
+			if (brief) {
+				if (zebra_nhg_dependents_is_empty(nhe))
+					show_nexthop_json_helper(json_nexthops,


the indentation looks wrong in this block - is that just the github webui?

mjstapp · 2024-12-03T13:13:51Z

zebra/zebra_vty.c

+      "EVPN\n"
+      "Local MAC addresses\n"
+      "Interface Name\n"
+      "VLAN ID\n" JSON_STR)


separate line for each help string

mjstapp · 2024-12-03T13:16:24Z

zebra/zebra_vty.c

+		return CMD_WARNING;
+	}
+
+	RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {


I swear - no more of this in-the-clear: let's make a lib api that does this, instead of doing it raw like this all over zebra

sougata-github-nvidia · 2024-12-04T05:20:23Z

CI:rerun

sougata-github-nvidia · 2024-12-04T05:32:25Z

CI:rerun

sougata-github-nvidia · 2024-12-04T06:09:25Z

CI:rerun

sougata-github-nvidia · 2024-12-04T06:39:39Z

CI:rerun

mjstapp · 2024-12-10T13:58:32Z

please don't add "fix it" commits - please fix the commit that has a problem and rebase your branch

Signed-off-by: Sougata <[email protected]>

Signed-off-by: famfo <[email protected]>

The bgp_bmp and bgp_bmp_vrf tests use similar routines to test the bmp, but are duplicates. Gather the bgp_bmp and the bgp_bmp_vrf tests in a single bgp_bmp folder. - Create a bgpbmp.py library under the bgp_bmp test folder - The bgp_bmp and bgp_bmp_vrf test are renamed to bgp_bmp_1 and bgp_bmp_2 test. - Maintain separate folder for config and output results. Adapt the bgp_bmp library accordingly. - The json output for bgp_bmp_2 test has no referenc to hostame. Signed-off-by: Philippe Guibert <[email protected]>

When configuring the bgp_bmp test with an additional peer that sends empty AS-PATH, the bmp collector is stopping: > [2024-10-28 17:41:51] Finished dissecting data from ('192.0.2.1', 33922) > [2024-10-28 17:41:52] Data received from ('192.0.2.1', 33922): length 195 > [2024-10-28 17:41:52] Got message type: <class 'bmp.BMPRouteMonitoring'> > [2024-10-28 17:41:52] unpack_from requires a buffer of at least 2 bytes for unpacking 2 bytes at offset 0 (actual buffer size is 0) > [2024-10-28 17:41:52] TCP session closed with ('192.0.2.1', 33922) > [2024-10-28 17:41:52] Server shutting down on 192.0.2.10:1789 The parser attempts to read an empty AS-path and considers the length value as a length in bytes, whereas RFC mentions this value as definining the number of AS-PAths. Fix this in the parser. Signed-off-by: Philippe Guibert <[email protected]>

Signed-off-by: Donatas Abraitis <[email protected]>

This cannot happen. No need to test Signed-off-by: Donald Sharp <[email protected]>

PIMv6 does not implement MSDP, users should use PIMv6 embedded RP instead. Signed-off-by: Rafael Zalamena <[email protected]>

Reorganize the MSDP initialization code and configuration writing code to its appropriated place. Signed-off-by: Rafael Zalamena <[email protected]>

Guard MSDP code to compile only on IPv4 and remove all MSDP code from PIMv6. Signed-off-by: Rafael Zalamena <[email protected]>

Allow user to specify the RP field for the SA messages. Signed-off-by: Rafael Zalamena <[email protected]>

Import new topology to test originator ID configuration. Signed-off-by: Rafael Zalamena <[email protected]>

Let user know about new MSDP knob to configure originator ID. Signed-off-by: Rafael Zalamena <[email protected]>

If we have this construct: for (pi = bgp_dest_get_bgp_path_info(dest); pi; pi = pi->next) { ... bgp_process(); } This can induce an infinite loop. This happens because bgp_process will move the unsorted items to the top of the list for handling, as such it is necessary to hold the next pointer to the side to actually look at each possible bgp_path_info. Signed-off-by: Donald Sharp <[email protected]>

Signed-off-by: Donatas Abraitis <[email protected]>

Fix crash on `clear ipv6 mroute` when using embedded RP. Signed-off-by: Rafael Zalamena <[email protected]>

Fix Coverity Scan CID 1602463: make it impossible for the function to fail. Hardcode the multicast prefix generation instead of calling `str2prefix()` which caused unnecessary memory allocations and returned error values. Signed-off-by: Rafael Zalamena <[email protected]>

When debugging a crash I noticed that sometimes we talked about a zclient connection in relation to the fd associated with it and sometimes we did not. Let's just always give the data associated with the fd. It will make it a bit easier for me to follow the transitions. Signed-off-by: Donald Sharp <[email protected]>

Signed-off-by: Donald Sharp <[email protected]>

github-actions · 2024-12-16T15:10:08Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Sindhu Parvathi Gopinathan and others added 2 commits November 28, 2024 21:48

frrbot bot added the zebra label Nov 29, 2024

github-actions bot added master size/L labels Nov 29, 2024

sougata-github-nvidia force-pushed the cl_to_frr_upstream_zebra branch from cce0946 to 88f19f9 Compare December 3, 2024 07:19

Sindhu Parvathi Gopinathan and others added 4 commits December 3, 2024 15:24

zebra: Define a local MAC cache for EVPN

aa12b80

Define a MAC cache to store local MACs upon notification from the kernel. Signed-off-by: Vivek Venkatraman <[email protected]>

zebra: Display local MAC cache

c5488c9

Add vtysh handler and backend function to display the local MAC cache. Signed-off-by: Vivek Venkatraman <[email protected]>

zebra: json support

5f458b3

Added json support for 'show evpn local-mac intf vlan.' Signed-off-by: Ashwini Reddy <[email protected]>

sougata-github-nvidia force-pushed the cl_to_frr_upstream_zebra branch from 88f19f9 to 5f458b3 Compare December 3, 2024 09:55

mjstapp reviewed Dec 3, 2024

View reviewed changes

sougata-github-nvidia force-pushed the cl_to_frr_upstream_zebra branch from eaf9e0b to 7e49fa6 Compare December 4, 2024 05:31

sougata-github-nvidia force-pushed the cl_to_frr_upstream_zebra branch from 7e49fa6 to 3a62811 Compare December 4, 2024 06:39

sougata-github-nvidia force-pushed the cl_to_frr_upstream_zebra branch from 3a62811 to 6963a54 Compare December 10, 2024 10:04

github-actions bot added the rebase PR needs rebase label Dec 10, 2024

sougata-github-nvidia force-pushed the cl_to_frr_upstream_zebra branch from 6963a54 to 718c0d4 Compare December 16, 2024 02:22

sougata-github-nvidia and others added 4 commits December 16, 2024 09:37

zebra: static analyzer reported issue fixes

7b1ac8b

Signed-off-by: Sougata <[email protected]>

topotests: Allow runing under both docker and podman

5dde8e1

Signed-off-by: famfo <[email protected]>

ton31337 and others added 14 commits December 16, 2024 09:38

bgpd: Show which prefix is suppressed if debug out is enabled

3e2a0f3

Signed-off-by: Donatas Abraitis <[email protected]>

zebra: Remove tests for allocation failure

8f2f7f6

This cannot happen. No need to test Signed-off-by: Donald Sharp <[email protected]>

pim6d: ignore more MSDP callbacks

f8ba744

PIMv6 does not implement MSDP, users should use PIMv6 embedded RP instead. Signed-off-by: Rafael Zalamena <[email protected]>

pimd: move MSDP configuration and initialization

dcf33d0

Reorganize the MSDP initialization code and configuration writing code to its appropriated place. Signed-off-by: Rafael Zalamena <[email protected]>

pimd: move all MSDP code to its own place

c9d6ea7

Guard MSDP code to compile only on IPv4 and remove all MSDP code from PIMv6. Signed-off-by: Rafael Zalamena <[email protected]>

pimd: support originator id configuration

78c5bb9

Allow user to specify the RP field for the SA messages. Signed-off-by: Rafael Zalamena <[email protected]>

topotests: topology to test MSDP originator ID

c7d3e19

Import new topology to test originator ID configuration. Signed-off-by: Rafael Zalamena <[email protected]>

doc: document new command MSDP originator ID

f0f2940

Let user know about new MSDP knob to configure originator ID. Signed-off-by: Rafael Zalamena <[email protected]>

doc: Update the next release dates

31cbe16

Signed-off-by: Donatas Abraitis <[email protected]>

pim6d: fix crash on clear ipv6 mroute

02d336d

Fix crash on `clear ipv6 mroute` when using embedded RP. Signed-off-by: Rafael Zalamena <[email protected]>

tools: Add rip support bundle commands

b43c276

Signed-off-by: Donald Sharp <[email protected]>

sougata-github-nvidia force-pushed the cl_to_frr_upstream_zebra branch from 718c0d4 to b43c276 Compare December 16, 2024 04:09

frrbot bot added bgp bugfix documentation libfrr pbr pim tests Topotests, make check, etc tools vtysh watchfrr yang labels Dec 16, 2024

github-actions bot added size/XXL conflicts and removed size/L labels Dec 16, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

zebra: Cl to frr upstream zebra json #17532

zebra: Cl to frr upstream zebra json #17532

sougata-github-nvidia commented Nov 29, 2024

sougata-github-nvidia commented Nov 29, 2024

sougata-github-nvidia commented Dec 3, 2024

sougata-github-nvidia commented Dec 3, 2024

mjstapp left a comment

mjstapp Dec 3, 2024

mjstapp Dec 3, 2024

mjstapp Dec 3, 2024

mjstapp Dec 3, 2024

mjstapp Dec 3, 2024

mjstapp Dec 3, 2024

mjstapp Dec 3, 2024

mjstapp Dec 3, 2024

mjstapp Dec 3, 2024

mjstapp Dec 3, 2024

sougata-github-nvidia commented Dec 4, 2024

sougata-github-nvidia commented Dec 4, 2024

sougata-github-nvidia commented Dec 4, 2024

sougata-github-nvidia commented Dec 4, 2024

mjstapp commented Dec 10, 2024

github-actions bot commented Dec 16, 2024

zebra: Cl to frr upstream zebra json #17532

Are you sure you want to change the base?

zebra: Cl to frr upstream zebra json #17532

Conversation

sougata-github-nvidia commented Nov 29, 2024

sougata-github-nvidia commented Nov 29, 2024

sougata-github-nvidia commented Dec 3, 2024

sougata-github-nvidia commented Dec 3, 2024

mjstapp left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sougata-github-nvidia commented Dec 4, 2024

sougata-github-nvidia commented Dec 4, 2024

sougata-github-nvidia commented Dec 4, 2024

sougata-github-nvidia commented Dec 4, 2024

mjstapp commented Dec 10, 2024

github-actions bot commented Dec 16, 2024