diff options
Diffstat (limited to 'tests/vmx2xmldata')
20 files changed, 58 insertions, 11 deletions
diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml index 3131bb2c1..b47e12860 100644 --- a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml +++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml @@ -13,10 +13,11 @@ <on_crash>destroy</on_crash> <devices> <disk type='file' device='disk'> - <driver name='LSILOGIC'/> <source file='[datastore] directory/FEDORA11.VMDK'/> <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='scsi' index='0' model='lsilogic'/> <interface type='bridge'> <mac address='00:50:56:91:48:c7'/> <source bridge='VM NETWORK'/> diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml b/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml index 766172f99..4974f4e75 100644 --- a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml +++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml @@ -13,10 +13,11 @@ <on_crash>destroy</on_crash> <devices> <disk type='file' device='disk'> - <driver name='lsilogic'/> <source file='[datastore] directory/fedora11.vmdk'/> <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='scsi' index='0' model='lsilogic'/> <interface type='bridge'> <mac address='00:50:56:91:48:c7'/> <source bridge='vm network'/> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml index 12c431e42..1905f9be9 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml @@ -14,6 +14,8 @@ <disk type='block' device='cdrom'> <source dev='/dev/scd0'/> <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='ide' index='0'/> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml index c88d90e77..b9cf1f9c4 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml @@ -14,6 +14,8 @@ <disk type='file' device='cdrom'> <source file='[datastore] directory/cdrom.iso'/> <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='ide' index='0'/> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml index 55ea5e22e..1bb42be1b 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml @@ -14,6 +14,8 @@ <disk type='block' device='cdrom'> <source dev='/dev/scd0'/> <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='scsi' index='0'/> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml index ebd57180e..bdcb0b06e 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml @@ -14,6 +14,8 @@ <disk type='file' device='cdrom'> <source file='[datastore] directory/cdrom.iso'/> <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='scsi' index='0'/> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml index 7cda8b5d9..fd50008fc 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml @@ -13,10 +13,11 @@ <on_crash>destroy</on_crash> <devices> <disk type='file' device='disk'> - <driver name='lsilogic'/> <source file='[datastore] directory/Fedora11.vmdk'/> <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='scsi' index='0' model='lsilogic'/> <interface type='bridge'> <mac address='00:50:56:91:48:c7'/> <source bridge='VM Network'/> diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml index 95fb40b42..e98b67972 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml @@ -13,31 +13,40 @@ <on_crash>destroy</on_crash> <devices> <disk type='file' device='disk'> - <driver name='lsilogic' cache='writethrough'/> + <driver cache='writethrough'/> <source file='[datastore] directory/Debian1.vmdk'/> <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> <disk type='file' device='cdrom'> - <driver name='buslogic'/> <source file='[datastore] directory/Debian1-cdrom.iso'/> <target dev='sdp' bus='scsi'/> + <address type='drive' controller='1' bus='0' unit='0'/> </disk> <disk type='file' device='cdrom'> <source file='/vmimages/tools-isoimages/linux.iso'/> <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> <disk type='block' device='cdrom'> <source dev='/dev/scd0'/> <target dev='hdb' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='1'/> </disk> <disk type='file' device='disk'> <source file='[datastore] directory/Debian1-IDE.vmdk'/> <target dev='hdd' bus='ide'/> + <address type='drive' controller='0' bus='1' unit='1'/> </disk> <disk type='block' device='floppy'> <source dev='/dev/fd0'/> <target dev='fda' bus='fdc'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='scsi' index='0' model='lsilogic'/> + <controller type='scsi' index='1' model='buslogic'/> + <controller type='fdc' index='0'/> + <controller type='ide' index='0'/> <interface type='bridge'> <mac address='00:0c:29:3c:98:3e'/> <source bridge='VM Network'/> diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml index ea30c434b..6d1820927 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml @@ -13,18 +13,23 @@ <on_crash>destroy</on_crash> <devices> <disk type='file' device='disk'> - <driver name='lsilogic'/> <source file='[datastore] directory/Debian2.vmdk'/> <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> <disk type='file' device='cdrom'> <source file='[498076b2-02796c1a-ef5b-000ae484a6a3] Isos/debian-testing-amd64-netinst.iso'/> <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> <disk type='file' device='floppy'> <source file='[498076b2-02796c1a-ef5b-000ae484a6a3] Debian2/dummy.flp'/> <target dev='fdb' bus='fdc'/> + <address type='drive' controller='0' bus='0' unit='1'/> </disk> + <controller type='scsi' index='0' model='lsilogic'/> + <controller type='fdc' index='0'/> + <controller type='ide' index='0'/> <interface type='bridge'> <mac address='00:0c:29:f5:c3:0c'/> <source bridge='VM Network'/> diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml index 3a4c6ae71..5b8fbb97b 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml @@ -13,10 +13,11 @@ <on_crash>destroy</on_crash> <devices> <disk type='file' device='disk'> - <driver name='lsilogic'/> <source file='[datastore] directory/virtMonServ1.vmdk'/> <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='scsi' index='0' model='lsilogic'/> <interface type='bridge'> <mac address='00:50:56:91:66:d4'/> <source bridge='VM Network'/> diff --git a/tests/vmx2xmldata/vmx2xml-floppy-device.xml b/tests/vmx2xmldata/vmx2xml-floppy-device.xml index 3991f735c..4ae16d562 100644 --- a/tests/vmx2xmldata/vmx2xml-floppy-device.xml +++ b/tests/vmx2xmldata/vmx2xml-floppy-device.xml @@ -14,6 +14,8 @@ <disk type='block' device='floppy'> <source dev='/dev/fd0'/> <target dev='fda' bus='fdc'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='fdc' index='0'/> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-floppy-file.xml b/tests/vmx2xmldata/vmx2xml-floppy-file.xml index 5c2e7e3f9..5ab538ed1 100644 --- a/tests/vmx2xmldata/vmx2xml-floppy-file.xml +++ b/tests/vmx2xmldata/vmx2xml-floppy-file.xml @@ -14,6 +14,8 @@ <disk type='file' device='floppy'> <source file='[datastore] directory/floppy.flp'/> <target dev='fda' bus='fdc'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='fdc' index='0'/> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml index 89a70a4bf..0c308bc53 100644 --- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml +++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml @@ -15,7 +15,9 @@ <disk type='file' device='disk'> <source file='[datastore] directory/Debian-System1-0-cl2.vmdk'/> <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='ide' index='0'/> <interface type='bridge'> <mac address='00:0c:29:d6:2b:d3'/> <source bridge='net1'/> diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml index 5f23d6045..7b6158f31 100644 --- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml +++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml @@ -15,7 +15,9 @@ <disk type='file' device='disk'> <source file='[datastore] directory/Debian-System1-0-cl3.vmdk'/> <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='ide' index='0'/> <interface type='bridge'> <mac address='00:0c:29:d6:cb:a4'/> <source bridge='net1'/> diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml index 6f54b277f..b926db57c 100644 --- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml +++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml @@ -15,7 +15,9 @@ <disk type='file' device='disk'> <source file='[datastore] directory/Debian-System1-0-cl1.vmdk'/> <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='ide' index='0'/> <interface type='bridge'> <mac address='00:0c:29:c4:be:5a'/> <source bridge='net1'/> diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml index 5b8d64ed0..5803f4bde 100644 --- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml +++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml @@ -15,7 +15,9 @@ <disk type='file' device='disk'> <source file='[datastore] directory/Debian-System1-0-cl2.vmdk'/> <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='ide' index='0'/> <interface type='bridge'> <mac address='00:0c:29:c5:e3:5d'/> <source bridge='net2'/> diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml b/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml index 59041bda6..7699fbb83 100644 --- a/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml +++ b/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml @@ -14,6 +14,8 @@ <disk type='file' device='disk'> <source file='[datastore] directory/harddisk.vmdk'/> <target dev='hda' bus='ide'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='ide' index='0'/> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml b/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml index 2609f8c90..b04597be3 100644 --- a/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml +++ b/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml @@ -14,6 +14,8 @@ <disk type='file' device='disk'> <source file='[datastore] directory/harddisk.vmdk'/> <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='scsi' index='0'/> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-scsi-driver.xml b/tests/vmx2xmldata/vmx2xml-scsi-driver.xml index 1fa9ac45f..d39415d16 100644 --- a/tests/vmx2xmldata/vmx2xml-scsi-driver.xml +++ b/tests/vmx2xmldata/vmx2xml-scsi-driver.xml @@ -12,19 +12,22 @@ <on_crash>destroy</on_crash> <devices> <disk type='file' device='disk'> - <driver name='buslogic'/> <source file='[datastore] directory/harddisk1.vmdk'/> <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> <disk type='file' device='disk'> - <driver name='lsilogic'/> <source file='[datastore] directory/harddisk2.vmdk'/> <target dev='sdp' bus='scsi'/> + <address type='drive' controller='1' bus='0' unit='0'/> </disk> <disk type='file' device='disk'> - <driver name='lsisas1068'/> <source file='[datastore] directory/harddisk3.vmdk'/> <target dev='sdae' bus='scsi'/> + <address type='drive' controller='2' bus='0' unit='0'/> </disk> + <controller type='scsi' index='0' model='buslogic'/> + <controller type='scsi' index='1' model='lsilogic'/> + <controller type='scsi' index='2' model='lsisas1068'/> </devices> </domain> diff --git a/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml b/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml index f1c40830d..66e22ae04 100644 --- a/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml +++ b/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml @@ -12,9 +12,11 @@ <on_crash>destroy</on_crash> <devices> <disk type='file' device='disk'> - <driver name='buslogic' cache='writethrough'/> + <driver cache='writethrough'/> <source file='[datastore] directory/harddisk.vmdk'/> <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' unit='0'/> </disk> + <controller type='scsi' index='0' model='buslogic'/> </devices> </domain> |