ia64/xen-unstable

diff tools/python/scripts/test_vm_create.py @ 13787:85e8d7b8360a

[XENAPI] Remove some deprecated fields from the Xen API test script.

Signed-off-by: Alastair Tse <atse@xensource.com>
author Alastair Tse <atse@xensource.com>
date Wed Jan 31 15:06:40 2007 +0000 (2007-01-31)
parents 3cccf8e64296
children 48d581be85ea
line diff
     1.1 --- a/tools/python/scripts/test_vm_create.py	Wed Jan 31 15:05:58 2007 +0000
     1.2 +++ b/tools/python/scripts/test_vm_create.py	Wed Jan 31 15:06:40 2007 +0000
     1.3 @@ -15,14 +15,9 @@ vm_cfg = {
     1.4      'VCPUs_policy': 'credit',
     1.5      'VCPUs_params': '',
     1.6      'VCPUs_number': 2,
     1.7 -    'VCPUs_features_required': '',
     1.8 -    'VCPUs_features_can_use': '',
     1.9 -    'VCPUs_features_force_on': '',
    1.10 -    'VCPUs_features_force_off': '',
    1.11  
    1.12      'actions_after_shutdown': 'destroy',
    1.13      'actions_after_reboot': 'restart',
    1.14 -    'actions_after_suspend': 'destroy',
    1.15      'actions_after_crash': 'destroy',
    1.16      
    1.17      'PV_bootloader': '',
    1.18 @@ -65,7 +60,7 @@ vbd_cfg = {
    1.19  local_vdi_cfg = {
    1.20      'name_label': 'gentoo.amd64.img',
    1.21      'name_description': '',
    1.22 -    'uri': 'file:/root/gentoo.amd64.img',
    1.23 +    'location': 'file:/root/gentoo.amd64.img',
    1.24      'virtual_size': 0,
    1.25      'sector_size': 0,
    1.26      'type': 'system',
    1.27 @@ -183,13 +178,13 @@ def test_vm_create():
    1.28              execute(server, 'VM.resume', (session, vm_uuid, False))
    1.29              print 'Resumed VM.'
    1.30  
    1.31 +    finally:
    1.32          # Wait for user to say we're good to shut it down
    1.33          while True:
    1.34              destroy = raw_input('destroy VM? ')
    1.35              if destroy[0] in ('y', 'Y'):
    1.36                  break
    1.37 -
    1.38 -    finally:
    1.39 +        
    1.40          # Clean up
    1.41          if vif_uuid:
    1.42              execute(server, 'VIF.destroy', (session, vif_uuid))