Skip to content

MERAprojects/ops-build#35 #31

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

Open
kontorschikov wants to merge 2 commits into
base: meraswitch/devel/master
Choose a base branch
from
Open

MERAprojects/ops-build#35 #31

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
aac4b6d
MERAprojects/ops-build#35 BGP command "neighbor advertisement-interva…
Feb 20, 2017
33738f1
MERAprojects/ops-build#35 Don't show config entries for peer-group me…
Feb 21, 2017
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
65 changes: 52 additions & 13 deletions vtysh/bgp_vty.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3520,6 +3520,14 @@ cli_neighbor_set_peer_group_cmd_execute(char *vrf_name, const char *ip_addr,
(int64_t *)&tim_val, ovs_bgp_peer_group->n_timers);
}

/* Inherit minimum advertisement interval */
if (ovs_bgp_peer_group->advertisement_interval){
ovsrec_bgp_neighbor_set_advertisement_interval(ovs_bgp_neighbor,
ovs_bgp_peer_group->advertisement_interval, 1);
} else {
ovsrec_bgp_neighbor_set_advertisement_interval(ovs_bgp_neighbor, NULL, 0);
}

/* Make this peer bound to the peer group. */
ovsrec_bgp_neighbor_set_bgp_peer_group(ovs_bgp_neighbor,
ovs_bgp_peer_group);
Expand Down Expand Up @@ -5222,7 +5230,7 @@ cli_neighbor_timers_execute(char *vrf_name, int argc, const char *argv[])

if (ovs_bgp_neighbor) {
if (ovs_bgp_neighbor->bgp_peer_group) {
ERRONEOUS_DB_TXN(txn, BGP_ERR_UNABLE_TO_SET_TIMERS);
ERRONEOUS_DB_TXN(txn, BGP_ERR_INVALID_FOR_PEER_GROUP_MEMBER);
} else {
/* To write to ovsdb nbr table. */
neighbor_set_timers(ovs_bgp_neighbor, &tim_val, 2);
Expand Down Expand Up @@ -5286,7 +5294,7 @@ DEFUN(no_neighbor_timers,

if (ovs_bgp_neighbor) {
if (ovs_bgp_neighbor->bgp_peer_group) {
ERRONEOUS_DB_TXN(txn, BGP_ERR_UNABLE_TO_SET_TIMERS);
ERRONEOUS_DB_TXN(txn, BGP_ERR_INVALID_FOR_PEER_GROUP_MEMBER);
} else {
tim_val.keepalive = 0;
tim_val.holdtime = 0;
Expand Down Expand Up @@ -5336,6 +5344,27 @@ ALIAS(no_neighbor_timers_connect,
"BGP connect timer\n"
"Connect timer\n")

static void
neighbor_set_advertisement_interval(const struct ovsrec_bgp_neighbor *bgpn,
int64_t *advertisement_interval, size_t n_advertisement_interval)
{
const struct ovsrec_bgp_neighbor *bgpn_cur, *bgpn_next;

ovsrec_bgp_neighbor_set_advertisement_interval(bgpn,
advertisement_interval,
n_advertisement_interval);

if (object_is_bgp_peer_group(bgpn)) {
bgpn_cur = bgpn;
OVSREC_BGP_NEIGHBOR_FOR_EACH_SAFE(bgpn_cur, bgpn_next, idl) {
if (object_is_neighbor(bgpn_cur) &&
(bgpn_cur->bgp_peer_group == bgpn)) {
ovsrec_bgp_neighbor_set_advertisement_interval(bgpn_cur,
advertisement_interval, n_advertisement_interval);
}
}
}
}

static int
cli_neighbor_advertisement_interval_cmd_execute(int argc, const char *argv[])
Expand Down Expand Up @@ -5364,11 +5393,16 @@ cli_neighbor_advertisement_interval_cmd_execute(int argc, const char *argv[])

ovs_bgp_neighbor =
get_bgp_neighbor_with_bgp_router_and_ipaddr(bgp_router_context, ip_addr);

if (ovs_bgp_neighbor) {
/* To write to ovsdb nbr table. */
ovsrec_bgp_neighbor_set_advertisement_interval(ovs_bgp_neighbor, &advertisement_interval, 1);
}
else {
if (ovs_bgp_neighbor->bgp_peer_group) {
ERRONEOUS_DB_TXN(txn, BGP_ERR_INVALID_FOR_PEER_GROUP_MEMBER);
} else {
/* To write to ovsdb nbr table. */
neighbor_set_advertisement_interval(ovs_bgp_neighbor,
&advertisement_interval, 1);
}
} else {
ABORT_DB_TXN(txn, BGP_ERR_NEIGHBOR_IS_NOT_CONFIGURED);
}

Expand All @@ -5378,9 +5412,9 @@ cli_neighbor_advertisement_interval_cmd_execute(int argc, const char *argv[])
/*Neighbor advertisement interval*/
DEFUN(neighbor_advertise_interval,
neighbor_advertise_interval_cmd,
NEIGHBOR_CMD "advertisement-interval <0-600>",
NEIGHBOR_CMD2 "advertisement-interval <0-600>",
NEIGHBOR_STR
NEIGHBOR_ADDR_STR
NEIGHBOR_ADDR_STR2
"Minimum interval between sending BGP routing updates\n"
"time in seconds\n")
{
Expand All @@ -5392,10 +5426,10 @@ DEFUN(neighbor_advertise_interval,
/*No neighbor advertisement interval*/
DEFUN(no_neighbor_advertise_interval,
no_neighbor_advertise_interval_cmd,
NO_NEIGHBOR_CMD "advertisement-interval",
NO_NEIGHBOR_CMD2 "advertisement-interval",
NO_STR
NEIGHBOR_STR
NEIGHBOR_ADDR_STR
NEIGHBOR_ADDR_STR2
"Minimum interval between sending BGP routing updates\n")
{
const char *ip_addr = argv[0];
Expand All @@ -5421,10 +5455,15 @@ DEFUN(no_neighbor_advertise_interval,

ovs_bgp_neighbor =
get_bgp_neighbor_with_bgp_router_and_ipaddr(bgp_router_context, ip_addr);

if (ovs_bgp_neighbor) {
ovsrec_bgp_neighbor_set_advertisement_interval(ovs_bgp_neighbor, NULL, 0);
}
else {
if (ovs_bgp_neighbor->bgp_peer_group) {
ERRONEOUS_DB_TXN(txn, BGP_ERR_INVALID_FOR_PEER_GROUP_MEMBER);
} else {
/* To write to ovsdb nbr table. */
neighbor_set_advertisement_interval(ovs_bgp_neighbor, NULL, 0);
}
} else {
ABORT_DB_TXN(txn, BGP_ERR_NEIGHBOR_IS_NOT_CONFIGURED);
}

Expand Down
2 changes: 1 addition & 1 deletion vtysh/bgp_vty.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
#define BGP_ERR_PEER_GROUP_ALREADY_CREATED "% Peer group already exists"
#define BGP_ERR_NEIGHBOR_CREATION_FAILED "% BGP neighbor/peer group object creation failed"
#define BGP_ERR_NEIGHBOR_NOT_IN_PEER_GROUP "% Neighbor is not in a peer group"
#define BGP_ERR_UNABLE_TO_SET_TIMERS "% Unable to set timers. Neighbor already has been assigned to the peer group"
#define BGP_ERR_INVALID_FOR_PEER_GROUP_MEMBER "% Invalid command for a peer-group member"
#define BGP_ERR_UNSPECIFIED_REMOTE_AS "% Specify peer remote AS or peer-group remote AS first"
#define BGP_ERR_REMOVE_PRIVATE_AS "% Private AS cannot be removed for IBGP peers"
#define BGP_ERR_NO_PREFIX_LIST "% Prefix List is not found"
Expand Down
13 changes: 8 additions & 5 deletions vtysh/vtysh_ovsdb_router_context.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,14 @@ static void vtysh_router_context_bgp_print_nbr_cfg(vtysh_ovsdb_cbmsg_ptr p_msg,
}
}

if (nbr_table->n_advertisement_interval)
vtysh_ovsdb_cli_print(p_msg,"%4s %s %s %s %d", "", "neighbor",
neighbor,
"advertisement-interval", *(nbr_table->
advertisement_interval));
if (nbr_table->n_advertisement_interval) {
if (!pgroup_ptr) {
vtysh_ovsdb_cli_print(p_msg,"%4s %s %s %s %d", "", "neighbor",
neighbor,
"advertisement-interval", *(nbr_table->
advertisement_interval));
}
}

if (nbr_table->n_timers > 0) {
/* Invalid command for peer-group member so values are inherited from peer-group */
Expand Down