diff options
| -rw-r--r-- | bgpd/bgp_routemap.c | 10 | ||||
| -rw-r--r-- | doc/developer/workflow.rst | 8 | ||||
| -rw-r--r-- | doc/user/routemap.rst | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | tools/releasedate.py | 0 | ||||
| -rw-r--r-- | zebra/zebra_vxlan.c | 6 |
5 files changed, 22 insertions, 7 deletions
diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c index 20ee2e4d49..c7f5e0433b 100644 --- a/bgpd/bgp_routemap.c +++ b/bgpd/bgp_routemap.c @@ -263,10 +263,14 @@ route_match_peer(void *rule, const struct prefix *prefix, void *object) peer = ((struct bgp_path_info *)object)->peer; if (pc->interface) { - if (!peer->conf_if) + if (!peer->conf_if || !peer->group) return RMAP_NOMATCH; - if (strcmp(peer->conf_if, pc->interface) == 0) + if (peer->conf_if && strcmp(peer->conf_if, pc->interface) == 0) + return RMAP_MATCH; + + if (peer->group && + strcmp(peer->group->name, pc->interface) == 0) return RMAP_MATCH; return RMAP_NOMATCH; @@ -4567,7 +4571,7 @@ DEFPY_YANG (match_peer, "Match peer address\n" "IP address of peer\n" "IPv6 address of peer\n" - "Interface name of peer\n") + "Interface name of peer or peer group name\n") { const char *xpath = "./match-condition[condition='frr-bgp-route-map:peer']"; diff --git a/doc/developer/workflow.rst b/doc/developer/workflow.rst index adab9725d9..688ce545fb 100644 --- a/doc/developer/workflow.rst +++ b/doc/developer/workflow.rst @@ -163,13 +163,13 @@ as early as possible, i.e. the first 2-week window. For reference, the expected release schedule according to the above is: +---------+------------+------------+------------+------------+------------+ -| Release | 2021-11-02 | 2022-03-01 | 2022-07-05 | 2022-11-01 | 2023-03-07 | +| Release | 2022-07-05 | 2022-11-01 | 2023-03-07 | 2023-07-04 | 2023-10-31 | +---------+------------+------------+------------+------------+------------+ -| RC | 2021-10-19 | 2022-02-15 | 2022-06-21 | 2022-10-18 | 2023-02-21 | +| RC | 2022-06-21 | 2022-10-18 | 2023-02-21 | 2023-06-20 | 2023-10-17 | +---------+------------+------------+------------+------------+------------+ -| dev/X.Y | 2021-10-05 | 2022-02-01 | 2022-06-07 | 2022-10-04 | 2023-02-07 | +| dev/X.Y | 2022-06-07 | 2022-10-04 | 2023-02-07 | 2023-06-06 | 2023-10-03 | +---------+------------+------------+------------+------------+------------+ -| freeze | 2021-09-21 | 2022-01-18 | 2022-05-24 | 2022-09-20 | 2023-01-24 | +| freeze | 2022-05-24 | 2022-09-20 | 2023-01-24 | 2023-05-23 | 2023-09-19 | +---------+------------+------------+------------+------------+------------+ Each release is managed by one or more volunteer release managers from the FRR diff --git a/doc/user/routemap.rst b/doc/user/routemap.rst index ef7aef9c5e..754b709173 100644 --- a/doc/user/routemap.rst +++ b/doc/user/routemap.rst @@ -205,6 +205,11 @@ Route Map Match Command interface name specified if the neighbor was specified in this manner. +.. clicmd:: match peer PEER_GROUP_NAME + + This is a BGP specific match command. Matches the peer + group name specified for the peer in question. + .. clicmd:: match source-protocol PROTOCOL_NAME This is a ZEBRA specific match command. Matches the diff --git a/tools/releasedate.py b/tools/releasedate.py index 3df1ea48fb..3df1ea48fb 100644..100755 --- a/tools/releasedate.py +++ b/tools/releasedate.py diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c index 58a1713c56..927df14fbe 100644 --- a/zebra/zebra_vxlan.c +++ b/zebra/zebra_vxlan.c @@ -4676,6 +4676,12 @@ int zebra_vxlan_svi_up(struct interface *ifp, struct interface *link_if) /* Link the SVI from the access VLAN */ zebra_evpn_acc_bd_svi_set(ifp->info, link_if->info, true); + + /* Update MACIP routes created by advertise-svi-ip */ + if (advertise_svi_macip_enabled(zevpn)) { + zebra_evpn_del_macip_for_intf(ifp, zevpn); + zebra_evpn_add_macip_for_intf(ifp, zevpn); + } } return 0; |