From: Chirag Shah <chirag@nvidia.com>
Date: Fri, 20 Oct 2023 05:07:15 +0000 (-0700)
Subject: pbrd: fix map seq installed flag in json
X-Git-Tag: docker/9.0.3~52^2
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=refs%2Fpull%2F14951%2Fhead;p=mirror%2Ffrr.git

pbrd: fix map seq installed flag in json

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 64745d413ccf0b87df540bcf9e8a2b1dcbb893e2)
---

diff --git a/pbrd/pbr_vty.c b/pbrd/pbr_vty.c
index 0325c79c3c..105190abc9 100644
--- 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
index bfa0ecb849..aaf2b5e8dc 100644
--- 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"