Skip to content
Permalink
Browse files

bgpd: remove VERSION_TYPE_DEV from CONFDATE checks

Signed-off-by: Lou Berger <lberger@labn.net>
  • Loading branch information...
louberger committed Jul 10, 2018
1 parent 308fea4 commit bee57a7a07498c626ed6dad0cd8c66ec1d14367d
Showing with 5 additions and 5 deletions.
  1. +4 −4 bgpd/bgp_vty.c
  2. +1 −1 bgpd/bgpd.c
@@ -772,7 +772,7 @@ static void bgp_clear_star_soft_out(struct vty *vty, const char *name)
#endif

/* BGP global configuration. */
#if defined(VERSION_TYPE_DEV) && (CONFDATE > 20190601)
#if (CONFDATE > 20190601)
CPP_NOTICE("bgpd: time to remove deprecated bgp multiple-instance")
CPP_NOTICE("This includes BGP_OPT_MULTIPLE_INSTANCE")
#endif
@@ -806,7 +806,7 @@ DEFUN_HIDDEN (no_bgp_multiple_instance,
return CMD_SUCCESS;
}

#if defined(VERSION_TYPE_DEV) && (CONFDATE > 20190601)
#if (CONFDATE > 20190601)
CPP_NOTICE("bgpd: time to remove deprecated cli bgp config-type cisco")
CPP_NOTICE("This includes BGP_OPT_CISCO_CONFIG")
#endif
@@ -2005,7 +2005,7 @@ DEFUN (no_bgp_fast_external_failover,
}

/* "bgp enforce-first-as" configuration. */
#if defined(VERSION_TYPE_DEV) && CONFDATE > 20180517
#if CONFDATE > 20180517
CPP_NOTICE("bgpd: remove deprecated '[no] bgp enforce-first-as' commands")
#endif

@@ -9126,7 +9126,7 @@ static void bgp_show_peer(struct vty *vty, struct peer *p, uint8_t use_json,
uptime -= p->uptime;
epoch_tbuf = time(NULL) - uptime;

#if defined(VERSION_TYPE_DEV) && CONFDATE > 20200101
#if CONFDATE > 20200101
CPP_NOTICE(
"bgpTimerUp should be deprecated and can be removed now");
#endif
@@ -7356,7 +7356,7 @@ static void bgp_config_write_family(struct vty *vty, struct bgp *bgp, afi_t afi,
}

/* clang-format off */
#if defined(VERSION_TYPE_DEV) && CONFDATE > 20180517
#if CONFDATE > 20180517
CPP_NOTICE("bgpd: remove 'bgp enforce-first-as' config migration from bgp_config_write")
#endif
/* clang-format on */

0 comments on commit bee57a7

Please sign in to comment.
You can’t perform that action at this time.