rdomain is no more, change this test to validate the vpn statement now.

2 files changed, 18 insertions, 32 deletions

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.5.in b/regress/usr.sbin/bgpd/config/bgpd.conf.5.in
index f08e5c33472..0070feab756 100644
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.5.in
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.5.in
@@ -1,32 +1,28 @@
-# $OpenBSD: bgpd.conf.5.in,v 1.1 2018/09/08 12:32:01 claudio Exp $
-# test rdomain statement
+# $OpenBSD: bgpd.conf.5.in,v 1.2 2019/02/12 09:04:10 claudio Exp $
+# test vpn statement
 
 AS 1
 
 # example from the man page
-rdomain 1 {
-	descr "a rdomain"
+vpn "a rdomain" on mpe0 {
 	rd 65002:1
 	import-target rt 65002:42
 	export-target rt 65002:42
 	network 192.0.2/24
-	depend on mpe0
 }
 
-rdomain 2 {
+vpn "an other" on mpe1 {
 	rd 1:2
 }
 
-rdomain 3 {
+vpn "test-vpn" on mpe2 {
 	rd 1:3
 
 	# some comment
-	descr "test-rdomain"
+	import-target rt 65002:42
 }
 
-rdomain 4 {
-	depend on mpe1
-	descr "test-full"
+vpn "test-full" on mpe3 {
 	export-target rt 65002:42
 	export-target rt 192.0.2.3:42
 	fib-update no
diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.5.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.5.ok
index f25a9f285ad..e38b7902430 100644
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.5.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.5.ok
@@ -5,40 +5,30 @@ holdtime min 3
 fib-priority 48
 
 
-rdomain 1 {
-	descr "a rdomain"
-	fib-update yes
-	depend on mpe0
-	network 192.0.2.0/24
-
+vpn "a rdomain" on mpe0 {
 	rd 65002:1
 	export-target rt 65002:42 
 	import-target rt 65002:42 
-}
-rdomain 2 {
 	fib-update yes
-	depend on 
-
-	rd 1:2
+	network 192.0.2.0/24
 }
-rdomain 3 {
-	descr "test-rdomain"
+vpn "an other" on mpe1 {
+	rd 1:2
 	fib-update yes
-	depend on 
-
+}
+vpn "test-vpn" on mpe2 {
 	rd 1:3
+	import-target rt 65002:42 
+	fib-update yes
 }
-rdomain 4 {
-	descr "test-full"
-	fib-update no
-	depend on mpe1
-	network 192.0.2.32/27
-
+vpn "test-full" on mpe3 {
 	rd 192.0.2.4:1
 	export-target rt 65002:42 
 	export-target rt 192.0.2.3:42 
 	import-target rt 65002:21 
 	import-target rt 192.0.2.3:21 
+	fib-update no
+	network 192.0.2.32/27
 }
 
 rde rib Adj-RIB-In no evaluate