proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 13:33:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

zebra: Auto create the nexthop-vrf if needed.

Browse Source 
Currently if I try to use a nexthop-vrf that has
not been specified yet we get a failure from the cli.

Add code to zebra so that if we fail to find the nexthop-vrf
we auto create it, instead of failing the install.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2018-03-14 10:34:15 -04:00
parent 911d8ac862
commit e7f96f7411
1 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
zebra/zebra_vty.c
View File

@ -489,6 +489,34 @@ static int zebra_static_route_leak(
return CMD_SUCCESS; return CMD_SUCCESS;
} }
static struct zebra_vrf *zebra_vty_get_unknown_vrf(struct vty *vty,
const char *vrf_name)
{
struct zebra_vrf *zvrf;
struct vrf *vrf;
zvrf = zebra_vrf_lookup_by_name(vrf_name);
if (zvrf)
return zvrf;
vrf = vrf_get(VRF_UNKNOWN, vrf_name);
if (!vrf) {
vty_out(vty, "%% Could not create vrf %s\n", vrf_name);
return NULL;
}
zvrf = vrf->info;
if (!zvrf) {
vty_out(vty, "%% Could not create vrf-info %s\n",
vrf_name);
return NULL;
}
/* Mark as having FRR configuration */
vrf_set_user_cfged(vrf);
return zvrf;
}
static int zebra_static_route(struct vty *vty, afi_t afi, safi_t safi, static int zebra_static_route(struct vty *vty, afi_t afi, safi_t safi,
const char *negate, const char *dest_str, const char *negate, const char *dest_str,
const char *mask_str, const char *src_str, const char *mask_str, const char *src_str,
@ -498,7 +526,6 @@ static int zebra_static_route(struct vty *vty, afi_t afi, safi_t safi,
const char *label_str) const char *label_str)
{ {
struct zebra_vrf *zvrf; struct zebra_vrf *zvrf;
struct vrf *vrf;
/* VRF id */ /* VRF id */
zvrf = zebra_vrf_lookup_by_name(vrf_name); zvrf = zebra_vrf_lookup_by_name(vrf_name);
@ -513,19 +540,9 @@ static int zebra_static_route(struct vty *vty, afi_t afi, safi_t safi,
* Note: The VRF isn't active until we hear about it from the kernel. * Note: The VRF isn't active until we hear about it from the kernel.
*/ */
if (!zvrf) { if (!zvrf) {
vrf = vrf_get(VRF_UNKNOWN, vrf_name); zvrf = zebra_vty_get_unknown_vrf(vty, vrf_name);
if (!vrf) { if (!zvrf)
vty_out(vty, "%% Could not create vrf %s\n", vrf_name);
return CMD_WARNING_CONFIG_FAILED; return CMD_WARNING_CONFIG_FAILED;
}
zvrf = vrf->info;
if (!zvrf) {
vty_out(vty, "%% Could not create vrf-info %s\n",
vrf_name);
return CMD_WARNING_CONFIG_FAILED;
}
/* Mark as having FRR configuration */
vrf_set_user_cfged(vrf);
} }
return zebra_static_route_leak( return zebra_static_route_leak(
vty, zvrf, zvrf, afi, safi, negate, dest_str, mask_str, src_str, vty, zvrf, zvrf, afi, safi, negate, dest_str, mask_str, src_str,
@ -784,7 +801,7 @@ DEFPY(ip_route_address_interface,
} }
if (nexthop_vrf) if (nexthop_vrf)
nh_zvrf = zebra_vrf_lookup_by_name(nexthop_vrf); nh_zvrf = zebra_vty_get_unknown_vrf(vty, nexthop_vrf);
else else
nh_zvrf = zvrf; nh_zvrf = zvrf;
@ -835,7 +852,7 @@ DEFPY(ip_route_address_interface_vrf,
} }
if (nexthop_vrf) if (nexthop_vrf)
nh_zvrf = zebra_vrf_lookup_by_name(nexthop_vrf); nh_zvrf = zebra_vty_get_unknown_vrf(vty, nexthop_vrf);
else else
nh_zvrf = zvrf; nh_zvrf = zvrf;
@ -891,7 +908,7 @@ DEFPY(ip_route,
} }
if (nexthop_vrf) if (nexthop_vrf)
nh_zvrf = zebra_vrf_lookup_by_name(nexthop_vrf); nh_zvrf = zebra_vty_get_unknown_vrf(vty, nexthop_vrf);
else else
nh_zvrf = zvrf; nh_zvrf = zvrf;
@ -941,7 +958,7 @@ DEFPY(ip_route_vrf,
} }
if (nexthop_vrf) if (nexthop_vrf)
nh_zvrf = zebra_vrf_lookup_by_name(nexthop_vrf); nh_zvrf = zebra_vty_get_unknown_vrf(vty, nexthop_vrf);
else else
nh_zvrf = zvrf; nh_zvrf = zvrf;
@ -2395,7 +2412,7 @@ DEFPY(ipv6_route_address_interface,
} }
if (nexthop_vrf) if (nexthop_vrf)
nh_zvrf = zebra_vrf_lookup_by_name(nexthop_vrf); nh_zvrf = zebra_vty_get_unknown_vrf(vty, nexthop_vrf);
else else
nh_zvrf = zvrf; nh_zvrf = zvrf;
@ -2439,7 +2456,7 @@ DEFPY(ipv6_route_address_interface_vrf,
struct zebra_vrf *nh_zvrf; struct zebra_vrf *nh_zvrf;
if (nexthop_vrf) if (nexthop_vrf)
nh_zvrf = zebra_vrf_lookup_by_name(nexthop_vrf); nh_zvrf = zebra_vty_get_unknown_vrf(vty, nexthop_vrf);
else else
nh_zvrf = zvrf; nh_zvrf = zvrf;
@ -2489,7 +2506,7 @@ DEFPY(ipv6_route,
} }
if (nexthop_vrf) if (nexthop_vrf)
nh_zvrf = zebra_vrf_lookup_by_name(nexthop_vrf); nh_zvrf = zebra_vty_get_unknown_vrf(vty, nexthop_vrf);
else else
nh_zvrf = zvrf; nh_zvrf = zvrf;
@ -2532,7 +2549,7 @@ DEFPY(ipv6_route_vrf,
struct zebra_vrf *nh_zvrf; struct zebra_vrf *nh_zvrf;
if (nexthop_vrf) if (nexthop_vrf)
nh_zvrf = zebra_vrf_lookup_by_name(nexthop_vrf); nh_zvrf = zebra_vty_get_unknown_vrf(vty, nexthop_vrf);
else else
nh_zvrf = zvrf; nh_zvrf = zvrf;