# HG changeset patch
# User Kaitlin Rupert <karupert(a)us.ibm.com>
# Date 1250030447 25200
# Node ID ad3738df2b5f64ce7e8523e380f77a67b44d1fdd
# Parent 302b70f9ef5dea6cc4f5c685718cf7d8cfea8a60
[TEST] Don't force the MAC address for all guests.
The providers will set a MAC in the case one isn't specified. This will prevent
address clashes in the case a guest isn't cleaned up properly.
Signed-off-by: Kaitlin Rupert <karupert(a)us.ibm.com>
diff -r 302b70f9ef5d -r ad3738df2b5f suites/libvirt-cim/lib/XenKvmLib/vxml.py
--- a/suites/libvirt-cim/lib/XenKvmLib/vxml.py Tue Aug 11 06:25:13 2009 -0700
+++ b/suites/libvirt-cim/lib/XenKvmLib/vxml.py Tue Aug 11 15:40:47 2009 -0700
@@ -791,7 +791,7 @@
mem=const.default_memory,
mem_allocunits=const.default_mallocunits,
vcpus=const.default_vcpus,
- mac=const.Xen_default_mac,
+ mac=None,
disk_file_path=const.Xen_disk_path,
disk=const.Xen_default_disk_dev,
ntype=const.default_net_type,
@@ -857,7 +857,7 @@
mem=const.default_memory,
mem_allocunits=const.default_mallocunits,
vcpus=const.default_vcpus,
- mac=const.KVM_default_mac,
+ mac=None,
disk_file_path=const.KVM_disk_path,
disk=const.KVM_default_disk_dev,
ntype=const.default_net_type,
@@ -913,7 +913,7 @@
mem=const.default_memory,
mem_allocunits=const.default_mallocunits,
vcpus=const.default_vcpus,
- mac=const.XenFV_default_mac,
+ mac=None,
disk_file_path=const.XenFV_disk_path,
disk=const.XenFV_default_disk_dev,
ntype=const.default_net_type,
@@ -973,7 +973,7 @@
uuid=None,
mem=const.default_memory,
vcpus=const.default_vcpus,
- mac=const.LXC_default_mac,
+ mac=None,
ntype=const.default_net_type,
net_name=const.default_network_name,
tty=const.LXC_default_tty, grstype="vnc",