1 files changed, 44 insertions, 18 deletions

diff --git a/bgpd/bgp_damp.c b/bgpd/bgp_damp.c
index 6726dd6160..90b7958c43 100644
--- a/bgpd/bgp_damp.c
+++ b/bgpd/bgp_damp.c
@@ -653,21 +653,42 @@ const char *bgp_damp_reuse_time_vty(struct vty *vty, struct bgp_path_info *path,
 }
 
 static int bgp_print_dampening_parameters(struct bgp *bgp, struct vty *vty,
-					  afi_t afi, safi_t safi)
+					  afi_t afi, safi_t safi, bool use_json)
 {
 	if (CHECK_FLAG(bgp->af_flags[afi][safi], BGP_CONFIG_DAMPENING)) {
-		vty_out(vty, "Half-life time: %lld min\n",
-			(long long)damp[afi][safi].half_life / 60);
-		vty_out(vty, "Reuse penalty: %d\n",
-			damp[afi][safi].reuse_limit);
-		vty_out(vty, "Suppress penalty: %d\n",
-			damp[afi][safi].suppress_value);
-		vty_out(vty, "Max suppress time: %lld min\n",
-			(long long)damp[afi][safi].max_suppress_time / 60);
-		vty_out(vty, "Max suppress penalty: %u\n",
-			damp[afi][safi].ceiling);
-		vty_out(vty, "\n");
-	} else
+		struct bgp_damp_config *bdc = &damp[afi][safi];
+
+		if (use_json) {
+			json_object *json = json_object_new_object();
+
+			json_object_int_add(json, "halfLifeSecs",
+					    bdc->half_life);
+			json_object_int_add(json, "reusePenalty",
+					    bdc->reuse_limit);
+			json_object_int_add(json, "suppressPenalty",
+					    bdc->suppress_value);
+			json_object_int_add(json, "maxSuppressTimeSecs",
+					    bdc->max_suppress_time);
+			json_object_int_add(json, "maxSuppressPenalty",
+					    bdc->ceiling);
+
+			vty_out(vty, "%s\n",
+				json_object_to_json_string_ext(
+					json, JSON_C_TO_STRING_PRETTY));
+			json_object_free(json);
+		} else {
+			vty_out(vty, "Half-life time: %lld min\n",
+				(long long)bdc->half_life / 60);
+			vty_out(vty, "Reuse penalty: %d\n", bdc->reuse_limit);
+			vty_out(vty, "Suppress penalty: %d\n",
+				bdc->suppress_value);
+			vty_out(vty, "Max suppress time: %lld min\n",
+				(long long)bdc->max_suppress_time / 60);
+			vty_out(vty, "Max suppress penalty: %u\n",
+				bdc->ceiling);
+			vty_out(vty, "\n");
+		}
+	} else if (!use_json)
 		vty_out(vty, "dampening not enabled for %s\n",
 			get_afi_safi_str(afi, safi, false));
 
@@ -678,6 +699,8 @@ int bgp_show_dampening_parameters(struct vty *vty, afi_t afi, safi_t safi,
 				  uint16_t show_flags)
 {
 	struct bgp *bgp;
+	bool use_json = CHECK_FLAG(show_flags, BGP_SHOW_OPT_JSON);
+
 	bgp = bgp_get_default();
 
 	if (bgp == NULL) {
@@ -686,7 +709,8 @@ int bgp_show_dampening_parameters(struct vty *vty, afi_t afi, safi_t safi,
 	}
 
 	if (!CHECK_FLAG(show_flags, BGP_SHOW_OPT_AFI_ALL))
-		return bgp_print_dampening_parameters(bgp, vty, afi, safi);
+		return bgp_print_dampening_parameters(bgp, vty, afi, safi,
+						      use_json);
 
 	if (CHECK_FLAG(show_flags, BGP_SHOW_OPT_AFI_IP)
 	    || CHECK_FLAG(show_flags, BGP_SHOW_OPT_AFI_IP6)) {
@@ -697,11 +721,12 @@ int bgp_show_dampening_parameters(struct vty *vty, afi_t afi, safi_t safi,
 				     "Unknown"))
 				continue;
 
-			if (!CHECK_FLAG(show_flags, BGP_SHOW_OPT_JSON))
+			if (!use_json)
 				vty_out(vty, "\nFor address family: %s\n\n",
 					get_afi_safi_str(afi, safi, false));
 
-			bgp_print_dampening_parameters(bgp, vty, afi, safi);
+			bgp_print_dampening_parameters(bgp, vty, afi, safi,
+						       use_json);
 		}
 	} else {
 		FOREACH_AFI_SAFI (afi, safi) {
@@ -709,11 +734,12 @@ int bgp_show_dampening_parameters(struct vty *vty, afi_t afi, safi_t safi,
 				     "Unknown"))
 				continue;
 
-			if (!CHECK_FLAG(show_flags, BGP_SHOW_OPT_JSON))
+			if (!use_json)
 				vty_out(vty, "\nFor address family: %s\n",
 					get_afi_safi_str(afi, safi, false));
 
-			bgp_print_dampening_parameters(bgp, vty, afi, safi);
+			bgp_print_dampening_parameters(bgp, vty, afi, safi,
+						       use_json);
 		}
 	}
 	return CMD_SUCCESS;