From 80975c3c843c7f7346108f8f302ae01985c916f2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Mon, 20 Jul 2020 16:46:09 +0100
Subject: [PATCH] vmx: support outputing the type attribute for MAC addresses
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

When support for MAC addresses having a type='static|generated'
attribute was added in:

  commit 454e5961abf40c14f8b6d7ee216229e68fd170bf
  Author: Bastien Orivel <bastien.orivel@diateam.net>
  Date:   Mon Jul 13 16:28:53 2020 +0200

    Add a type attribute on the mac address element

the VMX -> XML parser was not updated. As a result while we
accept the 'type' attribute on input, we never show it again
on 'output', so we loose information during the roundtrip.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 src/vmx/vmx.c                                 | 11 +++++++++-
 .../vmx2xml-case-insensitive-1.xml            |  2 +-
 .../vmx2xml-case-insensitive-2.xml            |  2 +-
 .../vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml |  2 +-
 .../vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml |  2 +-
 .../vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml |  2 +-
 .../vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml |  4 ++--
 .../vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml |  2 +-
 .../vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml |  2 +-
 .../vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml |  2 +-
 .../vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml | 20 +++++++++----------
 .../vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml |  2 +-
 .../vmx2xmldata/vmx2xml-ethernet-bridged.xml  |  2 +-
 tests/vmx2xmldata/vmx2xml-ethernet-custom.xml |  2 +-
 tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml  |  2 +-
 .../vmx2xml-ethernet-generated.xml            |  2 +-
 tests/vmx2xmldata/vmx2xml-ethernet-nat.xml    |  2 +-
 tests/vmx2xmldata/vmx2xml-ethernet-other.xml  |  2 +-
 tests/vmx2xmldata/vmx2xml-ethernet-static.xml |  2 +-
 .../vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml  |  2 +-
 tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml    |  2 +-
 .../vmx2xml-fusion-in-the-wild-1.xml          |  4 ++--
 .../vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml |  2 +-
 .../vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml |  2 +-
 .../vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml |  4 ++--
 .../vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml |  2 +-
 .../vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml  |  2 +-
 .../vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml  |  2 +-
 28 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index f0a45089cc..72f6a7d8dd 100644
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -2535,6 +2535,9 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def)
     char generatedAddress_name[48] = "";
     char *generatedAddress = NULL;
 
+    char checkMACAddress_name[48] = "";
+    char *checkMACAddress = NULL;
+
     char address_name[48] = "";
     char *address = NULL;
 
@@ -2564,6 +2567,7 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def)
     VMX_BUILD_NAME(connectionType);
     VMX_BUILD_NAME(addressType);
     VMX_BUILD_NAME(generatedAddress);
+    VMX_BUILD_NAME(checkMACAddress);
     VMX_BUILD_NAME(address);
     VMX_BUILD_NAME(virtualDev);
     VMX_BUILD_NAME(features);
@@ -2598,7 +2602,9 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def)
                               true) < 0 ||
         virVMXGetConfigString(conf, generatedAddress_name, &generatedAddress,
                               true) < 0 ||
-        virVMXGetConfigString(conf, address_name, &address, true) < 0) {
+        virVMXGetConfigString(conf, address_name, &address, true) < 0 ||
+        virVMXGetConfigString(conf, checkMACAddress_name, &checkMACAddress,
+                              true) < 0) {
         goto cleanup;
     }
 
@@ -2613,6 +2619,8 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def)
                 goto cleanup;
             }
         }
+        if (addressType != NULL)
+            (*def)->mac_type = VIR_DOMAIN_NET_MAC_TYPE_GENERATED;
     } else if (STRCASEEQ(addressType, "static")) {
         if (address != NULL) {
             if (virMacAddrParse(address, &(*def)->mac) < 0) {
@@ -2622,6 +2630,7 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def)
                 goto cleanup;
             }
         }
+        (*def)->mac_type = VIR_DOMAIN_NET_MAC_TYPE_STATIC;
     } else {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Expecting VMX entry '%s' to be 'generated' or 'static' or "
diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml
index fd38cfd67f..7cb6413941 100644
--- a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml
+++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml
@@ -22,7 +22,7 @@
     </disk>
     <controller type='scsi' index='0' model='lsilogic'/>
     <interface type='bridge'>
-      <mac address='00:50:56:91:48:c7'/>
+      <mac address='00:50:56:91:48:c7' type='generated'/>
       <source bridge='VM NETWORK'/>
     </interface>
     <video>
diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml b/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml
index eb81691456..188c3f3cd5 100644
--- a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml
+++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml
@@ -22,7 +22,7 @@
     </disk>
     <controller type='scsi' index='0' model='lsilogic'/>
     <interface type='bridge'>
-      <mac address='00:50:56:91:48:c7'/>
+      <mac address='00:50:56:91:48:c7' type='generated'/>
       <source bridge='vm network'/>
     </interface>
     <video>
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml
index 906cfe0648..c15275ccb9 100644
--- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml
+++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml
@@ -22,7 +22,7 @@
     </disk>
     <controller type='scsi' index='0' model='lsilogic'/>
     <interface type='bridge'>
-      <mac address='00:50:56:91:48:c7'/>
+      <mac address='00:50:56:91:48:c7' type='generated'/>
       <source bridge='VM Network'/>
     </interface>
     <video>
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml
index 2f85f82ad0..b079808363 100644
--- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml
+++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml
@@ -48,7 +48,7 @@
     <controller type='fdc' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
-      <mac address='00:0c:29:3c:98:3e'/>
+      <mac address='00:0c:29:3c:98:3e' type='generated'/>
       <source bridge='VM Network'/>
       <model type='vlance'/>
     </interface>
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml
index 8f219165f1..d05318c7d8 100644
--- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml
+++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml
@@ -31,7 +31,7 @@
     <controller type='fdc' index='0'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
-      <mac address='00:0c:29:f5:c3:0c'/>
+      <mac address='00:0c:29:f5:c3:0c' type='generated'/>
       <source bridge='VM Network'/>
     </interface>
     <video>
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml
index d5b3e841b7..a8a2ac6f97 100644
--- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml
+++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml
@@ -22,11 +22,11 @@
     </disk>
     <controller type='scsi' index='0' model='lsilogic'/>
     <interface type='bridge'>
-      <mac address='00:50:56:91:66:d4'/>
+      <mac address='00:50:56:91:66:d4' type='generated'/>
       <source bridge='VM Network'/>
     </interface>
     <interface type='bridge'>
-      <mac address='00:50:56:91:0c:51'/>
+      <mac address='00:50:56:91:0c:51' type='generated'/>
       <source bridge='VM Switch 2'/>
     </interface>
     <serial type='file'>
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml
index 296d48171c..82643e9ffe 100644
--- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml
+++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml
@@ -32,7 +32,7 @@
     <controller type='scsi' index='0' model='lsilogic'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
-      <mac address='00:50:56:be:00:15'/>
+      <mac address='00:50:56:be:00:15' type='generated'/>
       <source bridge='VM-LAN'/>
       <model type='e1000'/>
     </interface>
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml
index 19bace7cfb..913bfedf30 100644
--- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml
+++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml
@@ -25,7 +25,7 @@
     <controller type='scsi' index='0' model='vmpvscsi'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
-      <mac address='00:0c:29:2c:3a:fc'/>
+      <mac address='00:0c:29:2c:3a:fc' type='generated'/>
       <source bridge='VM Network'/>
       <model type='vmxnet3'/>
     </interface>
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml
index 832c1ac864..91913a2918 100644
--- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml
+++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-7.xml
@@ -24,7 +24,7 @@
     </disk>
     <controller type='scsi' index='0' model='vmpvscsi'/>
     <interface type='bridge'>
-      <mac address='00:50:56:9f:08:51'/>
+      <mac address='00:50:56:9f:08:51' type='generated'/>
       <source bridge='VM Network'/>
       <model type='vmxnet3'/>
     </interface>
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml
index 2011bfb3b9..8276457bb3 100644
--- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml
+++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml
@@ -36,52 +36,52 @@
     </disk>
     <controller type='scsi' index='0' model='vmpvscsi'/>
     <interface type='bridge'>
-      <mac address='00:1a:4a:16:01:55'/>
+      <mac address='00:1a:4a:16:01:55' type='static'/>
       <source bridge='VM Network'/>
       <model type='vmxnet3'/>
     </interface>
     <interface type='bridge'>
-      <mac address='00:1a:4a:16:21:85'/>
+      <mac address='00:1a:4a:16:21:85' type='generated'/>
       <source bridge='VM Network'/>
       <model type='e1000'/>
     </interface>
     <interface type='bridge'>
-      <mac address='00:1a:4a:16:21:82'/>
+      <mac address='00:1a:4a:16:21:82' type='generated'/>
       <source bridge='VM Network'/>
       <model type='e1000e'/>
     </interface>
     <interface type='bridge'>
-      <mac address='00:1a:4a:16:21:69'/>
+      <mac address='00:1a:4a:16:21:69' type='generated'/>
       <source bridge='VM Network'/>
       <model type='vmxnet3'/>
     </interface>
     <interface type='bridge'>
-      <mac address='00:1a:4a:16:21:80'/>
+      <mac address='00:1a:4a:16:21:80' type='generated'/>
       <source bridge='VM Network'/>
       <model type='vmxnet3'/>
     </interface>
     <interface type='bridge'>
-      <mac address='00:1a:4a:16:21:a3'/>
+      <mac address='00:1a:4a:16:21:a3' type='generated'/>
       <source bridge='VM Network'/>
       <model type='vmxnet3'/>
     </interface>
     <interface type='bridge'>
-      <mac address='00:1a:4a:16:21:a8'/>
+      <mac address='00:1a:4a:16:21:a8' type='generated'/>
       <source bridge='VM Network'/>
       <model type='vmxnet3'/>
     </interface>
     <interface type='bridge'>
-      <mac address='00:1a:4a:16:21:a9'/>
+      <mac address='00:1a:4a:16:21:a9' type='generated'/>
       <source bridge='VM Network'/>
       <model type='vmxnet3'/>
     </interface>
     <interface type='bridge'>
-      <mac address='00:1a:4a:16:21:78'/>
+      <mac address='00:1a:4a:16:21:78' type='generated'/>
       <source bridge='VM Network'/>
       <model type='vmxnet3'/>
     </interface>
     <interface type='bridge'>
-      <mac address='00:1a:4a:16:21:81'/>
+      <mac address='00:1a:4a:16:21:81' type='generated'/>
       <source bridge='VM Network'/>
       <model type='vmxnet3'/>
     </interface>
diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml
index fa428c1986..66eca400dd 100644
--- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml
+++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml
@@ -26,7 +26,7 @@
     </disk>
     <controller type='scsi' index='0' model='lsisas1068'/>
     <interface type='bridge'>
-      <mac address='00:50:56:80:b3:81'/>
+      <mac address='00:50:56:80:b3:81' type='generated'/>
       <source bridge='VM Network'/>
       <model type='vmxnet3'/>
     </interface>
diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml b/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml
index 0fe29ccd97..fac5cd7bd5 100644
--- a/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml
+++ b/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml
@@ -12,7 +12,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <interface type='bridge'>
-      <mac address='00:50:56:11:22:33'/>
+      <mac address='00:50:56:11:22:33' type='static'/>
       <source bridge='VM Network'/>
     </interface>
     <video>
diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml b/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml
index e10ecd7685..ce63c24127 100644
--- a/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml
+++ b/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml
@@ -12,7 +12,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <interface type='bridge'>
-      <mac address='00:50:56:11:22:33'/>
+      <mac address='00:50:56:11:22:33' type='static'/>
       <source bridge='VM Network'/>
       <target dev='vmnet7'/>
     </interface>
diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml b/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml
index d497a3836f..534d35e352 100644
--- a/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml
+++ b/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml
@@ -12,7 +12,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <interface type='bridge'>
-      <mac address='00:50:56:11:22:33'/>
+      <mac address='00:50:56:11:22:33' type='static'/>
       <source bridge='VM Network'/>
       <model type='e1000'/>
     </interface>
diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml b/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml
index 23b54c81c9..3fbc013f21 100644
--- a/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml
+++ b/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml
@@ -12,7 +12,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <interface type='bridge'>
-      <mac address='00:0c:29:11:22:33'/>
+      <mac address='00:0c:29:11:22:33' type='generated'/>
       <source bridge='VM Network'/>
     </interface>
     <video>
diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml b/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml
index 562ddfc0ca..af721e3059 100644
--- a/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml
+++ b/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml
@@ -12,7 +12,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <interface type='user'>
-      <mac address='00:50:56:11:22:33'/>
+      <mac address='00:50:56:11:22:33' type='static'/>
     </interface>
     <video>
       <model type='vmvga' vram='4096' primary='yes'/>
diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-other.xml b/tests/vmx2xmldata/vmx2xml-ethernet-other.xml
index e7abad0724..b90dfe5d9b 100644
--- a/tests/vmx2xmldata/vmx2xml-ethernet-other.xml
+++ b/tests/vmx2xmldata/vmx2xml-ethernet-other.xml
@@ -12,7 +12,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <interface type='bridge'>
-      <mac address='00:12:34:56:78:90'/>
+      <mac address='00:12:34:56:78:90' type='static'/>
       <source bridge='VM Network'/>
     </interface>
     <video>
diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-static.xml b/tests/vmx2xmldata/vmx2xml-ethernet-static.xml
index 0fe29ccd97..fac5cd7bd5 100644
--- a/tests/vmx2xmldata/vmx2xml-ethernet-static.xml
+++ b/tests/vmx2xmldata/vmx2xml-ethernet-static.xml
@@ -12,7 +12,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <interface type='bridge'>
-      <mac address='00:50:56:11:22:33'/>
+      <mac address='00:50:56:11:22:33' type='static'/>
       <source bridge='VM Network'/>
     </interface>
     <video>
diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml
index bbe7dfd378..54c9283989 100644
--- a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml
+++ b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml
@@ -12,7 +12,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <interface type='bridge'>
-      <mac address='00:50:56:11:22:33'/>
+      <mac address='00:50:56:11:22:33' type='static'/>
       <source bridge='VM Network'/>
       <model type='vmxnet2'/>
     </interface>
diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml
index 5dbdb5227e..c75d52f5b2 100644
--- a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml
+++ b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml
@@ -12,7 +12,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <interface type='bridge'>
-      <mac address='00:50:56:87:65:43'/>
+      <mac address='00:50:56:87:65:43' type='generated'/>
       <source bridge='VM Network'/>
     </interface>
     <video>
diff --git a/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml
index cfc0d95960..2dd46eb2b1 100644
--- a/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml
+++ b/tests/vmx2xmldata/vmx2xml-fusion-in-the-wild-1.xml
@@ -25,11 +25,11 @@
     <controller type='scsi' index='0' model='buslogic'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
-      <mac address='00:0c:29:3b:64:ea'/>
+      <mac address='00:0c:29:3b:64:ea' type='generated'/>
       <source bridge=''/>
     </interface>
     <interface type='bridge'>
-      <mac address='00:0c:29:3b:64:f4'/>
+      <mac address='00:0c:29:3b:64:f4' type='generated'/>
       <source bridge=''/>
     </interface>
     <video>
diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml
index e507cfc2f4..62ec191c82 100644
--- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml
+++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml
@@ -19,7 +19,7 @@
     </disk>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
-      <mac address='00:0c:29:d6:2b:d3'/>
+      <mac address='00:0c:29:d6:2b:d3' type='generated'/>
       <source bridge='net1'/>
       <target dev='/dev/vmnet1'/>
     </interface>
diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml
index 39e89bb204..906e4657ca 100644
--- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml
+++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml
@@ -19,7 +19,7 @@
     </disk>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
-      <mac address='00:0c:29:d6:cb:a4'/>
+      <mac address='00:0c:29:d6:cb:a4' type='generated'/>
       <source bridge='net1'/>
       <target dev='/dev/vmnet1'/>
     </interface>
diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml
index 51101ded23..61812851e1 100644
--- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml
+++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml
@@ -19,12 +19,12 @@
     </disk>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
-      <mac address='00:0c:29:c4:be:5a'/>
+      <mac address='00:0c:29:c4:be:5a' type='generated'/>
       <source bridge='net1'/>
       <target dev='/dev/vmnet1'/>
     </interface>
     <interface type='bridge'>
-      <mac address='00:0c:29:c4:be:64'/>
+      <mac address='00:0c:29:c4:be:64' type='generated'/>
       <source bridge='net2'/>
       <target dev='/dev/vmnet2'/>
     </interface>
diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml
index 849367a52d..a65a7d137f 100644
--- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml
+++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml
@@ -19,7 +19,7 @@
     </disk>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
-      <mac address='00:0c:29:c5:e3:5d'/>
+      <mac address='00:0c:29:c5:e3:5d' type='generated'/>
       <source bridge='net2'/>
       <target dev='/dev/vmnet2'/>
     </interface>
diff --git a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml
index 9ea6bd754d..9901033bb9 100644
--- a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml
+++ b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml
@@ -25,7 +25,7 @@
     <controller type='scsi' index='0' model='lsilogic'/>
     <controller type='ide' index='0'/>
     <interface type='user'>
-      <mac address='00:50:56:2f:d3:46'/>
+      <mac address='00:50:56:2f:d3:46' type='static'/>
       <model type='e1000'/>
     </interface>
     <video>
diff --git a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml
index ce8f802f88..628dfbaff0 100644
--- a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml
+++ b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml
@@ -25,7 +25,7 @@
     <controller type='scsi' index='0' model='lsilogic'/>
     <controller type='ide' index='0'/>
     <interface type='bridge'>
-      <mac address='00:50:56:2f:d3:46'/>
+      <mac address='00:50:56:2f:d3:46' type='static'/>
       <source bridge=''/>
       <model type='e1000'/>
     </interface>
-- 
2.47.2