]> git.puffer.fish Git - matthieu/frr.git/commitdiff
isisd: change the json output for isis routes
authorPhilippe Guibert <philippe.guibert@6wind.com>
Wed, 19 Jun 2024 14:10:48 +0000 (16:10 +0200)
committerPhilippe Guibert <philippe.guibert@6wind.com>
Fri, 21 Jun 2024 13:40:23 +0000 (15:40 +0200)
The json format for json routes should be compliant with caml format.

Before:

> "Prefix|Metric|Interface|Nexthop|SID|LabelOp|Algo":
> "Prefix|Metric|Interface|Nexthop|Label(s)");

After:

> "prefix|metric|interface|nextHop|segmentIdentifier|labelOperation|Algorithm":
> "prefix|metric|interface|nextHop|label(s)");

Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
isisd/isis_spf.c

index d6ce76960be60ecb148e97708b66fe4fffcedb38..7aa9147e71c0d635d4928ac5bf04f0fd5b732a5f 100644 (file)
@@ -3015,7 +3015,11 @@ void isis_print_routes(struct vty *vty, struct isis_spftree *spftree,
                vty_out(vty, "%s\n", table);
                XFREE(MTYPE_TMP, table);
        } else if (json) {
-               *json = ttable_json(tt, prefix_sid ? "sdssdsdd" : "sdsss");
+               *json = ttable_json_with_json_text(
+                       tt, prefix_sid ? "sdssdsdd" : "sdsss",
+                       prefix_sid
+                               ? "prefix|metric|interface|nextHop|segmentIdentifier|labelOperation|Algorithm"
+                               : "prefix|metric|interface|nextHop|label(s)");
        }
        ttable_del(tt);
 }