Adding upstream version 9.1.upstream/9.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

8 files changed, 199 insertions, 0 deletions

diff --git a/tests/topotests/bgp_reject_as_sets/__init__.py b/tests/topotests/bgp_reject_as_sets/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/topotests/bgp_reject_as_sets/__init__.py
diff --git a/tests/topotests/bgp_reject_as_sets/r1/bgpd.conf b/tests/topotests/bgp_reject_as_sets/r1/bgpd.conf
new file mode 100644
index 0000000..a28b612
--- /dev/null
+++ b/tests/topotests/bgp_reject_as_sets/r1/bgpd.conf
@@ -0,0 +1,10 @@
+! exit1
+router bgp 65001
+  no bgp ebgp-requires-policy
+  neighbor 192.168.255.1 remote-as 65002
+  neighbor 192.168.255.1 timers 3 10
+  address-family ipv4 unicast
+    redistribute connected
+  exit-address-family
+  !
+!
diff --git a/tests/topotests/bgp_reject_as_sets/r1/zebra.conf b/tests/topotests/bgp_reject_as_sets/r1/zebra.conf
new file mode 100644
index 0000000..9904bb4
--- /dev/null
+++ b/tests/topotests/bgp_reject_as_sets/r1/zebra.conf
@@ -0,0 +1,9 @@
+! exit1
+interface lo
+ ip address 172.16.255.254/32
+!
+interface r1-eth0
+ ip address 192.168.255.2/30
+!
+ip forwarding
+!
diff --git a/tests/topotests/bgp_reject_as_sets/r2/bgpd.conf b/tests/topotests/bgp_reject_as_sets/r2/bgpd.conf
new file mode 100644
index 0000000..4539617
--- /dev/null
+++ b/tests/topotests/bgp_reject_as_sets/r2/bgpd.conf
@@ -0,0 +1,13 @@
+! spine
+router bgp 65002
+  bgp reject-as-sets
+  no bgp ebgp-requires-policy
+  neighbor 192.168.255.2 remote-as 65001
+  neighbor 192.168.255.2 timers 3 10
+  neighbor 192.168.254.2 remote-as 65003
+  neighbor 192.168.254.2 timers 3 10
+  address-family ipv4 unicast
+    aggregate-address 172.16.0.0/16 as-set summary-only
+  exit-address-family
+  !
+!
diff --git a/tests/topotests/bgp_reject_as_sets/r2/zebra.conf b/tests/topotests/bgp_reject_as_sets/r2/zebra.conf
new file mode 100644
index 0000000..f0d357c
--- /dev/null
+++ b/tests/topotests/bgp_reject_as_sets/r2/zebra.conf
@@ -0,0 +1,9 @@
+! spine
+interface r2-eth0
+ ip address 192.168.255.1/30
+!
+interface r2-eth1
+ ip address 192.168.254.1/30
+!
+ip forwarding
+!
diff --git a/tests/topotests/bgp_reject_as_sets/r3/bgpd.conf b/tests/topotests/bgp_reject_as_sets/r3/bgpd.conf
new file mode 100644
index 0000000..1dde4f0
--- /dev/null
+++ b/tests/topotests/bgp_reject_as_sets/r3/bgpd.conf
@@ -0,0 +1,11 @@
+! exit2
+router bgp 65003
+  no bgp ebgp-requires-policy
+  neighbor 192.168.254.1 remote-as 65002
+  neighbor 192.168.254.1 timers 3 10
+  address-family ipv4 unicast
+    neighbor 192.168.254.1 allowas-in
+    redistribute connected
+  exit-address-family
+  !
+!
diff --git a/tests/topotests/bgp_reject_as_sets/r3/zebra.conf b/tests/topotests/bgp_reject_as_sets/r3/zebra.conf
new file mode 100644
index 0000000..f490d97
--- /dev/null
+++ b/tests/topotests/bgp_reject_as_sets/r3/zebra.conf
@@ -0,0 +1,9 @@
+! exit2
+interface lo
+ ip address 172.16.254.254/32
+!
+interface r3-eth0
+ ip address 192.168.254.2/30
+!
+ip forwarding
+!
diff --git a/tests/topotests/bgp_reject_as_sets/test_bgp_reject_as_sets.py b/tests/topotests/bgp_reject_as_sets/test_bgp_reject_as_sets.py
new file mode 100644
index 0000000..97366eb
--- /dev/null
+++ b/tests/topotests/bgp_reject_as_sets/test_bgp_reject_as_sets.py
@@ -0,0 +1,138 @@
+#!/usr/bin/env python
+# SPDX-License-Identifier: ISC
+
+#
+# test_bgp_reject_as_sets.py
+# Part of NetDEF Topology Tests
+#
+# Copyright (c) 2019 by
+# Donatas Abraitis <donatas.abraitis@gmail.com>
+#
+
+"""
+Test if an aggregated route with AS_SET is not sent to peers.
+Addressing draft-ietf-idr-deprecate-as-set-confed-set recommendations.
+
+BGP speakers conforming to this document (i.e., conformant BGP
+   speakers) MUST NOT locally generate BGP UPDATE messages containing
+   AS_SET or AS_CONFED_SET.  Conformant BGP speakers SHOULD NOT send BGP
+   UPDATE messages containing AS_SET or AS_CONFED_SET.  Upon receipt of
+   such messages, conformant BGP speakers SHOULD use the "Treat-as-
+   withdraw" error handling behavior as per [RFC7606].
+"""
+
+import os
+import sys
+import json
+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
+
+pytestmark = [pytest.mark.bgpd]
+
+
+def build_topo(tgen):
+    for routern in range(1, 4):
+        tgen.add_router("r{}".format(routern))
+
+    switch = tgen.add_switch("s1")
+    switch.add_link(tgen.gears["r1"])
+    switch.add_link(tgen.gears["r2"])
+
+    switch = tgen.add_switch("s2")
+    switch.add_link(tgen.gears["r2"])
+    switch.add_link(tgen.gears["r3"])
+
+
+def setup_module(mod):
+    tgen = Topogen(build_topo, mod.__name__)
+    tgen.start_topology()
+
+    router_list = tgen.routers()
+
+    for i, (rname, router) in enumerate(router_list.items(), 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_reject_as_sets():
+    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.2 json"))
+        expected = {
+            "192.168.255.2": {
+                "bgpState": "Established",
+                "addressFamilyInfo": {"ipv4Unicast": {"acceptedPrefixCounter": 2}},
+            }
+        }
+        return topotest.json_cmp(output, expected)
+
+    def _bgp_has_aggregated_route_with_stripped_as_set(router):
+        output = json.loads(router.vtysh_cmd("show ip bgp 172.16.0.0/16 json"))
+        expected = {
+            "paths": [{"aspath": {"string": "Local", "segments": [], "length": 0}}]
+        }
+        return topotest.json_cmp(output, expected)
+
+    def _bgp_announce_route_without_as_sets(router):
+        output = json.loads(
+            router.vtysh_cmd(
+                "show ip bgp neighbor 192.168.254.2 advertised-routes json"
+            )
+        )
+        expected = {
+            "advertisedRoutes": {
+                "172.16.0.0/16": {"path": ""},
+                "192.168.254.0/30": {"path": "65003"},
+                "192.168.255.0/30": {"path": "65001"},
+            },
+            "totalPrefixCounter": 3,
+        }
+        return topotest.json_cmp(output, expected)
+
+    test_func = functools.partial(_bgp_converge, router)
+    success, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
+
+    assert result is None, 'Failed bgp convergence in "{}"'.format(router)
+
+    test_func = functools.partial(
+        _bgp_has_aggregated_route_with_stripped_as_set, router
+    )
+    success, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
+
+    assert result is None, 'Failed to see an aggregated route in "{}"'.format(router)
+
+    test_func = functools.partial(_bgp_announce_route_without_as_sets, router)
+    success, result = topotest.run_and_expect(test_func, None, count=60, wait=0.5)
+
+    assert (
+        result is None
+    ), 'Route 172.16.0.0/16 should be sent without AS_SET to r3 "{}"'.format(router)
+
+
+if __name__ == "__main__":
+    args = ["-s"] + sys.argv[1:]
+    sys.exit(pytest.main(args))