bgpd: Rename some BGP_PATH_XXX to BGP_PATH_SHOW_XXX

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 1693147b8924b2b6185da0362ea39ebd619c1539..a46a7634efc0912d1b9da63058a5d48c2e5fff1d 100644 (file)
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -8849,11 +8849,11 @@ static int bgp_show_route_in_table(struct vty *vty, struct bgp *bgp,
                                }
                                display++;
 
-                               if (pathtype == BGP_PATH_ALL
-                                   || (pathtype == BGP_PATH_BESTPATH
+                               if (pathtype == BGP_PATH_SHOW_ALL
+                                   || (pathtype == BGP_PATH_SHOW_BESTPATH
                                        && CHECK_FLAG(ri->flags,
                                                      BGP_INFO_SELECTED))
-                                   || (pathtype == BGP_PATH_MULTIPATH
+                                   || (pathtype == BGP_PATH_SHOW_MULTIPATH
                                        && (CHECK_FLAG(ri->flags,
                                                       BGP_INFO_MULTIPATH)
                                            || CHECK_FLAG(ri->flags,
@@ -8886,12 +8886,14 @@ static int bgp_show_route_in_table(struct vty *vty, struct bgp *bgp,
                                        }
                                        display++;
 
-                                       if (pathtype == BGP_PATH_ALL
-                                           || (pathtype == BGP_PATH_BESTPATH
+                                       if (pathtype == BGP_PATH_SHOW_ALL
+                                           || (pathtype
+                                                       == BGP_PATH_SHOW_BESTPATH
                                                && CHECK_FLAG(
                                                           ri->flags,
                                                           BGP_INFO_SELECTED))
-                                           || (pathtype == BGP_PATH_MULTIPATH
+                                           || (pathtype
+                                                       == BGP_PATH_SHOW_MULTIPATH
                                                && (CHECK_FLAG(
                                                            ri->flags,
                                                            BGP_INFO_MULTIPATH)
@@ -9344,11 +9346,11 @@ DEFUN (show_ip_bgp_route,
 
        /* [<bestpath|multipath>] */
        if (argv_find(argv, argc, "bestpath", &idx))
-               path_type = BGP_PATH_BESTPATH;
+               path_type = BGP_PATH_SHOW_BESTPATH;
        else if (argv_find(argv, argc, "multipath", &idx))
-               path_type = BGP_PATH_MULTIPATH;
+               path_type = BGP_PATH_SHOW_MULTIPATH;
        else
-               path_type = BGP_PATH_ALL;
+               path_type = BGP_PATH_SHOW_ALL;
 
        return bgp_show_route(vty, bgp, prefix, afi, safi, NULL, prefix_check,
                              path_type, uj);
@@ -10115,7 +10117,7 @@ DEFUN (show_ip_bgp_vpn_all_route_prefix,
        }
 
        return bgp_show_route(vty, bgp, network, AFI_IP, SAFI_MPLS_VPN, NULL, 0,
-                             BGP_PATH_ALL, use_json(argc, argv));
+                             BGP_PATH_SHOW_ALL, use_json(argc, argv));
 }
 #endif /* KEEP_OLD_VPN_COMMANDS */
 
@@ -10144,7 +10146,7 @@ DEFUN (show_ip_bgp_l2vpn_evpn_all_route_prefix,
                return CMD_WARNING;
        }
        return bgp_show_route(vty, NULL, network, AFI_L2VPN, SAFI_EVPN, NULL, 0,
-                             BGP_PATH_ALL, use_json(argc, argv));
+                             BGP_PATH_SHOW_ALL, use_json(argc, argv));
 }
 
 static void show_adj_route(struct vty *vty, struct peer *peer, afi_t afi,
@@ -10757,7 +10759,7 @@ DEFUN (show_bgp_afi_vpn_rd_route,
        }
 
        return bgp_show_route(vty, NULL, argv[6]->arg, afi, SAFI_MPLS_VPN, &prd,
-                             0, BGP_PATH_ALL, use_json(argc, argv));
+                             0, BGP_PATH_SHOW_ALL, use_json(argc, argv));
 }
 
 static struct bgp_distance *bgp_distance_new(void)

diff --git a/bgpd/bgp_route.h b/bgpd/bgp_route.h
index 476bb3aa0508d3586bad6223cca95271ffdeacab..c644ab62f7edb3fa6ddb18a4b751691451a29af2 100644 (file)
--- a/bgpd/bgp_route.h
+++ b/bgpd/bgp_route.h
@@ -318,7 +318,11 @@ struct bgp_static {
 /* path PREFIX (addpath rxid NUMBER) */
 #define PATH_ADDPATH_STR_BUFFER PREFIX2STR_BUFFER + 32
 
-enum bgp_path_type { BGP_PATH_ALL, BGP_PATH_BESTPATH, BGP_PATH_MULTIPATH };
+enum bgp_path_type {
+       BGP_PATH_SHOW_ALL,
+       BGP_PATH_SHOW_BESTPATH,
+       BGP_PATH_SHOW_MULTIPATH
+};
 
 static inline void bgp_bump_version(struct bgp_node *node)
 {