bhyvexml2argvdata: Add mac address to <interface/>

In the next patch we will need a stable mac address for
<interface/>.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
index e1afefd55f4b1fba8fa1bab930b18998d63f23a3..930166f073f66b894ef93f02fe500dadaed9b40e 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.args
@@ -7,5 +7,5 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:81:c4:b1 \
 -s 2:0,ahci-hd,/tmp/freebsd.img bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
index 316aaf8953f6f199c024a646cb076d98d1696263..3e34a4e7bcc88eda04298fae9a0202c186e1dc6c 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-acpiapic.xml
@@ -18,6 +18,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:81:c4:b1'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.args b/tests/bhyvexml2argvdata/bhyvexml2argv-base.args
index 88de1793453b71ccfe983d356d3b7829229c58ac..76d597cc6ec557ad28f8bfb1a1bfa51048d2388b 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-base.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-base.args
@@ -5,5 +5,5 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:b9:94:02 \
 -s 2:0,ahci-hd,/tmp/freebsd.img bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-base.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-base.xml
index c0d00f13107ace1372b782d3e9812e70a8c2ff86..0b8066733d5485b40d079759365da30571174dbf 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-base.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-base.xml
@@ -14,6 +14,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:b9:94:02'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
index 01a0290a503e6432f19d74d4c38cbb842c3237bf..a303ee3c5b5a32932acfb0e104885005c27fe3fe 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.args
@@ -5,6 +5,6 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:8d:10:e1 \
 -s 2:0,ahci-hd,/tmp/freebsd.img \
 -s 4:0,ahci-cd,/tmp/cdrom.iso bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
index 983e3ccae6e19f12c0f86983e23fc6e5d8066f5a..44a59107d9a45f5b2d301a0a4cf9c64883c76bf5 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder.xml
@@ -21,6 +21,7 @@
       <address type='drive' controller='0' bus='0' target='4' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:8d:10:e1'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
index 01a0290a503e6432f19d74d4c38cbb842c3237bf..04601319bc025e3c215765bab925da4aa4cb7d64 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.args
@@ -5,6 +5,6 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:92:68:0e \
 -s 2:0,ahci-hd,/tmp/freebsd.img \
 -s 4:0,ahci-cd,/tmp/cdrom.iso bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
index 4dfc142b7c28c6223eb5d85598bb2fdf9fc8d7b3..37e6a412e4a6cc7255c8847facb37b4f7fdfbafc 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder1.xml
@@ -21,6 +21,7 @@
       <address type='drive' controller='0' bus='0' target='4' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:92:68:0e'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml
index 74622bc8215955e367683270f95f54d12d2b4c33..93378cc744a0437a568ecd28fdae509d93e567aa 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder2.xml
@@ -15,6 +15,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:1e:63:25'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
index 01a0290a503e6432f19d74d4c38cbb842c3237bf..79631c3a66426a9057342bba1d3b5265b705de6c 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.args
@@ -5,6 +5,6 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:7a:f5:a4 \
 -s 2:0,ahci-hd,/tmp/freebsd.img \
 -s 4:0,ahci-cd,/tmp/cdrom.iso bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
index da29b1bd42c5922b5a1bc8cc9ac283d88242721d..5529cdce7a18f51306d24c06c078fae53fdeb2cf 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder3.xml
@@ -21,6 +21,7 @@
       <boot order='1'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:7a:f5:a4'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
index f2190be33a8dddbfcff56e92257123f0b6d06c10..46dc25ce4956868fbb4a9587447efec499043970 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-bootorder4.xml
@@ -22,6 +22,7 @@
       <boot order='1'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:fe:97:82'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
index 88de1793453b71ccfe983d356d3b7829229c58ac..e80ff026a95dd3691cb1ff8070eb002171b0091d 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.args
@@ -5,5 +5,5 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:11:bd:26 \
 -s 2:0,ahci-hd,/tmp/freebsd.img bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml
index c8268e0c1647c57de0d51fa882e353e377952ea1..08bff2fcfb222072ab98218a1e5443b20b2fbaf6 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-bhyveload-explicitargs.xml
@@ -15,6 +15,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:11:bd:26'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console.args b/tests/bhyvexml2argvdata/bhyvexml2argv-console.args
index fdd89872ad35cd267398958f59d0e504f7ae300f..bd2892c4728fc50211e5416a99be7b5aeaf6d11a 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-console.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console.args
@@ -5,7 +5,7 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:b1:42:eb \
 -s 2:0,ahci-hd,/tmp/freebsd.img \
 -s 1,lpc \
 -l com1,/dev/nmdm0A bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-console.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-console.xml
index bf1564ae208fb9837c5109d13c15b3fbebb14cd8..67293e5591f79eac10ef6c3b6ff398efa38d5854 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-console.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-console.xml
@@ -14,6 +14,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:b1:42:eb'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
index 88de1793453b71ccfe983d356d3b7829229c58ac..7a0eeb2fcdd6139c0504342158776cdc88e244c0 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.args
@@ -5,5 +5,5 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:35:99:c2 \
 -s 2:0,ahci-hd,/tmp/freebsd.img bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml
index 02e83f7bbd529ae22a3457966916a3def6714a74..909f7dcfb6989ffbae82c9303afe976618b48323 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-custom-loader.xml
@@ -16,6 +16,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:35:99:c2'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
index 20c62d4b8fa1f03b71397abf0c4a1538b8e22d31..907751c6c93e0ee5527c53529827ffba6c338155 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.args
@@ -5,5 +5,5 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:6f:6a:53 \
 -s 2:0,ahci-cd,/tmp/cdrom.iso bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml
index 67ad9807909a0b37c040a9643620596e8456d8d5..b95a3bee44ca9257ed8a132ce4caa5d4b8af8dd6 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom-grub.xml
@@ -15,6 +15,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:6f:6a:53'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
index 20c62d4b8fa1f03b71397abf0c4a1538b8e22d31..1806505559bd8267c09645c396cbc57228dfdaf4 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.args
@@ -5,5 +5,5 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:e3:ec:9b \
 -s 2:0,ahci-cd,/tmp/cdrom.iso bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml
index 61cef732aeccad49a1dc75b6107cd29028aa0e08..c3108489693328d352846fa2e13b025551b635e1 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-cdrom.xml
@@ -15,6 +15,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:e3:ec:9b'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
index 4cc9e46f6b8321e807be64dee4f052648d4dee8e..4dcc40404b08c14a3eb076522e0c08a08e8ce83b 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.args
@@ -5,5 +5,5 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:bc:85:fe \
 -s 2:0,virtio-blk,/tmp/freebsd.img bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.xml
index 773d55e611a908805b2fa73870178a6e77303a5e..1d23a95e70b7fed3fb8b8bcdb71df6f6186ee2c4 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-disk-virtio.xml
@@ -14,6 +14,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:bc:85:fe'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
index 74d53be5ac2a7367ed46091a2684548d6f35cffb..1b38be1ab47065bd7dde7545ccddb34e0ffaee94 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.args
@@ -5,7 +5,7 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:f4:6c:be \
 -s 2:0,ahci-hd,/tmp/freebsd1.img \
 -s 4:0,ahci-hd,/tmp/freebsd2.img \
 -s 6:0,ahci-hd,/tmp/freebsd3.img bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
index 40f46a337e90ec17543f5699f208aa9ec77c622d..384cd74b227c1438e91fa46afaf7a98f99a5bc23 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder.xml
@@ -28,6 +28,7 @@
       <address type='drive' controller='0' bus='0' target='6' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:f4:6c:be'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
index 74d53be5ac2a7367ed46091a2684548d6f35cffb..ae510d50d6b3e5178c9913129fe609293844fd45 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.args
@@ -5,7 +5,7 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:0e:d2:6f \
 -s 2:0,ahci-hd,/tmp/freebsd1.img \
 -s 4:0,ahci-hd,/tmp/freebsd2.img \
 -s 6:0,ahci-hd,/tmp/freebsd3.img bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
index c8e877c62f2e842addf5776c29a107367deca0b6..1f2ca4af4df51a4a7b8629eace31b450dda3a5d4 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-bootorder2.xml
@@ -30,6 +30,7 @@
       <address type='drive' controller='0' bus='0' target='6' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:0e:d2:6f'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
index 88de1793453b71ccfe983d356d3b7829229c58ac..9457ce955079e2813c9a52a7be3bcee7a803060a 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.args
@@ -5,5 +5,5 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:ee:f5:79 \
 -s 2:0,ahci-hd,/tmp/freebsd.img bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml
index 2745cd9e22adc525075938db846988780a32513e..761a0120e5a29f90379f113685cb4c5a06338a01 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-grub-defaults.xml
@@ -15,6 +15,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:ee:f5:79'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
index d9f11b435e5156e979418f52e5239fa4e3450c73..3f62aa7fbef0ba15bf00941392b22bf4c4e09aeb 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.args
@@ -4,5 +4,5 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:82:ca:a3 \
 -s 2:0,ahci-hd,/tmp/freebsd.img bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml
index e16d2132f2b3ac182cfe297340048195205467bb..d0fb294042b50a81fc742d62377fa01a3b8a39b9 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-localtime.xml
@@ -15,6 +15,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:82:ca:a3'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
index fdd89872ad35cd267398958f59d0e504f7ae300f..4811d491b7d9f8becddf2d4703400d11baba0790 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.args
@@ -5,7 +5,7 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:a7:cd:5b \
 -s 2:0,ahci-hd,/tmp/freebsd.img \
 -s 1,lpc \
 -l com1,/dev/nmdm0A bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml
index 83690d2d31db88ae8f0f9562f16e7344e8319296..a6a743e719667c99f2196d674e15203585471017 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub-nocons.xml
@@ -15,6 +15,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:a7:cd:5b'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
index fdd89872ad35cd267398958f59d0e504f7ae300f..efdbd63a569a9f951735c151c62a4e992af91bc7 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.args
@@ -5,7 +5,7 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:f0:72:11 \
 -s 2:0,ahci-hd,/tmp/freebsd.img \
 -s 1,lpc \
 -l com1,/dev/nmdm0A bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml
index 83690d2d31db88ae8f0f9562f16e7344e8319296..5d473bb75efa36136b30e81adb3b8be6c3cdd9d0 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial-grub.xml
@@ -15,6 +15,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:f0:72:11'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
index fdd89872ad35cd267398958f59d0e504f7ae300f..ccce5826334aa5d88776c75059445b1e4000386b 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.args
@@ -5,7 +5,7 @@
 -H \
 -P \
 -s 0:0,hostbridge \
--s 3:0,virtio-net,faketapdev,mac=52:54:00:00:00:00 \
+-s 3:0,virtio-net,faketapdev,mac=52:54:00:4f:f3:5b \
 -s 2:0,ahci-hd,/tmp/freebsd.img \
 -s 1,lpc \
 -l com1,/dev/nmdm0A bhyve

diff --git a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml
index 2c6330c082bc6bd514a2b3a43a31ba00b4dc25ef..a354525a806e078a55af56c3f6aaa142da25561c 100644 (file)
--- a/tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml
+++ b/tests/bhyvexml2argvdata/bhyvexml2argv-serial.xml
@@ -14,6 +14,7 @@
       <address type='drive' controller='0' bus='0' target='2' unit='0'/>
     </disk>
     <interface type='bridge'>
+      <mac address='52:54:00:4f:f3:5b'/>
       <model type='virtio'/>
       <source bridge="virbr0"/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>