Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Static stuff #1819

Merged
merged 2 commits into from
Mar 14, 2018
Merged

Static stuff #1819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2bfe7ba
zebra: Fix vrf output
donaldsharp Mar 1, 2018
4060008
zebra: Allow for storage of non-configed vrf routes
donaldsharp Mar 1, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions zebra/rib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,8 @@ DECLARE_HOOK(rib_update, (struct route_node * rn, const char *reason),
extern void zebra_vty_init(void);
extern int static_config(struct vty *vty, struct zebra_vrf *zvrf, afi_t afi,
safi_t safi, const char *cmd);
extern void static_config_install_delayed_routes(struct zebra_vrf *zvrf);

extern pid_t pid;

#endif /*_ZEBRA_RIB_H */
7 changes: 6 additions & 1 deletion zebra/zebra_vrf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,12 @@ static int zebra_vrf_enable(struct vrf *vrf)
}
}

/*
* We may have static routes that are now possible to
* insert into the appropriate tables
*/
static_config_install_delayed_routes(zvrf);

/* Kick off any VxLAN-EVPN processing. */
zebra_vxlan_vrf_enable(zvrf);

Expand Down Expand Up @@ -568,7 +574,6 @@ static int vrf_config_write(struct vty *vty)
? " prefix-routes-only"
: "");
zebra_ns_config_write(vty, (struct ns *)vrf->ns_ctxt);
vty_out(vty, "!\n");
}

static_config(vty, zvrf, AFI_IP, SAFI_UNICAST, "ip route");
Expand Down
Loading