Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

zebra: Cl to frr upstream zebra json #17532

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

zebra: Cl to frr upstream zebra json #17532

wants to merge 7 commits into from
+295 −88

Commits on Nov 28, 2024

  1. zebra:add df flag into evpn esi json output 

    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]>
    Sindhu Parvathi Gopinathan authored and root committed Nov 28, 2024
    Configuration menu
    Copy the full SHA
    f159940 View commit details
    Browse the repository at this point in the history

  2. zebra: add vni bridge vlan info in json output 

    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]>
    @chiragshah6
    chiragshah6 authored and root committed Nov 28, 2024
    Configuration menu
    Copy the full SHA
    2899964 View commit details
    Browse the repository at this point in the history

  3. zebra: add json support for svd vxlan type 

    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]>
    @chiragshah6
    chiragshah6 authored and root committed Nov 28, 2024
    Configuration menu
    Copy the full SHA
    c551b68 View commit details
    Browse the repository at this point in the history

  4. zebra: show nexthop-group rib brief json 

    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]>
    Sindhu Parvathi Gopinathan authored and root committed Nov 28, 2024
    Configuration menu
    Copy the full SHA
    53b66d3 View commit details
    Browse the repository at this point in the history

  5. zebra: Define a local MAC cache for EVPN 

    Define a MAC cache to store local MACs upon notification from
the kernel.

Signed-off-by: Vivek Venkatraman <[email protected]>
    @vivek-cumulus
    vivek-cumulus authored and root committed Nov 28, 2024
    Configuration menu
    Copy the full SHA
    f0a3ea3 View commit details
    Browse the repository at this point in the history

  6. zebra: Display local MAC cache 

    Add vtysh handler and backend function to display the local
MAC cache.

Signed-off-by: Vivek Venkatraman <[email protected]>
    @vivek-cumulus
    vivek-cumulus authored and root committed Nov 28, 2024
    Configuration menu
    Copy the full SHA
    0fa0af4 View commit details
    Browse the repository at this point in the history

  7. zebra: json support 

    Added json support for 'show evpn local-mac intf vlan.'

Signed-off-by: Ashwini Reddy <[email protected]>
    @ashred-lnx
    ashred-lnx authored and root committed Nov 28, 2024
    Configuration menu
    Copy the full SHA
    cce0946 View commit details
    Browse the repository at this point in the history