Add an abolute minimal test for L3VPNs. Right now not linked since there

is a bug in the kroute code preventing the VPN route to be added properly.

diff --git a/regress/usr.sbin/bgpd/integrationtests/Makefile b/regress/usr.sbin/bgpd/integrationtests/Makefile
index c7489f9..55605f4 100644 (file)
--- a/regress/usr.sbin/bgpd/integrationtests/Makefile
+++ b/regress/usr.sbin/bgpd/integrationtests/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.18 2022/10/31 18:34:11 claudio Exp $
+# $OpenBSD: Makefile,v 1.19 2022/11/03 15:39:54 claudio Exp $
 
 REGRESS_TARGETS        =       network_statement md5 ovs mrt pftable \
                        maxprefix maxprefixout maxcomm \
@@ -38,6 +38,9 @@ maxprefixout:
 maxcomm:
        ${SUDO} ksh ${.CURDIR}/$@.sh ${BGPD} ${.CURDIR} 11 12 pair11 pair12
 
+l3vpn:
+       ${SUDO} ksh ${.CURDIR}/$@.sh ${BGPD} ${.CURDIR} 11 12 pair11 pair12 13 14
+
 .if ! exists(/usr/local/bin/exabgp)
 as0:
        # install exabgp from ports for additional tests

diff --git a/regress/usr.sbin/bgpd/integrationtests/bgpd.l3vpn.rdomain1.conf b/regress/usr.sbin/bgpd/integrationtests/bgpd.l3vpn.rdomain1.conf
new file mode 100644 (file)
index 0000000..b980ac9
--- /dev/null
+++ b/regress/usr.sbin/bgpd/integrationtests/bgpd.l3vpn.rdomain1.conf
@@ -0,0 +1,22 @@
+AS 4200000001
+router-id 10.12.57.1
+
+log updates
+
+vpn "RDOM13" on mpe13 {
+       rd 4200000001:13
+       import-target rt 4200000001:44
+       export-target rt 4200000001:42
+       network 192.168.42.0/24
+}
+
+neighbor 10.12.57.2 {
+       announce IPv4 unicast
+        announce IPv4 vpn
+
+       descr           "RDOMAIN2"
+       remote-as       4200000002
+}
+
+allow from any
+allow to any

diff --git a/regress/usr.sbin/bgpd/integrationtests/bgpd.l3vpn.rdomain2.conf b/regress/usr.sbin/bgpd/integrationtests/bgpd.l3vpn.rdomain2.conf
new file mode 100644 (file)
index 0000000..dce98f3
--- /dev/null
+++ b/regress/usr.sbin/bgpd/integrationtests/bgpd.l3vpn.rdomain2.conf
@@ -0,0 +1,22 @@
+AS 4200000002
+router-id 10.12.57.1
+
+log updates
+
+vpn "RDOM14" on mpe14 {
+       rd 4200000001:14
+       import-target rt 4200000001:42
+       export-target rt 4200000001:44
+       network 192.168.44.0/24
+}
+
+neighbor 10.12.57.1 {
+       announce IPv4 unicast
+        announce IPv4 vpn
+
+       descr           "RDOMAIN1"
+       remote-as       4200000001
+}
+
+allow from any
+allow to any

diff --git a/regress/usr.sbin/bgpd/integrationtests/l3vpn.sh b/regress/usr.sbin/bgpd/integrationtests/l3vpn.sh
new file mode 100644 (file)
index 0000000..6675250
--- /dev/null
+++ b/regress/usr.sbin/bgpd/integrationtests/l3vpn.sh
@@ -0,0 +1,96 @@
+#!/bin/ksh
+#      $OpenBSD: l3vpn.sh,v 1.1 2022/11/03 15:39:54 claudio Exp $
+
+set -e
+
+BGPD=$1
+BGPDCONFIGDIR=$2
+RDOMAIN1=$3
+RDOMAIN2=$4
+PAIR1=$5
+PAIR2=$6
+RDOMAIN3=$7
+RDOMAIN4=$8
+
+RDOMAINS="${RDOMAIN1} ${RDOMAIN2} ${RDOMAIN3} ${RDOMAIN4}"
+IFACES="${PAIR1} ${PAIR2} ${MPE1} ${MPE2}"
+PAIR1IP=10.12.57.1
+PAIR2IP=10.12.57.2
+
+error_notify() {
+       set -x
+       echo cleanup
+       pfctl -q -t bgpd_integ_test -T kill
+       pkill -T ${RDOMAIN1} bgpd || true
+       pkill -T ${RDOMAIN2} bgpd || true
+       sleep 1
+       ifconfig ${PAIR1} destroy || true
+       ifconfig ${PAIR2} destroy || true
+       ifconfig mpe${RDOMAIN3} destroy || true
+       ifconfig mpe${RDOMAIN4} destroy || true
+       route -qn -T ${RDOMAIN1} flush || true
+       route -qn -T ${RDOMAIN2} flush || true
+       route -qn -T ${RDOMAIN3} flush || true
+       route -qn -T ${RDOMAIN4} flush || true
+       ifconfig lo${RDOMAIN1} destroy || true
+       ifconfig lo${RDOMAIN2} destroy || true
+       ifconfig lo${RDOMAIN3} destroy || true
+       ifconfig lo${RDOMAIN4} destroy || true
+       if [ $1 -ne 0 ]; then
+               echo FAILED
+               exit 1
+       else
+               echo SUCCESS
+       fi
+}
+
+if [ "$(id -u)" -ne 0 ]; then 
+       echo need root privileges >&2
+       exit 1
+fi
+
+trap 'error_notify $?' EXIT
+
+echo check if rdomains are busy
+for n in ${RDOMAINS}; do
+       if /sbin/ifconfig | grep -v "^lo${n}:" | grep " rdomain ${n} "; then
+               echo routing domain ${n} is already used >&2
+               exit 1
+       fi
+done
+
+echo check if interfaces are busy
+for n in ${IFACES}; do
+       /sbin/ifconfig "${n}" >/dev/null 2>&1 && \
+           ( echo interface ${n} is already used >&2; exit 1 )
+done
+
+set -x
+
+echo setup
+ifconfig ${PAIR1} rdomain ${RDOMAIN1} ${PAIR1IP}/29 mpls up
+ifconfig ${PAIR2} rdomain ${RDOMAIN2} ${PAIR2IP}/29 mpls up
+ifconfig ${PAIR1} patch ${PAIR2}
+ifconfig lo${RDOMAIN1} inet 127.0.0.1/8
+ifconfig lo${RDOMAIN2} inet 127.0.0.1/8
+ifconfig mpe${RDOMAIN3} rdomain ${RDOMAIN3} mplslabel 42 192.168.237.242/32
+ifconfig mpe${RDOMAIN4} rdomain ${RDOMAIN4} mplslabel 44 192.168.237.244/32
+ifconfig lo${RDOMAIN3} inet 127.0.0.1/8
+ifconfig lo${RDOMAIN4} inet 127.0.0.1/8
+
+echo run bgpds
+route -T ${RDOMAIN1} exec ${BGPD} \
+       -v -f ${BGPDCONFIGDIR}/bgpd.l3vpn.rdomain1.conf
+sleep 1
+route -T ${RDOMAIN2} exec ${BGPD} \
+       -v -f ${BGPDCONFIGDIR}/bgpd.l3vpn.rdomain2.conf
+
+sleep 3
+
+echo Check setup
+route -T ${RDOMAIN1} exec bgpctl show rib
+route -T ${RDOMAIN1} exec bgpctl show fib table 13
+route -T ${RDOMAIN3} get 192.168.44/24 > /dev/null
+route -T ${RDOMAIN4} get 192.168.42/24 > /dev/null
+
+exit 0