proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-11-01 12:47:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pbrd: fix map seq installed flag in json

Browse Source 
Ticket:#3638598
Testing:

Post fix:
tor-2# show pbr map json
[
  {
    "name":"global-vrf-PBR-map",
    "valid":true,
    "policies":[
      {
        "id":1,
        "sequenceNumber":10,
        "ruleNumber":309,
        "vrfUnchanged":false,
        "installed":true,   <<<< now display correct value
        "installedReason":"Valid",
        "vrfName":"sym_1",
        "matchSrc":"10.1.200.0\/24",
        "matchDst":"10.6.200.0\/24"
      }
    ]
  }

Signed-off-by: Chirag Shah <chirag@nvidia.com>
(cherry picked from commit 64745d413c)
This commit is contained in:
Chirag Shah 2023-10-19 22:07:15 -07:00 committed by Mergify
parent 9434848ccf
commit 054b408b1e
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pbrd/pbr_vty.c
View File

@ -1667,8 +1667,7 @@ static void vty_json_pbrms(json_object *j, struct vty *vty,
json_object_int_add(jpbrm, "sequenceNumber", pbrms->seqno);
json_object_int_add(jpbrm, "ruleNumber", pbrms->ruleno);
json_object_boolean_add(jpbrm, "vrfUnchanged", pbrms->vrf_unchanged);
json_object_boolean_add(jpbrm, "installed",
pbr_nht_get_installed(nhg_name));
json_object_boolean_add(jpbrm, "installed", pbrms->installed);
json_object_string_add(jpbrm, "installedReason",
pbrms->reason ? rbuf : "Valid");

6
tests/topotests/pbr_topo1/r1/pbr-map.json
View File

@ -18,7 +18,7 @@
{
"sequenceNumber":10,
"vrfUnchanged":false,
"installed":true,
"installed":false,
"installedReason":"Invalid Src or Dst",
"nexthopGroup":{
"name":"C",
@ -98,7 +98,7 @@
{
"sequenceNumber":5,
"vrfUnchanged":false,
"installed":false,
"installed":true,
"installedReason":"Invalid NH-group",
"nexthopGroup":{
"name":"B",
@ -111,7 +111,7 @@
{
"sequenceNumber":10,
"vrfUnchanged":true,
"installed":false,
"installed":true,
"installedReason":"Valid",
"matchSrc":"1.2.0.0\/16",
"matchDst":"3.4.5.0\/24"