zebra: vrf aware routmap is missing in Zebra #2802(Part 4 of 4)

The new cli for show output

Signed-off-by: vishaldhingra vdhingra@vmware.com

diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c
index 3b7577205ce4042ae8da5e659856eded3f891d88..bacef498362b4c23ed40b50813f21a7d90ca24e4 100644 (file)
--- a/zebra/zebra_routemap.c
+++ b/zebra/zebra_routemap.c
@@ -45,9 +45,6 @@
 
 static uint32_t zebra_rmap_update_timer = ZEBRA_RMAP_DEFAULT_UPDATE_TIMER;
 static struct thread *zebra_t_rmap_update = NULL;
-char *proto_rm[AFI_MAX][ZEBRA_ROUTE_MAX + 1]; /* "any" == ZEBRA_ROUTE_MAX */
-/* NH Tracking route map */
-char *nht_rm[AFI_MAX][ZEBRA_ROUTE_MAX + 1]; /* "any" == ZEBRA_ROUTE_MAX */
 char *zebra_import_table_routemap[AFI_MAX][ZEBRA_KERNEL_TABLE_MAX];
 
 struct nh_rmap_obj {
@@ -203,6 +200,117 @@ static void route_match_interface_free(void *rule)
        XFREE(MTYPE_ROUTE_MAP_COMPILED, rule);
 }
 
+static void show_vrf_proto_rm(struct vty *vty, struct zebra_vrf *zvrf,
+                             int af_type)
+{
+       int i;
+
+       vty_out(vty, "Protocol    : route-map\n");
+       vty_out(vty, "------------------------\n");
+
+       for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
+               if (PROTO_RM_NAME(zvrf, af_type, i))
+                       vty_out(vty, "%-10s  : %-10s\n", zebra_route_string(i),
+                               PROTO_RM_NAME(zvrf, af_type, i));
+               else
+                       vty_out(vty, "%-10s  : none\n", zebra_route_string(i));
+       }
+
+       if (PROTO_RM_NAME(zvrf, af_type, i))
+               vty_out(vty, "%-10s  : %-10s\n", "any",
+                       PROTO_RM_NAME(zvrf, af_type, i));
+       else
+               vty_out(vty, "%-10s  : none\n", "any");
+}
+
+static void show_vrf_nht_rm(struct vty *vty, struct zebra_vrf *zvrf,
+                           int af_type)
+{
+       int i;
+
+       vty_out(vty, "Protocol    : route-map\n");
+       vty_out(vty, "------------------------\n");
+
+       for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
+               if (NHT_RM_NAME(zvrf, af_type, i))
+                       vty_out(vty, "%-10s  : %-10s\n", zebra_route_string(i),
+                               NHT_RM_NAME(zvrf, af_type, i));
+               else
+                       vty_out(vty, "%-10s  : none\n", zebra_route_string(i));
+       }
+
+       if (NHT_RM_NAME(zvrf, af_type, i))
+               vty_out(vty, "%-10s  : %-10s\n", "any",
+                       NHT_RM_NAME(zvrf, af_type, i));
+       else
+               vty_out(vty, "%-10s  : none\n", "any");
+}
+
+static int show_proto_rm(struct vty *vty, int af_type, const char *vrf_all,
+                        const char *vrf_name)
+{
+       struct zebra_vrf *zvrf;
+
+       if (vrf_all) {
+               struct vrf *vrf;
+
+               RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
+                       zvrf = (struct zebra_vrf *)vrf->info;
+                       if (zvrf == NULL)
+                               continue;
+                       vty_out(vty, "VRF: %s\n", zvrf->vrf->name);
+                       show_vrf_proto_rm(vty, zvrf, af_type);
+               }
+       } else {
+               vrf_id_t vrf_id = VRF_DEFAULT;
+
+               if (vrf_name)
+                       VRF_GET_ID(vrf_id, vrf_name, false);
+
+               zvrf = zebra_vrf_lookup_by_id(vrf_id);
+               if (!zvrf)
+                       return CMD_SUCCESS;
+
+               vty_out(vty, "VRF: %s\n", zvrf->vrf->name);
+               show_vrf_proto_rm(vty, zvrf, af_type);
+       }
+
+       return CMD_SUCCESS;
+}
+
+static int show_nht_rm(struct vty *vty, int af_type, const char *vrf_all,
+                      const char *vrf_name)
+{
+       struct zebra_vrf *zvrf;
+
+       if (vrf_all) {
+               struct vrf *vrf;
+
+               RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) {
+                       zvrf = (struct zebra_vrf *)vrf->info;
+                       if (zvrf == NULL)
+                               continue;
+
+                       vty_out(vty, "VRF: %s\n", zvrf->vrf->name);
+                       show_vrf_nht_rm(vty, zvrf, af_type);
+               }
+       } else {
+               vrf_id_t vrf_id = VRF_DEFAULT;
+
+               if (vrf_name)
+                       VRF_GET_ID(vrf_id, vrf_name, false);
+
+               zvrf = zebra_vrf_lookup_by_id(vrf_id);
+               if (!zvrf)
+                       return CMD_SUCCESS;
+
+               vty_out(vty, "VRF: %s\n", zvrf->vrf->name);
+               show_vrf_nht_rm(vty, zvrf, af_type);
+       }
+
+       return CMD_SUCCESS;
+}
+
 /* Route map commands for interface matching */
 struct route_map_rule_cmd route_match_interface_cmd = {
        "interface", route_match_interface, route_match_interface_compile,
@@ -645,30 +753,17 @@ DEFPY (no_ip_protocol,
        return ret;
 }
 
-DEFUN (show_ip_protocol,
+DEFPY (show_ip_protocol,
        show_ip_protocol_cmd,
-       "show ip protocol",
-        SHOW_STR
-        IP_STR
-       "IP protocol filtering status\n")
+       "show ip protocol [vrf <NAME$vrf_name|all$vrf_all>]",
+       SHOW_STR
+       IP_STR
+       "IP protocol filtering status\n"
+       VRF_FULL_CMD_HELP_STR)
 {
-       int i;
-
-       vty_out(vty, "Protocol    : route-map \n");
-       vty_out(vty, "------------------------\n");
-       for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
-               if (proto_rm[AFI_IP][i])
-                       vty_out(vty, "%-10s  : %-10s\n", zebra_route_string(i),
-                               proto_rm[AFI_IP][i]);
-               else
-                       vty_out(vty, "%-10s  : none\n", zebra_route_string(i));
-       }
-       if (proto_rm[AFI_IP][i])
-               vty_out(vty, "%-10s  : %-10s\n", "any", proto_rm[AFI_IP][i]);
-       else
-               vty_out(vty, "%-10s  : none\n", "any");
+       int ret = show_proto_rm(vty, AFI_IP, vrf_all, vrf_name);
 
-       return CMD_SUCCESS;
+       return ret;
 }
 
 DEFPY (ipv6_protocol,
@@ -734,30 +829,17 @@ DEFPY (no_ipv6_protocol,
        return ret;
 }
 
-DEFUN (show_ipv6_protocol,
+DEFPY (show_ipv6_protocol,
        show_ipv6_protocol_cmd,
-       "show ipv6 protocol",
-        SHOW_STR
-        IP6_STR
-       "IPv6 protocol filtering status\n")
+       "show ipv6 protocol [vrf <NAME$vrf_name|all$vrf_all>]",
+       SHOW_STR
+       IP6_STR
+       "IPv6 protocol filtering status\n"
+       VRF_FULL_CMD_HELP_STR)
 {
-       int i;
-
-       vty_out(vty, "Protocol    : route-map \n");
-       vty_out(vty, "------------------------\n");
-       for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
-               if (proto_rm[AFI_IP6][i])
-                       vty_out(vty, "%-10s  : %-10s\n", zebra_route_string(i),
-                               proto_rm[AFI_IP6][i]);
-               else
-                       vty_out(vty, "%-10s  : none\n", zebra_route_string(i));
-       }
-       if (proto_rm[AFI_IP6][i])
-               vty_out(vty, "%-10s  : %-10s\n", "any", proto_rm[AFI_IP6][i]);
-       else
-               vty_out(vty, "%-10s  : none\n", "any");
+       int ret = show_proto_rm(vty, AFI_IP6, vrf_all, vrf_name);
 
-       return CMD_SUCCESS;
+       return ret;
 }
 
 DEFPY (ip_protocol_nht_rmap,
@@ -824,31 +906,18 @@ DEFPY (no_ip_protocol_nht_rmap,
        return ret;
 }
 
-DEFUN (show_ip_protocol_nht,
+DEFPY (show_ip_protocol_nht,
        show_ip_protocol_nht_cmd,
-       "show ip nht route-map",
+       "show ip nht route-map [vrf <NAME$vrf_name|all$vrf_all>]",
        SHOW_STR
        IP_STR
        "IP nexthop tracking table\n"
-       "IP Next Hop tracking filtering status\n")
+       "IP Next Hop tracking filtering status\n"
+       VRF_FULL_CMD_HELP_STR)
 {
-       int i;
+       int ret = show_nht_rm(vty, AFI_IP, vrf_all, vrf_name);
 
-       vty_out(vty, "Protocol    : route-map \n");
-       vty_out(vty, "------------------------\n");
-       for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
-               if (nht_rm[AFI_IP][i])
-                       vty_out(vty, "%-10s  : %-10s\n", zebra_route_string(i),
-                               nht_rm[AFI_IP][i]);
-               else
-                       vty_out(vty, "%-10s  : none\n", zebra_route_string(i));
-       }
-       if (nht_rm[AFI_IP][i])
-               vty_out(vty, "%-10s  : %-10s\n", "any", nht_rm[AFI_IP][i]);
-       else
-               vty_out(vty, "%-10s  : none\n", "any");
-
-       return CMD_SUCCESS;
+       return ret;
 }
 
 DEFPY (ipv6_protocol_nht_rmap,
@@ -914,31 +983,18 @@ DEFPY (no_ipv6_protocol_nht_rmap,
        return ret;
 }
 
-DEFUN (show_ipv6_protocol_nht,
+DEFPY (show_ipv6_protocol_nht,
        show_ipv6_protocol_nht_cmd,
-       "show ipv6 nht route-map",
+       "show ipv6 nht route-map [vrf <NAME$vrf_name|all$vrf_all>]",
        SHOW_STR
        IP6_STR
        "Next Hop filtering status\n"
-       "Route-map\n")
+       "Route-map\n"
+       VRF_FULL_CMD_HELP_STR)
 {
-       int i;
+       int ret = show_nht_rm(vty, AFI_IP6, vrf_all, vrf_name);
 
-       vty_out(vty, "Protocol    : route-map \n");
-       vty_out(vty, "------------------------\n");
-       for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
-               if (nht_rm[AFI_IP6][i])
-                       vty_out(vty, "%-10s  : %-10s\n", zebra_route_string(i),
-                               nht_rm[AFI_IP6][i]);
-               else
-                       vty_out(vty, "%-10s  : none\n", zebra_route_string(i));
-       }
-       if (nht_rm[AFI_IP][i])
-               vty_out(vty, "%-10s  : %-10s\n", "any", nht_rm[AFI_IP6][i]);
-       else
-               vty_out(vty, "%-10s  : none\n", "any");
-
-       return CMD_SUCCESS;
+       return ret;
 }
 
 /*XXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
@@ -1699,43 +1755,54 @@ static void zebra_route_map_event(route_map_event_t event,
 }
 
 /* ip protocol configuration write function */
-void zebra_routemap_config_write_protocol(struct vty *vty)
+void zebra_routemap_config_write_protocol(struct vty *vty,
+                                         struct zebra_vrf *zvrf)
 {
        int i;
+       char space[2];
 
-       for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
-               if (proto_rm[AFI_IP][i])
-                       vty_out(vty, "ip protocol %s route-map %s\n",
-                               zebra_route_string(i), proto_rm[AFI_IP][i]);
-
-               if (proto_rm[AFI_IP6][i])
-                       vty_out(vty, "ipv6 protocol %s route-map %s\n",
-                               zebra_route_string(i), proto_rm[AFI_IP6][i]);
+       memset(space, 0, sizeof(space));
 
-               if (nht_rm[AFI_IP][i])
-                       vty_out(vty, "ip nht %s route-map %s\n",
-                               zebra_route_string(i), nht_rm[AFI_IP][i]);
+       if (zvrf_id(zvrf) != VRF_DEFAULT)
+               sprintf(space, "%s", " ");
 
-               if (nht_rm[AFI_IP6][i])
-                       vty_out(vty, "ipv6 nht %s route-map %s\n",
-                               zebra_route_string(i), nht_rm[AFI_IP6][i]);
+       for (i = 0; i < ZEBRA_ROUTE_MAX; i++) {
+               if (PROTO_RM_NAME(zvrf, AFI_IP, i))
+                       vty_out(vty, "%sip protocol %s route-map %s\n", space,
+                               zebra_route_string(i),
+                               PROTO_RM_NAME(zvrf, AFI_IP, i));
+
+               if (PROTO_RM_NAME(zvrf, AFI_IP6, i))
+                       vty_out(vty, "%sipv6 protocol %s route-map %s\n", space,
+                               zebra_route_string(i),
+                               PROTO_RM_NAME(zvrf, AFI_IP6, i));
+
+               if (NHT_RM_NAME(zvrf, AFI_IP, i))
+                       vty_out(vty, "%sip nht %s route-map %s\n", space,
+                               zebra_route_string(i),
+                               NHT_RM_NAME(zvrf, AFI_IP, i));
+
+               if (NHT_RM_NAME(zvrf, AFI_IP6, i))
+                       vty_out(vty, "%sipv6 nht %s route-map %s\n", space,
+                               zebra_route_string(i),
+                               NHT_RM_NAME(zvrf, AFI_IP6, i));
        }
 
-       if (proto_rm[AFI_IP][ZEBRA_ROUTE_MAX])
-               vty_out(vty, "ip protocol %s route-map %s\n", "any",
-                       proto_rm[AFI_IP][ZEBRA_ROUTE_MAX]);
+       if (PROTO_RM_NAME(zvrf, AFI_IP, ZEBRA_ROUTE_MAX))
+               vty_out(vty, "%sip protocol %s route-map %s\n", space, "any",
+                       PROTO_RM_NAME(zvrf, AFI_IP, ZEBRA_ROUTE_MAX));
 
-       if (proto_rm[AFI_IP6][ZEBRA_ROUTE_MAX])
-               vty_out(vty, "ipv6 protocol %s route-map %s\n", "any",
-                       proto_rm[AFI_IP6][ZEBRA_ROUTE_MAX]);
+       if (PROTO_RM_NAME(zvrf, AFI_IP6, ZEBRA_ROUTE_MAX))
+               vty_out(vty, "%sipv6 protocol %s route-map %s\n", space, "any",
+                       PROTO_RM_NAME(zvrf, AFI_IP6, ZEBRA_ROUTE_MAX));
 
-       if (nht_rm[AFI_IP][ZEBRA_ROUTE_MAX])
-               vty_out(vty, "ip nht %s route-map %s\n", "any",
-                       nht_rm[AFI_IP][ZEBRA_ROUTE_MAX]);
+       if (NHT_RM_NAME(zvrf, AFI_IP, ZEBRA_ROUTE_MAX))
+               vty_out(vty, "%sip nht %s route-map %s\n", space, "any",
+                       NHT_RM_NAME(zvrf, AFI_IP, ZEBRA_ROUTE_MAX));
 
-       if (nht_rm[AFI_IP6][ZEBRA_ROUTE_MAX])
-               vty_out(vty, "ipv6 nht %s route-map %s\n", "any",
-                       nht_rm[AFI_IP6][ZEBRA_ROUTE_MAX]);
+       if (NHT_RM_NAME(zvrf, AFI_IP6, ZEBRA_ROUTE_MAX))
+               vty_out(vty, "%sipv6 nht %s route-map %s\n", space, "any",
+                       NHT_RM_NAME(zvrf, AFI_IP6, ZEBRA_ROUTE_MAX));
 
        if (zebra_rmap_update_timer != ZEBRA_RMAP_DEFAULT_UPDATE_TIMER)
                vty_out(vty, "zebra route-map delay-timer %d\n",

diff --git a/zebra/zebra_routemap.h b/zebra/zebra_routemap.h
index 62ba8de6709cf00ef649a0ba571f38dbf83ef79e..a8579e7c6eedc93f217e1b12354db0666d063a19 100644 (file)
--- a/zebra/zebra_routemap.h
+++ b/zebra/zebra_routemap.h
@@ -25,7 +25,8 @@
 #include "lib/routemap.h"
 
 extern void zebra_route_map_init(void);
-extern void zebra_routemap_config_write_protocol(struct vty *vty);
+extern void zebra_routemap_config_write_protocol(struct vty *vty,
+                                                struct zebra_vrf *vrf);
 extern char *zebra_get_import_table_route_map(afi_t afi, uint32_t table);
 extern void zebra_add_import_table_route_map(afi_t afi, const char *rmap_name,
                                             uint32_t table);
@@ -36,9 +37,8 @@ extern void zebra_route_map_write_delay_timer(struct vty *);
 extern route_map_result_t
 zebra_import_table_route_map_check(int family, int rib_type, uint8_t instance,
                                   const struct prefix *p,
-                                  struct nexthop *nexthop,
-                                  vrf_id_t vrf_id, route_tag_t tag,
-                                  const char *rmap_name);
+                                  struct nexthop *nexthop, vrf_id_t vrf_id,
+                                  route_tag_t tag, const char *rmap_name);
 extern route_map_result_t
 zebra_route_map_check(int family, int rib_type, uint8_t instance,
                      const struct prefix *p, struct nexthop *nexthop,

diff --git a/zebra/zebra_vrf.c b/zebra/zebra_vrf.c
index 9a0ebbaba78686c6f67685fbbcca9c7b9df661a9..a1692d3c3e4ce03c73c044fae42bd403e2f7904d 100644 (file)
--- a/zebra/zebra_vrf.c
+++ b/zebra/zebra_vrf.c
@@ -39,6 +39,7 @@
 #include "zebra/zebra_mpls.h"
 #include "zebra/zebra_vxlan.h"
 #include "zebra/zebra_netns_notify.h"
+#include "zebra/zebra_routemap.h"
 
 extern struct zebra_t zebrad;
 
@@ -481,7 +482,6 @@ static int vrf_config_write(struct vty *vty)
                if (zvrf_id(zvrf) == VRF_DEFAULT) {
                        if (zvrf->l3vni)
                                vty_out(vty, "vni %u\n", zvrf->l3vni);
-                       vty_out(vty, "!\n");
                } else {
                        vty_frame(vty, "vrf %s\n", zvrf_name(zvrf));
                        if (zvrf->l3vni)
@@ -491,11 +491,14 @@ static int vrf_config_write(struct vty *vty)
                                                ? " prefix-routes-only"
                                                : "");
                        zebra_ns_config_write(vty, (struct ns *)vrf->ns_ctxt);
-
                }
 
+               zebra_routemap_config_write_protocol(vty, zvrf);
+
                if (zvrf_id(zvrf) != VRF_DEFAULT)
                        vty_endframe(vty, " exit-vrf\n!\n");
+               else
+                       vty_out(vty, "!\n");
        }
        return 0;
 }

diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index 7a34ab9f5f3c85046b833ede189444c1975fa02a..fdedb30f84ec55805f2e1746097ccd9a752fbbb7 100644 (file)
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -2374,9 +2374,6 @@ static int config_write_protocol(struct vty *vty)
                                                                      == MCAST_MIX_DISTANCE
                                                              ? "lower-distance"
                                                              : "longer-prefix");
-
-       zebra_routemap_config_write_protocol(vty);
-
        return 1;
 }