From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Tue, 12 Jun 2018 19:54:23 +0000 (+0000)
Subject: pbrd: remove json options
X-Git-Tag: frr-6.1-dev~279^2~5
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=ef18ed6e93bd39928bd42f77b4b069dfbe795c5b;p=matthieu%2Ffrr.git

pbrd: remove json options

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---

diff --git a/pbrd/pbr_vty.c b/pbrd/pbr_vty.c
index 79d42a42c3..7eeb8cd348 100644
--- a/pbrd/pbr_vty.c
+++ b/pbrd/pbr_vty.c
@@ -26,7 +26,6 @@
 #include "nexthop.h"
 #include "nexthop_group.h"
 #include "log.h"
-#include "json.h"
 #include "debug.h"
 
 #include "pbrd/pbr_nht.h"
@@ -382,10 +381,9 @@ DEFPY (pbr_policy,
 
 DEFPY (show_pbr,
 	show_pbr_cmd,
-	"show pbr [json$json]",
+	"show pbr",
 	SHOW_STR
-	"Policy Based Routing\n"
-	JSON_STR)
+	"Policy Based Routing\n")
 {
 	pbr_nht_write_table_range(vty);
 	pbr_nht_write_rule_range(vty);
@@ -395,13 +393,12 @@ DEFPY (show_pbr,
 
 DEFPY (show_pbr_map,
 	show_pbr_map_cmd,
-	"show pbr map [NAME$name] [detail$detail] [json$json]",
+	"show pbr map [NAME$name] [detail$detail]",
 	SHOW_STR
 	"Policy Based Routing\n"
 	"PBR Map\n"
 	"PBR Map Name\n"
-	"Detailed information\n"
-	JSON_STR)
+	"Detailed information\n")
 {
 	struct pbr_map_sequence *pbrms;
 	struct pbr_map *pbrm;
@@ -477,12 +474,11 @@ DEFPY(show_pbr_nexthop_group,
 
 DEFPY (show_pbr_interface,
 	show_pbr_interface_cmd,
-	"show pbr interface [NAME$name] [json$json]",
+	"show pbr interface [NAME$name]",
 	SHOW_STR
 	"Policy Based Routing\n"
 	"PBR Interface\n"
-	"PBR Interface Name\n"
-	JSON_STR)
+	"PBR Interface Name\n")
 {
 	struct interface *ifp;
 	struct vrf *vrf;