diff options
| author | Donald Sharp <donaldsharp72@gmail.com> | 2022-08-12 20:29:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-12 20:29:47 -0400 |
| commit | 0b368b50dd359fcc2972fc2be0cc62390b55211d (patch) | |
| tree | 9e5de2b22e4b915c7683cb6731fe5964ab437584 /ospf6d/ospf6_interface.c | |
| parent | b481e15d7e38dcfc48ca2b00e5a19bb8be7248eb (diff) | |
| parent | 97b4474de1ccc3b3b7eaad28c418fa5b5e6088c3 (diff) | |
Merge pull request #11785 from opensourcerouting/fix/remove_ospf6Enabled_from_JSON
ospf6d: Remove ospf6Enabled from JSON output
Diffstat (limited to 'ospf6d/ospf6_interface.c')
| -rw-r--r-- | ospf6d/ospf6_interface.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index 9bc81398c6..155374d3f0 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -966,10 +966,6 @@ static const char *ospf6_iftype_str(uint8_t iftype) return "UNKNOWN"; } -#if CONFDATE > 20220709 -CPP_NOTICE("Time to remove ospf6Enabled from JSON output") -#endif - /* show specified interface structure */ static int ospf6_interface_show(struct vty *vty, struct interface *ifp, json_object *json_obj, bool use_json) @@ -996,11 +992,8 @@ static int ospf6_interface_show(struct vty *vty, struct interface *ifp, ospf6_iftype_str(default_iftype)); json_object_int_add(json_obj, "interfaceId", ifp->ifindex); - if (ifp->info == NULL) { - json_object_boolean_false_add(json_obj, "ospf6Enabled"); + if (ifp->info == NULL) return 0; - } - json_object_boolean_true_add(json_obj, "ospf6Enabled"); oi = (struct ospf6_interface *)ifp->info; |