proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 22:57:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5802 from ton31337/feature/aggregate-address_origin_override

Browse Source 
bgpd: Allow overriding ORIGIN for aggregate-address
This commit is contained in:
Donald Sharp 2020-02-19 08:38:31 -05:00 committed by GitHub
commit 1a21da6b01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 276 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
bgpd/bgp_route.c
View File

@ -6270,6 +6270,9 @@ void bgp_aggregate_route(struct bgp *bgp, struct prefix *p,
else if (aggregate->egp_origin_count > 0)
origin = BGP_ORIGIN_EGP;
if (aggregate->origin != BGP_ORIGIN_UNSPECIFIED)
origin = aggregate->origin;
if (aggregate->as_set) {
if (aggregate->aspath)
/* Retrieve aggregate route's as-path.
@ -6434,6 +6437,9 @@ static void bgp_add_route_to_aggregate(struct bgp *bgp, struct prefix *aggr_p,
else if (aggregate->egp_origin_count > 0)
origin = BGP_ORIGIN_EGP;
if (aggregate->origin != BGP_ORIGIN_UNSPECIFIED)
origin = aggregate->origin;
if (aggregate->as_set) {
/* Compute aggregate route's as-path.
*/
@ -6565,6 +6571,9 @@ static void bgp_remove_route_from_aggregate(struct bgp *bgp, afi_t afi,
else if (aggregate->egp_origin_count > 0)
origin = BGP_ORIGIN_EGP;
if (aggregate->origin != BGP_ORIGIN_UNSPECIFIED)
origin = aggregate->origin;
if (aggregate->as_set) {
/* Retrieve aggregate route's as-path.
*/
@ -6660,6 +6669,19 @@ void bgp_aggregate_decrement(struct bgp *bgp, struct prefix *p,
#define AGGREGATE_AS_SET 1
#define AGGREGATE_AS_UNSET 0
static const char *bgp_origin2str(uint8_t origin)
{
switch (origin) {
case BGP_ORIGIN_IGP:
return "igp";
case BGP_ORIGIN_EGP:
return "egp";
case BGP_ORIGIN_INCOMPLETE:
return "incomplete";
}
return "n/a";
}
static int bgp_aggregate_unset(struct vty *vty, const char *prefix_str,
afi_t afi, safi_t safi)
{
@ -6753,8 +6775,9 @@ static int bgp_aggregate_unset(struct vty *vty, const char *prefix_str,
}
static int bgp_aggregate_set(struct vty *vty, const char *prefix_str, afi_t afi,
safi_t safi, const char *rmap, uint8_t summary_only,
uint8_t as_set)
safi_t safi, const char *rmap,
uint8_t summary_only, uint8_t as_set,
uint8_t origin)
{
VTY_DECLVAR_CONTEXT(bgp, bgp);
int ret;
@ -6818,6 +6841,12 @@ static int bgp_aggregate_set(struct vty *vty, const char *prefix_str, afi_t afi,
aggregate->as_set = as_set_new;
aggregate->safi = safi;
/* Override ORIGIN attribute if defined.
* E.g.: Cisco and Juniper set ORIGIN for aggregated address
* to IGP which is not what rfc4271 says.
* This enables the same behavior, optionally.
*/
aggregate->origin = origin;
if (rmap) {
XFREE(MTYPE_ROUTE_MAP_NAME, aggregate->rmap.name);
@ -6837,7 +6866,7 @@ static int bgp_aggregate_set(struct vty *vty, const char *prefix_str, afi_t afi,
DEFUN (aggregate_address,
aggregate_address_cmd,
"aggregate-address A.B.C.D/M [<as-set [summary-only]|summary-only [as-set]>] [route-map WORD]",
"aggregate-address A.B.C.D/M [<as-set [summary-only]|summary-only [as-set]>] [route-map WORD] [origin <egp|igp|incomplete>]",
"Configure BGP aggregate entries\n"
"Aggregate prefix\n"
"Generate AS set path information\n"
@ -6845,12 +6874,17 @@ DEFUN (aggregate_address,
"Filter more specific routes from updates\n"
"Generate AS set path information\n"
"Apply route map to aggregate network\n"
"Name of route map\n")
"Name of route map\n"
"BGP origin code\n"
"Remote EGP\n"
"Local IGP\n"
"Unknown heritage\n")
{
int idx = 0;
argv_find(argv, argc, "A.B.C.D/M", &idx);
char *prefix = argv[idx]->arg;
char *rmap = NULL;
uint8_t origin = BGP_ORIGIN_UNSPECIFIED;
int as_set = argv_find(argv, argc, "as-set", &idx) ? AGGREGATE_AS_SET
: AGGREGATE_AS_UNSET;
idx = 0;
@ -6863,13 +6897,23 @@ DEFUN (aggregate_address,
if (idx)
rmap = argv[idx]->arg;
return bgp_aggregate_set(vty, prefix, AFI_IP, bgp_node_safi(vty),
rmap, summary_only, as_set);
idx = 0;
if (argv_find(argv, argc, "origin", &idx)) {
if (strncmp(argv[idx + 1]->arg, "igp", 2) == 0)
origin = BGP_ORIGIN_IGP;
if (strncmp(argv[idx + 1]->arg, "egp", 1) == 0)
origin = BGP_ORIGIN_EGP;
if (strncmp(argv[idx + 1]->arg, "incomplete", 2) == 0)
origin = BGP_ORIGIN_INCOMPLETE;
}
return bgp_aggregate_set(vty, prefix, AFI_IP, bgp_node_safi(vty), rmap,
summary_only, as_set, origin);
}
DEFUN (aggregate_address_mask,
aggregate_address_mask_cmd,
"aggregate-address A.B.C.D A.B.C.D [<as-set [summary-only]|summary-only [as-set]>] [route-map WORD]",
"aggregate-address A.B.C.D A.B.C.D [<as-set [summary-only]|summary-only [as-set]>] [route-map WORD] [origin <egp|igp|incomplete>]",
"Configure BGP aggregate entries\n"
"Aggregate address\n"
"Aggregate mask\n"
@ -6878,7 +6922,11 @@ DEFUN (aggregate_address_mask,
"Filter more specific routes from updates\n"
"Generate AS set path information\n"
"Apply route map to aggregate network\n"
"Name of route map\n")
"Name of route map\n"
"BGP origin code\n"
"Remote EGP\n"
"Local IGP\n"
"Unknown heritage\n")
{
int idx = 0;
argv_find(argv, argc, "A.B.C.D", &idx);
@ -6886,6 +6934,7 @@ DEFUN (aggregate_address_mask,
char *mask = argv[idx + 1]->arg;
bool rmap_found;
char *rmap = NULL;
uint8_t origin = BGP_ORIGIN_UNSPECIFIED;
int as_set = argv_find(argv, argc, "as-set", &idx) ? AGGREGATE_AS_SET
: AGGREGATE_AS_UNSET;
idx = 0;
@ -6905,13 +6954,23 @@ DEFUN (aggregate_address_mask,
return CMD_WARNING_CONFIG_FAILED;
}
idx = 0;
if (argv_find(argv, argc, "origin", &idx)) {
if (strncmp(argv[idx + 1]->arg, "igp", 2) == 0)
origin = BGP_ORIGIN_IGP;
if (strncmp(argv[idx + 1]->arg, "egp", 1) == 0)
origin = BGP_ORIGIN_EGP;
if (strncmp(argv[idx + 1]->arg, "incomplete", 2) == 0)
origin = BGP_ORIGIN_INCOMPLETE;
}
return bgp_aggregate_set(vty, prefix_str, AFI_IP, bgp_node_safi(vty),
rmap, summary_only, as_set);
rmap, summary_only, as_set, origin);
}
DEFUN (no_aggregate_address,
no_aggregate_address_cmd,
"no aggregate-address A.B.C.D/M [<as-set [summary-only]|summary-only [as-set]>] [route-map WORD]",
"no aggregate-address A.B.C.D/M [<as-set [summary-only]|summary-only [as-set]>] [route-map WORD] [origin <egp|igp|incomplete>]",
NO_STR
"Configure BGP aggregate entries\n"
"Aggregate prefix\n"
@ -6920,7 +6979,11 @@ DEFUN (no_aggregate_address,
"Filter more specific routes from updates\n"
"Generate AS set path information\n"
"Apply route map to aggregate network\n"
"Name of route map\n")
"Name of route map\n"
"BGP origin code\n"
"Remote EGP\n"
"Local IGP\n"
"Unknown heritage\n")
{
int idx = 0;
argv_find(argv, argc, "A.B.C.D/M", &idx);
@ -6930,7 +6993,7 @@ DEFUN (no_aggregate_address,
DEFUN (no_aggregate_address_mask,
no_aggregate_address_mask_cmd,
"no aggregate-address A.B.C.D A.B.C.D [<as-set [summary-only]|summary-only [as-set]>] [route-map WORD]",
"no aggregate-address A.B.C.D A.B.C.D [<as-set [summary-only]|summary-only [as-set]>] [route-map WORD] [origin <egp|igp|incomplete>]",
NO_STR
"Configure BGP aggregate entries\n"
"Aggregate address\n"
@ -6940,7 +7003,11 @@ DEFUN (no_aggregate_address_mask,
"Filter more specific routes from updates\n"
"Generate AS set path information\n"
"Apply route map to aggregate network\n"
"Name of route map\n")
"Name of route map\n"
"BGP origin code\n"
"Remote EGP\n"
"Local IGP\n"
"Unknown heritage\n")
{
int idx = 0;
argv_find(argv, argc, "A.B.C.D", &idx);
@ -6960,7 +7027,7 @@ DEFUN (no_aggregate_address_mask,
DEFUN (ipv6_aggregate_address,
ipv6_aggregate_address_cmd,
"aggregate-address X:X::X:X/M [<as-set [summary-only]|summary-only [as-set]>] [route-map WORD]",
"aggregate-address X:X::X:X/M [<as-set [summary-only]|summary-only [as-set]>] [route-map WORD] [origin <egp|igp|incomplete>]",
"Configure BGP aggregate entries\n"
"Aggregate prefix\n"
"Generate AS set path information\n"
@ -6968,13 +7035,18 @@ DEFUN (ipv6_aggregate_address,
"Filter more specific routes from updates\n"
"Generate AS set path information\n"
"Apply route map to aggregate network\n"
"Name of route map\n")
"Name of route map\n"
"BGP origin code\n"
"Remote EGP\n"
"Local IGP\n"
"Unknown heritage\n")
{
int idx = 0;
argv_find(argv, argc, "X:X::X:X/M", &idx);
char *prefix = argv[idx]->arg;
char *rmap = NULL;
bool rmap_found;
uint8_t origin = BGP_ORIGIN_UNSPECIFIED;
int as_set = argv_find(argv, argc, "as-set", &idx) ? AGGREGATE_AS_SET
: AGGREGATE_AS_UNSET;
@ -6987,13 +7059,23 @@ DEFUN (ipv6_aggregate_address,
if (rmap_found)
rmap = argv[idx]->arg;
idx = 0;
if (argv_find(argv, argc, "origin", &idx)) {
if (strncmp(argv[idx + 1]->arg, "igp", 2) == 0)
origin = BGP_ORIGIN_IGP;
if (strncmp(argv[idx + 1]->arg, "egp", 1) == 0)
origin = BGP_ORIGIN_EGP;
if (strncmp(argv[idx + 1]->arg, "incomplete", 2) == 0)
origin = BGP_ORIGIN_INCOMPLETE;
}
return bgp_aggregate_set(vty, prefix, AFI_IP6, SAFI_UNICAST, rmap,
sum_only, as_set);
sum_only, as_set, origin);
}
DEFUN (no_ipv6_aggregate_address,
no_ipv6_aggregate_address_cmd,
"no aggregate-address X:X::X:X/M [<as-set [summary-only]|summary-only [as-set]>] [route-map WORD]",
"no aggregate-address X:X::X:X/M [<as-set [summary-only]|summary-only [as-set]>] [route-map WORD] [origin <egp|igp|incomplete>]",
NO_STR
"Configure BGP aggregate entries\n"
"Aggregate prefix\n"
@ -7002,7 +7084,11 @@ DEFUN (no_ipv6_aggregate_address,
"Filter more specific routes from updates\n"
"Generate AS set path information\n"
"Apply route map to aggregate network\n"
"Name of route map\n")
"Name of route map\n"
"BGP origin code\n"
"Remote EGP\n"
"Local IGP\n"
"Unknown heritage\n")
{
int idx = 0;
argv_find(argv, argc, "X:X::X:X/M", &idx);
@ -12921,6 +13007,10 @@ void bgp_config_write_network(struct vty *vty, struct bgp *bgp, afi_t afi,
if (bgp_aggregate->rmap.name)
vty_out(vty, " route-map %s", bgp_aggregate->rmap.name);
if (bgp_aggregate->origin != BGP_ORIGIN_UNSPECIFIED)
vty_out(vty, " origin %s",
bgp_origin2str(bgp_aggregate->origin));
vty_out(vty, "\n");
}
}

3
bgpd/bgp_route.h
View File

@ -338,6 +338,9 @@ struct bgp_aggregate {
/* Count of routes of origin type egp under this aggregate. */
unsigned long egp_origin_count;
/* Optional modify flag to override ORIGIN */
uint8_t origin;
/* Hash containing the communities of all the
* routes under this aggregate.
*/

1
bgpd/bgpd.h
View File

@ -1490,6 +1490,7 @@ struct bgp_nlri {
#define BGP_ORIGIN_IGP 0
#define BGP_ORIGIN_EGP 1
#define BGP_ORIGIN_INCOMPLETE 2
#define BGP_ORIGIN_UNSPECIFIED 255
/* BGP notify message codes. */
#define BGP_NOTIFY_HEADER_ERR 1

10
doc/user/bgp.rst
View File

@ -924,6 +924,11 @@ Route Aggregation-IPv4 Address Family
Apply a route-map for an aggregated prefix.
.. index:: aggregate-address A.B.C.D/M origin <egp|igp|incomplete>
.. clicmd:: aggregate-address A.B.C.D/M origin <egp|igp|incomplete>
Override ORIGIN for an aggregated prefix.
.. index:: aggregate-address A.B.C.D/M as-set
.. clicmd:: aggregate-address A.B.C.D/M as-set
@ -971,6 +976,11 @@ Route Aggregation-IPv6 Address Family
Apply a route-map for an aggregated prefix.
.. index:: aggregate-address X:X::X:X/M origin <egp|igp|incomplete>
.. clicmd:: aggregate-address X:X::X:X/M origin <egp|igp|incomplete>
Override ORIGIN for an aggregated prefix.
.. index:: aggregate-address X:X::X:X/M as-set
.. clicmd:: aggregate-address X:X::X:X/M as-set

0
tests/topotests/bgp_aggregate-address_origin/__init__.py Normal file
View File

7
tests/topotests/bgp_aggregate-address_origin/r1/bgpd.conf Normal file
View File

@ -0,0 +1,7 @@
router bgp 65000
neighbor 192.168.255.2 remote-as 65001
address-family ipv4 unicast
redistribute connected
aggregate-address 172.16.255.0/24 origin igp
exit-address-family
!

9
tests/topotests/bgp_aggregate-address_origin/r1/zebra.conf Normal file
View File

@ -0,0 +1,9 @@
!
interface lo
ip address 172.16.255.254/32
!
interface r1-eth0
ip address 192.168.255.1/24
!
ip forwarding
!

4
tests/topotests/bgp_aggregate-address_origin/r2/bgpd.conf Normal file
View File

@ -0,0 +1,4 @@
router bgp 65001
neighbor 192.168.255.1 remote-as 65000
exit-address-family
!

6
tests/topotests/bgp_aggregate-address_origin/r2/zebra.conf Normal file
View File

@ -0,0 +1,6 @@
!
interface r2-eth0
ip address 192.168.255.2/24
!
ip forwarding
!

128
tests/topotests/bgp_aggregate-address_origin/test_bgp_aggregate-address_origin.py Normal file
View File

@ -0,0 +1,128 @@
#!/usr/bin/env python
#
# bgp_aggregate-address_origin.py
# Part of NetDEF Topology Tests
#
# Copyright (c) 2020 by
# Donatas Abraitis <donatas.abraitis@gmail.com>
#
# Permission to use, copy, modify, and/or distribute this software
# for any purpose with or without fee is hereby granted, provided
# that the above copyright notice and this permission notice appear
# in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND NETDEF DISCLAIMS ALL WARRANTIES
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL NETDEF BE LIABLE FOR
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
# DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
# WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
# ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
# OF THIS SOFTWARE.
#
"""
bgp_aggregate-address_origin.py:
Test if works the following commands:
router bgp 65031
address-family ipv4 unicast
aggregate-address 192.168.255.0/24 origin igp
"""
import os
import sys
import json
import time
import pytest
import functools
CWD = os.path.dirname(os.path.realpath(__file__))
sys.path.append(os.path.join(CWD, '../'))
# pylint: disable=C0413
from lib import topotest
from lib.topogen import Topogen, TopoRouter, get_topogen
from lib.topolog import logger
from mininet.topo import Topo
class TemplateTopo(Topo):
def build(self, *_args, **_opts):
tgen = get_topogen(self)
for routern in range(1, 3):
tgen.add_router('r{}'.format(routern))
switch = tgen.add_switch('s1')
switch.add_link(tgen.gears['r1'])
switch.add_link(tgen.gears['r2'])
def setup_module(mod):
tgen = Topogen(TemplateTopo, mod.__name__)
tgen.start_topology()
router_list = tgen.routers()
for i, (rname, router) in enumerate(router_list.iteritems(), 1):
router.load_config(
TopoRouter.RD_ZEBRA,
os.path.join(CWD, '{}/zebra.conf'.format(rname))
)
router.load_config(
TopoRouter.RD_BGP,
os.path.join(CWD, '{}/bgpd.conf'.format(rname))
)
tgen.start_router()
def teardown_module(mod):
tgen = get_topogen()
tgen.stop_topology()
def test_bgp_aggregate_address_origin():
tgen = get_topogen()
if tgen.routers_have_failure():
pytest.skip(tgen.errors)
router = tgen.gears['r2']
def _bgp_converge(router):
output = json.loads(router.vtysh_cmd("show ip bgp neighbor 192.168.255.1 json"))
expected = {
'192.168.255.1': {
'bgpState': 'Established',
'addressFamilyInfo': {
'ipv4Unicast': {
'acceptedPrefixCounter': 3
}
}
}
}
return topotest.json_cmp(output, expected)
def _bgp_aggregate_address_has_metric(router):
output = json.loads(router.vtysh_cmd("show ip bgp 172.16.255.0/24 json"))
expected = {
'paths': [
{
'origin': 'IGP'
}
]
}
return topotest.json_cmp(output, expected)
test_func = functools.partial(_bgp_converge, router)
success, result = topotest.run_and_expect(test_func, None, count=30, wait=0.5)
assert result is None, 'Failed to see bgp convergence in "{}"'.format(router)
test_func = functools.partial(_bgp_aggregate_address_has_metric, router)
success, result = topotest.run_and_expect(test_func, None, count=30, wait=0.5)
assert result is None, 'Failed to see applied ORIGIN (igp) for aggregated prefix in "{}"'.format(router)
if __name__ == '__main__':
args = ["-s"] + sys.argv[1:]
sys.exit(pytest.main(args))