diff options
| -rw-r--r-- | bgpd/bgp_updgrp.c | 3 | ||||
| -rw-r--r-- | tests/topotests/ospf_gr_helper/ospf_gr_helper.json | 10 |
2 files changed, 7 insertions, 6 deletions
diff --git a/bgpd/bgp_updgrp.c b/bgpd/bgp_updgrp.c index ee0def29b3..afd2107b48 100644 --- a/bgpd/bgp_updgrp.c +++ b/bgpd/bgp_updgrp.c @@ -775,7 +775,8 @@ static int update_group_show_walkcb(struct update_group *updgrp, void *arg) : ""); } } - json_subgrps = json_object_new_array(); + if (ctx->uj) + json_subgrps = json_object_new_array(); UPDGRP_FOREACH_SUBGRP (updgrp, subgrp) { if (ctx->subgrp_id && (ctx->subgrp_id != subgrp->id)) continue; diff --git a/tests/topotests/ospf_gr_helper/ospf_gr_helper.json b/tests/topotests/ospf_gr_helper/ospf_gr_helper.json index efd339ef88..b9ca02289d 100644 --- a/tests/topotests/ospf_gr_helper/ospf_gr_helper.json +++ b/tests/topotests/ospf_gr_helper/ospf_gr_helper.json @@ -17,7 +17,7 @@ "ospf": { "area": "0.0.0.0", "hello_interval": 1, - "dead_interval": 40, + "dead_interval": 4, "priority": 98 } }, @@ -26,7 +26,7 @@ "ospf": { "area": "0.0.0.0", "hello_interval": 1, - "dead_interval": 40, + "dead_interval": 4, "priority": 99 } }, @@ -35,7 +35,7 @@ "ospf": { "area": "0.0.0.0", "hello_interval": 1, - "dead_interval": 40, + "dead_interval": 4, "priority": 0 } }, @@ -44,7 +44,7 @@ "ospf": { "area": "0.0.0.0", "hello_interval": 1, - "dead_interval": 40, + "dead_interval": 4, "priority": 0 } } @@ -116,4 +116,4 @@ } } } -}
\ No newline at end of file +} |