Update regression tests to match new switch configuration
diff --git regress/usr.sbin/vmd/config/Makefile
regress/usr.sbin/vmd/config/Makefile
index 2adc69ae491..a337b816acc 100644
--- regress/usr.sbin/vmd/config/Makefile
+++ regress/usr.sbin/vmd/config/Makefile
@@ -5,7 +5,8 @@ VMD ?= /usr/sbin/vmd
VMD_PASS=boot-keyword memory-round memory-just-enough
VMD_FAIL=kernel-keyword too-few-ram vm-name-too-long too-many-ifs \
boot-name-too-long disk-path-too-long too-many-disks \
- switch-no-interface
+ switch-no-interface switch-no-add switch-no-group \
+ switch-no-rdomain
REGRESS_TARGETS=
diff --git regress/usr.sbin/vmd/config/vmd-fail-switch-no-add.conf
regress/usr.sbin/vmd/config/vmd-fail-switch-no-add.conf
new file mode 100644
index 00000000000..58b6ea699f7
--- /dev/null
+++ regress/usr.sbin/vmd/config/vmd-fail-switch-no-add.conf
@@ -0,0 +1,5 @@
+# $OpenBSD$
+# Fail when a switch is attempting to add an interface
+switch "x" {
+ add vether0
+}
diff --git regress/usr.sbin/vmd/config/vmd-fail-switch-no-add.ok
regress/usr.sbin/vmd/config/vmd-fail-switch-no-add.ok
new file mode 100644
index 00000000000..219cba51f0b
--- /dev/null
+++ regress/usr.sbin/vmd/config/vmd-fail-switch-no-add.ok
@@ -0,0 +1 @@
+4: syntax error
diff --git regress/usr.sbin/vmd/config/vmd-fail-switch-no-group.conf
regress/usr.sbin/vmd/config/vmd-fail-switch-no-group.conf
new file mode 100644
index 00000000000..a3fbc27b086
--- /dev/null
+++ regress/usr.sbin/vmd/config/vmd-fail-switch-no-group.conf
@@ -0,0 +1,6 @@
+# $OpenBSD$
+# Fail when a switch is attempting to set a group
+switch "x" {
+ interface bridge0
+ group test
+}
diff --git regress/usr.sbin/vmd/config/vmd-fail-switch-no-group.ok
regress/usr.sbin/vmd/config/vmd-fail-switch-no-group.ok
new file mode 100644
index 00000000000..c04c2d13732
--- /dev/null
+++ regress/usr.sbin/vmd/config/vmd-fail-switch-no-group.ok
@@ -0,0 +1 @@
+5: syntax error
diff --git regress/usr.sbin/vmd/config/vmd-fail-switch-no-interface.conf
regress/usr.sbin/vmd/config/vmd-fail-switch-no-interface.conf
index 891d9c88176..f92c09656d6 100644
--- regress/usr.sbin/vmd/config/vmd-fail-switch-no-interface.conf
+++ regress/usr.sbin/vmd/config/vmd-fail-switch-no-interface.conf
@@ -1,5 +1,5 @@
# $OpenBSD: vmd-fail-switch-no-interface.conf,v 1.1 2017/10/30 03:49:30
mlarkin Exp $
# Fail when a switch is missing interface name
switch "x" {
- add vether0
+ up
}
diff --git regress/usr.sbin/vmd/config/vmd-fail-switch-no-rdomain.conf
regress/usr.sbin/vmd/config/vmd-fail-switch-no-rdomain.conf
new file mode 100644
index 00000000000..ade16261abb
--- /dev/null
+++ regress/usr.sbin/vmd/config/vmd-fail-switch-no-rdomain.conf
@@ -0,0 +1,5 @@
+# $OpenBSD$
+# Fail when a switch is attempting to specify a rdomain
+switch "x" {
+ rdomain 1
+}
diff --git regress/usr.sbin/vmd/config/vmd-fail-switch-no-rdomain.ok
regress/usr.sbin/vmd/config/vmd-fail-switch-no-rdomain.ok
new file mode 100644
index 00000000000..219cba51f0b
--- /dev/null
+++ regress/usr.sbin/vmd/config/vmd-fail-switch-no-rdomain.ok
@@ -0,0 +1 @@
+4: syntax error
--
2.14.3
