direct-io.hg

changeset 13751: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 0c91fd1c92c7
children beb0b36de156
files tools/python/scripts/test_hvm_create.py tools/python/scripts/test_vm_create.py
line diff
     1.1 --- a/tools/python/scripts/test_hvm_create.py	Wed Jan 31 15:05:58 2007 +0000
     1.2 +++ b/tools/python/scripts/test_hvm_create.py	Wed Jan 31 15:06:40 2007 +0000
     1.3 @@ -13,16 +13,11 @@ vm_cfg = {
     1.4      
     1.5      
     1.6      'VCPUs_policy': 'credit',
     1.7 -    'VCPUs_params': '',
     1.8 +    'VCPUs_params': {},
     1.9      'VCPUs_number': 2,
    1.10 -    'VCPUs_features_required': '',
    1.11 -    'VCPUs_features_can_use': '',
    1.12 -    'VCPUs_features_force_on': '',
    1.13 -    'VCPUs_features_force_off': '',
    1.14  
    1.15      'actions_after_shutdown': 'destroy',
    1.16      'actions_after_reboot': 'restart',
    1.17 -    'actions_after_suspend': 'destroy',
    1.18      'actions_after_crash': 'destroy',
    1.19      
    1.20      'PV_bootloader': '',
    1.21 @@ -44,7 +39,7 @@ vm_cfg = {
    1.22  local_vdi_cfg = {
    1.23      'name_label': 'gentoo.hvm',
    1.24      'name_description': '',
    1.25 -    'uri': 'file:/root/gentoo.amd64.hvm.img',
    1.26 +    'location': 'file:/root/gentoo.amd64.hvm.img',
    1.27      'virtual_size': 0,
    1.28      'sector_size': 0,
    1.29      'type': 'system',
     2.1 --- a/tools/python/scripts/test_vm_create.py	Wed Jan 31 15:05:58 2007 +0000
     2.2 +++ b/tools/python/scripts/test_vm_create.py	Wed Jan 31 15:06:40 2007 +0000
     2.3 @@ -15,14 +15,9 @@ vm_cfg = {
     2.4      'VCPUs_policy': 'credit',
     2.5      'VCPUs_params': '',
     2.6      'VCPUs_number': 2,
     2.7 -    'VCPUs_features_required': '',
     2.8 -    'VCPUs_features_can_use': '',
     2.9 -    'VCPUs_features_force_on': '',
    2.10 -    'VCPUs_features_force_off': '',
    2.11  
    2.12      'actions_after_shutdown': 'destroy',
    2.13      'actions_after_reboot': 'restart',
    2.14 -    'actions_after_suspend': 'destroy',
    2.15      'actions_after_crash': 'destroy',
    2.16      
    2.17      'PV_bootloader': '',
    2.18 @@ -65,7 +60,7 @@ vbd_cfg = {
    2.19  local_vdi_cfg = {
    2.20      'name_label': 'gentoo.amd64.img',
    2.21      'name_description': '',
    2.22 -    'uri': 'file:/root/gentoo.amd64.img',
    2.23 +    'location': 'file:/root/gentoo.amd64.img',
    2.24      'virtual_size': 0,
    2.25      'sector_size': 0,
    2.26      'type': 'system',
    2.27 @@ -183,13 +178,13 @@ def test_vm_create():
    2.28              execute(server, 'VM.resume', (session, vm_uuid, False))
    2.29              print 'Resumed VM.'
    2.30  
    2.31 +    finally:
    2.32          # Wait for user to say we're good to shut it down
    2.33          while True:
    2.34              destroy = raw_input('destroy VM? ')
    2.35              if destroy[0] in ('y', 'Y'):
    2.36                  break
    2.37 -
    2.38 -    finally:
    2.39 +        
    2.40          # Clean up
    2.41          if vif_uuid:
    2.42              execute(server, 'VIF.destroy', (session, vif_uuid))