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

mgmtd: remove full vrf initialization #15151

Merged
merged 1 commit into from
Jan 14, 2024
Merged

mgmtd: remove full vrf initialization #15151

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
53 changes: 2 additions & 51 deletions mgmtd/mgmt_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ static const struct option longopts[] = {
{0}};

static void mgmt_exit(int);
static void mgmt_vrf_terminate(void);

/* privileges */
static zebra_capabilities_t _caps_p[] = {ZCAP_BIND, ZCAP_NET_RAW,
Expand Down Expand Up @@ -114,8 +113,6 @@ static __attribute__((__noreturn__)) void mgmt_exit(int status)
/* stop pthreads (if any) */
frr_pthread_stop_all();

mgmt_vrf_terminate();

frr_fini();
exit(status);
}
Expand All @@ -139,52 +136,6 @@ static struct frr_signal_t mgmt_signals[] = {
},
};

static int mgmt_vrf_new(struct vrf *vrf)
{
zlog_debug("VRF Created: %s(%u)", vrf->name, vrf->vrf_id);

return 0;
}

static int mgmt_vrf_delete(struct vrf *vrf)
{
zlog_debug("VRF Deletion: %s(%u)", vrf->name, vrf->vrf_id);

return 0;
}

static int mgmt_vrf_enable(struct vrf *vrf)
{
zlog_debug("VRF Enable: %s(%u)", vrf->name, vrf->vrf_id);

return 0;
}

static int mgmt_vrf_disable(struct vrf *vrf)
{
zlog_debug("VRF Disable: %s(%u)", vrf->name, vrf->vrf_id);

/* Note: This is a callback, the VRF will be deleted by the caller. */
return 0;
}

static int mgmt_vrf_config_write(struct vty *vty)
{
return 0;
}

static void mgmt_vrf_init(void)
{
vrf_init(mgmt_vrf_new, mgmt_vrf_enable, mgmt_vrf_disable,
mgmt_vrf_delete);
vrf_cmd_init(mgmt_vrf_config_write);
}

static void mgmt_vrf_terminate(void)
{
vrf_terminate();
}

#ifdef HAVE_STATICD
extern const struct frr_yang_module_info frr_staticd_info;
#endif
Expand Down Expand Up @@ -295,8 +246,8 @@ int main(int argc, char **argv)
/* MGMTD master init. */
mgmt_master_init(frr_init(), buffer_size);

/* VRF Initializations. */
mgmt_vrf_init();
/* VRF commands initialization. */
vrf_cmd_init(NULL);

/* MGMTD related initialization. */
mgmt_init();
Expand Down
Loading