summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
Diffstat (limited to 'regress')
-rw-r--r--regress/usr.sbin/bgpd/integrationtests/bgpd.op.client.conf3
-rw-r--r--regress/usr.sbin/bgpd/integrationtests/bgpd.op.master.conf15
-rw-r--r--regress/usr.sbin/bgpd/integrationtests/policy.sh4
3 files changed, 14 insertions, 8 deletions
diff --git a/regress/usr.sbin/bgpd/integrationtests/bgpd.op.client.conf b/regress/usr.sbin/bgpd/integrationtests/bgpd.op.client.conf
index 35a6b3182c3..1e1d4d3242d 100644
--- a/regress/usr.sbin/bgpd/integrationtests/bgpd.op.client.conf
+++ b/regress/usr.sbin/bgpd/integrationtests/bgpd.op.client.conf
@@ -13,7 +13,8 @@ neighbor 10.12.57.254 {
local-address $IP
descr "MASTER"
- announce policy $POLICY
+ announce policy yes
+ role $POLICY
}
allow from any
diff --git a/regress/usr.sbin/bgpd/integrationtests/bgpd.op.master.conf b/regress/usr.sbin/bgpd/integrationtests/bgpd.op.master.conf
index 2158e4c7836..0cb46a9ede9 100644
--- a/regress/usr.sbin/bgpd/integrationtests/bgpd.op.master.conf
+++ b/regress/usr.sbin/bgpd/integrationtests/bgpd.op.master.conf
@@ -11,23 +11,28 @@ group TEST {
neighbor 10.12.57.1 {
descr "PEER1"
- announce policy peer enforce
+ announce policy enforce
+ role peer
}
neighbor 10.12.57.2 {
descr "PEER2"
- announce policy rs enforce
+ announce policy enforce
+ role rs
}
neighbor 10.12.57.3 {
descr "PEER3"
- announce policy rs-client enforce
+ announce policy enforce
+ role rs-client
}
neighbor 10.12.57.4 {
descr "PEER4"
- announce policy provider enforce
+ announce policy enforce
+ role provider
}
neighbor 10.12.57.5 {
descr "PEER5"
- announce policy customer enforce
+ announce policy enforce
+ role customer
}
}
diff --git a/regress/usr.sbin/bgpd/integrationtests/policy.sh b/regress/usr.sbin/bgpd/integrationtests/policy.sh
index 0b6d99245ef..17f3240c425 100644
--- a/regress/usr.sbin/bgpd/integrationtests/policy.sh
+++ b/regress/usr.sbin/bgpd/integrationtests/policy.sh
@@ -1,5 +1,5 @@
#!/bin/ksh
-# $OpenBSD: policy.sh,v 1.1 2022/06/27 13:29:40 claudio Exp $
+# $OpenBSD: policy.sh,v 1.2 2023/01/04 14:34:50 claudio Exp $
set -e
@@ -107,7 +107,7 @@ ifconfig lo${RDOMAIN2} inet 127.0.0.1/8
echo test1: no policy
test_bgpd "Last error sent: error in OPEN message, role mismatch" \
- "no" "no" "no" "no" "no"
+ "none" "none" "none" "none" "none"
echo test2: wrong policy
test_bgpd "Last error sent: error in OPEN message, role mismatch" \