Merge pull request #14951 from FRRouting/mergify/bp/stable/9.0/pr-14913

pbrd: fix map seq installed flag in json (backport #14913)
FRRouting · Dec 6, 2023 · c2a5bcf · c2a5bcf
2 parents be01f4c + e1a18cb
commit c2a5bcf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/pbrd/pbr_vty.c b/pbrd/pbr_vty.c
@@ -978,8 +978,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");
 

diff --git a/tests/topotests/pbr_topo1/r1/pbr-map.json b/tests/topotests/pbr_topo1/r1/pbr-map.json
@@ -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"