* Update regress tests for new requirement (interface name on switches)
* Add new test for interface name on switch
diff --git regress/usr.sbin/vmd/config/Makefile
regress/usr.sbin/vmd/config/Makefile
index 16a43066415..68b5c13323a 100644
--- regress/usr.sbin/vmd/config/Makefile
+++ regress/usr.sbin/vmd/config/Makefile
@@ -4,7 +4,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
+ boot-name-too-long disk-path-too-long too-many-disks \
+ switch-no-interface
REGRESS_TARGETS=
diff --git regress/usr.sbin/vmd/config/vmd-fail-kernel-keyword.conf
regress/usr.sbin/vmd/config/vmd-fail-kernel-keyword.conf
index 427e5b2a015..77b1a341e44 100644
--- regress/usr.sbin/vmd/config/vmd-fail-kernel-keyword.conf
+++ regress/usr.sbin/vmd/config/vmd-fail-kernel-keyword.conf
@@ -2,6 +2,7 @@
# Fail on kernel keyword; has been replaced by boot.
ramdisk="/bsd.rd"
switch "sw" {
+ interface bridge0
add vether0
}
vm "x" {
diff --git regress/usr.sbin/vmd/config/vmd-fail-kernel-keyword.ok
regress/usr.sbin/vmd/config/vmd-fail-kernel-keyword.ok
index 348817b1477..c171570d330 100644
--- regress/usr.sbin/vmd/config/vmd-fail-kernel-keyword.ok
+++ regress/usr.sbin/vmd/config/vmd-fail-kernel-keyword.ok
@@ -1 +1 @@
-8: syntax error
+9: 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
new file mode 100644
index 00000000000..8afa9e91729
--- /dev/null
+++ regress/usr.sbin/vmd/config/vmd-fail-switch-no-interface.conf
@@ -0,0 +1,5 @@
+# $OpenBSD$
+# Fail when a switch is missing interface name
+switch "x" {
+ add vether0
+}
diff --git regress/usr.sbin/vmd/config/vmd-fail-switch-no-interface.ok
regress/usr.sbin/vmd/config/vmd-fail-switch-no-interface.ok
new file mode 100644
index 00000000000..1cdd5c14c03
--- /dev/null
+++ regress/usr.sbin/vmd/config/vmd-fail-switch-no-interface.ok
@@ -0,0 +1 @@
+5: switch "x" is missing interface name
diff --git regress/usr.sbin/vmd/config/vmd-pass-boot-keyword.conf
regress/usr.sbin/vmd/config/vmd-pass-boot-keyword.conf
index 84124319e1e..2443c697ad0 100644
--- regress/usr.sbin/vmd/config/vmd-pass-boot-keyword.conf
+++ regress/usr.sbin/vmd/config/vmd-pass-boot-keyword.conf
@@ -2,6 +2,7 @@
# Pass on boot keyword as it has replaced the kernel keyword.
ramdisk="/bsd.rd"
switch "sw" {
+ interface bridge0
add vether0
}
vm "x" {
--
2.14.2
