proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 08:50:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #14950 from FRRouting/mergify/bp/stable/9.1/pr-14913

Browse Source 
pbrd: fix map seq installed flag in json (backport #14913)
This commit is contained in:
Donatas Abraitis 2023-12-06 13:47:35 +02:00 committed by GitHub
commit a87092dbfb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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, "sequenceNumber", pbrms->seqno);
json_object_int_add(jpbrm, "ruleNumber", pbrms->ruleno); json_object_int_add(jpbrm, "ruleNumber", pbrms->ruleno);
json_object_boolean_add(jpbrm, "vrfUnchanged", pbrms->vrf_unchanged); json_object_boolean_add(jpbrm, "vrfUnchanged", pbrms->vrf_unchanged);
json_object_boolean_add(jpbrm, "installed", json_object_boolean_add(jpbrm, "installed", pbrms->installed);
pbr_nht_get_installed(nhg_name));
json_object_string_add(jpbrm, "installedReason", json_object_string_add(jpbrm, "installedReason",
pbrms->reason ? rbuf : "Valid"); pbrms->reason ? rbuf : "Valid");

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

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