Mailing List Archive

# HG changeset patch
# User emellor@leeni.uk.xensource.com
# Node ID 8b3454b6bf5efdb170b570bcf9558bfc0708265a
# Parent d80066fa2dc23d61250ab54390ac2108f455b9dc
Match previous changeset removing nics option.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff -r d80066fa2dc2 -r 8b3454b6bf5e tools/python/xen/xm/tests/test_create.py
--- a/tools/python/xen/xm/tests/test_create.py Tue Dec 13 00:16:02 2005
+++ b/tools/python/xen/xm/tests/test_create.py Tue Dec 13 00:56:50 2005
@@ -36,7 +36,7 @@
(fd, fname) = tempfile.mkstemp()
os.close(fd)
self.t('-f %s kernel=/mykernel display=fakedisplay '
- 'macaddr=ab:cd:ef:ed nics=0' % fname,
+ 'macaddr=ab:cd:ef:ed' % fname,
{ 'name' : os.path.basename(fname),
'xm_file' : fname,
'defconfig' : fname,
@@ -50,6 +50,7 @@
'interface' : 'eth0',
'path' : '.:/etc/xen',
'builder' : 'linux',
+ 'nics' : -1,
})


@@ -62,7 +63,6 @@
memory = 768
name = "dom1"
vcpus = 4
-nics = 1
disk = ['phy:/dev/virt-blkdev-backend/dom1,sda1,w',
'phy:/dev/virt-blkdev-backend/usr,sda2,r']
root = "/dev/sda1 ro"
@@ -79,7 +79,7 @@
'memory' : 768,
'name' : 'dom1',
'vcpus' : 4,
- 'nics' : 1,
+ 'nics' : -1,
'root' : '/dev/sda1 ro',
'extra' : ' profile=1 GATEWAY=10.0.1.254 NETMASK=255.255.0.0 IPADDR=10.0.134.1 HOSTNAME=dom1',
'on_poweroff' : 'destroy',
@@ -118,7 +118,7 @@
finally:
os.close(fd)

- self.t('-f %s display=fakedisplay macaddr=ab:cd:ef:ed nics=0' %
+ self.t('-f %s display=fakedisplay macaddr=ab:cd:ef:ed' %
fname,
{ 'name' : 'testname',
'xm_file' : fname,
@@ -137,6 +137,7 @@
'interface' : 'eth0',
'path' : '.:/etc/xen',
'builder' : 'linux',
+ 'nics' : -1,
})



_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog