direct-io.hg

changeset 8332:8b3454b6bf5e

Match previous changeset removing nics option.

Signed-off-by: Ewan Mellor <ewan@xensource.com>
author emellor@leeni.uk.xensource.com
date Tue Dec 13 00:56:50 2005 +0000 (2005-12-13)
parents d80066fa2dc2
children 7f2ccea5a4ec
files tools/python/xen/xm/tests/test_create.py
line diff
     1.1 --- a/tools/python/xen/xm/tests/test_create.py	Tue Dec 13 00:16:02 2005 +0000
     1.2 +++ b/tools/python/xen/xm/tests/test_create.py	Tue Dec 13 00:56:50 2005 +0000
     1.3 @@ -36,7 +36,7 @@ class test_create(unittest.TestCase):
     1.4          (fd, fname) = tempfile.mkstemp()
     1.5          os.close(fd)
     1.6          self.t('-f %s kernel=/mykernel display=fakedisplay '
     1.7 -               'macaddr=ab:cd:ef:ed nics=0' % fname,
     1.8 +               'macaddr=ab:cd:ef:ed' % fname,
     1.9                 { 'name'      : os.path.basename(fname),
    1.10                   'xm_file'   : fname,
    1.11                   'defconfig' : fname,
    1.12 @@ -50,6 +50,7 @@ class test_create(unittest.TestCase):
    1.13                   'interface' : 'eth0',
    1.14                   'path'      : '.:/etc/xen',
    1.15                   'builder'   : 'linux',
    1.16 +                 'nics'      : -1,
    1.17                   })
    1.18  
    1.19  
    1.20 @@ -62,7 +63,6 @@ kernel = "/boot/vmlinuz-xenU-smp"
    1.21  memory = 768
    1.22  name = "dom1"
    1.23  vcpus = 4
    1.24 -nics = 1
    1.25  disk = ['phy:/dev/virt-blkdev-backend/dom1,sda1,w',
    1.26  'phy:/dev/virt-blkdev-backend/usr,sda2,r']
    1.27  root = "/dev/sda1 ro"
    1.28 @@ -79,7 +79,7 @@ on_crash    = 'destroy'
    1.29                   'memory'      : 768,
    1.30                   'name'        : 'dom1',
    1.31                   'vcpus'       : 4,
    1.32 -                 'nics'        : 1,
    1.33 +                 'nics'        : -1,
    1.34                   'root'        : '/dev/sda1 ro',
    1.35                   'extra'       : ' profile=1 GATEWAY=10.0.1.254 NETMASK=255.255.0.0 IPADDR=10.0.134.1 HOSTNAME=dom1',
    1.36                   'on_poweroff' : 'destroy',
    1.37 @@ -118,7 +118,7 @@ cpu_weight = 0.75
    1.38          finally:
    1.39              os.close(fd)
    1.40  
    1.41 -        self.t('-f %s display=fakedisplay macaddr=ab:cd:ef:ed nics=0' %
    1.42 +        self.t('-f %s display=fakedisplay macaddr=ab:cd:ef:ed' %
    1.43            fname,
    1.44                 { 'name'       : 'testname',
    1.45                   'xm_file'    : fname,
    1.46 @@ -137,6 +137,7 @@ cpu_weight = 0.75
    1.47                   'interface'  : 'eth0',
    1.48                   'path'       : '.:/etc/xen',
    1.49                   'builder'    : 'linux',
    1.50 +                 'nics'       : -1,
    1.51                   })
    1.52              
    1.53