From 58971e1574911fd5bd4f6385c2fa93c999e33604 Mon Sep 17 00:00:00 2001
From: Sarita Patra <saritap@vmware.com>
Date: Wed, 8 Feb 2023 23:38:18 -0800
Subject: [PATCH] pim6d: Modify "show ipv6 mld join json" o/p

Currently "show ipv6 mld join json" o/p is
frr# show ipv6 mld joins json
{
  "default":{
    "ens192":{
      "ff02:2":{
        "::":{
          "state":"JOIN",
          "created":"00:01:50.595",
          "lastSeen":"00:00:38.403",
        }
      }
    }
  }
}

Here, I modified the o/p as below for better understanding.
frr# show ipv6 mld joins json
{
  "default":{
    "vrf":"default",
    "ens192":{
      "ff02::2":{
        "*":{
          "state":"JOIN",
          "created":"00:00:42.766",
          "lastSeen":"00:00:05.266"
        }
      }
    }
  }
}

Issue: #12755

Signed-off-by: Sarita Patra <saritap@vmware.com>
---
 pimd/pim6_mld.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pimd/pim6_mld.c b/pimd/pim6_mld.c
index dc5e67e2c5..6faa53afe0 100644
--- a/pimd/pim6_mld.c
+++ b/pimd/pim6_mld.c
@@ -2737,7 +2737,7 @@ static void gm_show_joins_one(struct vty *vty, struct gm_if *gm_ifp,
 		}
 
 		js_src = json_object_new_object();
-		json_object_object_addf(js_group, js_src, "%pPA",
+		json_object_object_addf(js_group, js_src, "%pPAs",
 					&sg->sgaddr.src);
 
 		json_object_string_add(js_src, "state", gm_states[sg->state]);
@@ -2800,6 +2800,7 @@ static void gm_show_joins_vrf(struct vty *vty, struct vrf *vrf,
 
 	if (js) {
 		js_vrf = json_object_new_object();
+		json_object_string_add(js_vrf, "vrf", vrf->name);
 		json_object_object_add(js, vrf->name, js_vrf);
 	}
 
-- 
2.39.5