This is an attachment from the following bug: https://bugzilla.redhat.com/show_bug.cgi?id=1738392 Notice that .vmx file has two scsi disks, but only one is reported in the XML. This will be fixed later. Signed-off-by: Michal Privoznik <mprivozn@xxxxxxxxxx> --- .../vmx2xml-esx-in-the-wild-11.vmx | 91 +++++++++++++++++++ .../vmx2xml-esx-in-the-wild-11.xml | 33 +++++++ tests/vmx2xmltest.c | 1 + 3 files changed, 125 insertions(+) create mode 100644 tests/vmx2xmldata/vmx2xml-esx-in-the-wild-11.vmx create mode 100644 tests/vmx2xmldata/vmx2xml-esx-in-the-wild-11.xml diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-11.vmx b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-11.vmx new file mode 100644 index 0000000000..ae1d146f9a --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-11.vmx @@ -0,0 +1,91 @@ +.encoding = "UTF-8" +config.version = "8" +virtualHW.version = "14" +nvram = "esx6.7-rhel7.7-x86_64.nvram" +pciBridge0.present = "TRUE" +svga.present = "TRUE" +pciBridge4.present = "TRUE" +pciBridge4.virtualDev = "pcieRootPort" +pciBridge4.functions = "8" +pciBridge5.present = "TRUE" +pciBridge5.virtualDev = "pcieRootPort" +pciBridge5.functions = "8" +pciBridge6.present = "TRUE" +pciBridge6.virtualDev = "pcieRootPort" +pciBridge6.functions = "8" +pciBridge7.present = "TRUE" +pciBridge7.virtualDev = "pcieRootPort" +pciBridge7.functions = "8" +vmci0.present = "TRUE" +hpet0.present = "TRUE" +floppy0.present = "FALSE" +svga.vramSize = "8388608" +memSize = "2048" +powerType.powerOff = "default" +powerType.suspend = "default" +powerType.reset = "default" +tools.upgrade.policy = "manual" +sched.cpu.units = "mhz" +sched.cpu.affinity = "all" +vm.createDate = "1555568769667396" +scsi0.virtualDev = "pvscsi" +scsi0.present = "TRUE" +scsi0:0.deviceType = "scsi-hardDisk" +scsi0:0.fileName = "esx6.7-rhel7.7-x86_64-000004.vmdk" +sched.scsi0:0.shares = "normal" +sched.scsi0:0.throughputCap = "off" +scsi0:0.present = "TRUE" +ethernet0.virtualDev = "vmxnet3" +ethernet0.networkName = "VM Network" +ethernet0.addressType = "vpx" +ethernet0.generatedAddress = "00:50:56:AC:3E:A1" +ethernet0.uptCompatibility = "TRUE" +ethernet0.present = "TRUE" +ide0:0.deviceType = "cdrom-raw" +ide0:0.clientDevice = "TRUE" +ide0:0.fileName = "emptyBackingString" +ide0:0.present = "TRUE" +displayName = "esx6.7-rhel7.7-x86_64" +guestOS = "rhel7-64" +toolScripts.afterPowerOn = "TRUE" +toolScripts.afterResume = "TRUE" +toolScripts.beforeSuspend = "TRUE" +toolScripts.beforePowerOff = "TRUE" +uuid.bios = "42 2c 01 52 63 ab cd 03-96 50 43 01 ae 77 ae fd" +vc.uuid = "50 2c a2 29 12 eb 24 f6-0c 37 c0 25 ff 5d a0 05" +migrate.hostLog = "esx6.7-rhel7.7-x86_64-347128e5.hlog" +sched.cpu.min = "0" +sched.cpu.shares = "normal" +sched.mem.min = "0" +sched.mem.minSize = "0" +sched.mem.shares = "normal" +migrate.encryptionMode = "opportunistic" +numa.autosize.cookie = "10001" +numa.autosize.vcpu.maxPerVirtualNode = "1" +sched.swap.derivedName = "/vmfs/volumes/83bc25a5-593d7893/esx6.7-rhel7.7-x86_64/esx6.7-rhel7.7-x86_64-352483fd.vswp" +uuid.location = "56 4d 17 9b 66 42 62 96-69 a4 0f c6 2b c5 b9 c6" +scsi0:0.redo = "" +pciBridge0.pciSlotNumber = "17" +pciBridge4.pciSlotNumber = "21" +pciBridge5.pciSlotNumber = "22" +pciBridge6.pciSlotNumber = "23" +pciBridge7.pciSlotNumber = "24" +scsi0.pciSlotNumber = "160" +ethernet0.pciSlotNumber = "192" +vmci0.pciSlotNumber = "32" +scsi0.sasWWID = "50 05 05 62 63 ab cd 00" +vmci0.id = "-1367888131" +monitor.phys_bits_used = "43" +vmotion.checkpointFBSize = "8388608" +vmotion.checkpointSVGAPrimarySize = "8388608" +cleanShutdown = "TRUE" +softPowerOff = "FALSE" +svga.guestBackedPrimaryAware = "TRUE" +tools.remindInstall = "FALSE" +tools.syncTime = "FALSE" +scsi0:16.deviceType = "scsi-hardDisk" +scsi0:16.fileName = "esx6.7-rhel7.7-x86_64_3.vmdk" +sched.scsi0:16.shares = "normal" +sched.scsi0:16.throughputCap = "off" +scsi0:16.present = "TRUE" +scsi0:16.redo = "" diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-11.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-11.xml new file mode 100644 index 0000000000..cf414975b3 --- /dev/null +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-11.xml @@ -0,0 +1,33 @@ +<domain type='vmware'> + <name>esx6.7-rhel7.7-x86_64</name> + <uuid>422c0152-63ab-cd03-9650-4301ae77aefd</uuid> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>2097152</currentMemory> + <vcpu placement='static'>1</vcpu> + <cputune> + <shares>1000</shares> + </cputune> + <os> + <type arch='x86_64'>hvm</type> + </os> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <disk type='file' device='disk'> + <source file='[datastore] directory/esx6.7-rhel7.7-x86_64-000004.vmdk'/> + <target dev='sda' bus='scsi'/> + <address type='drive' controller='0' bus='0' target='0' unit='0'/> + </disk> + <controller type='scsi' index='0' model='vmpvscsi'/> + <interface type='bridge'> + <mac address='00:50:56:ac:3e:a1' type='generated'/> + <source bridge='VM Network'/> + <model type='vmxnet3'/> + </interface> + <video> + <model type='vmvga' vram='8192' primary='yes'/> + </video> + </devices> +</domain> diff --git a/tests/vmx2xmltest.c b/tests/vmx2xmltest.c index 8f74648503..453641faf1 100644 --- a/tests/vmx2xmltest.c +++ b/tests/vmx2xmltest.c @@ -292,6 +292,7 @@ mymain(void) DO_TEST("esx-in-the-wild-8", "esx-in-the-wild-8"); DO_TEST("esx-in-the-wild-9", "esx-in-the-wild-9"); DO_TEST("esx-in-the-wild-10", "esx-in-the-wild-10"); + DO_TEST("esx-in-the-wild-11", "esx-in-the-wild-11"); DO_TEST("gsx-in-the-wild-1", "gsx-in-the-wild-1"); DO_TEST("gsx-in-the-wild-2", "gsx-in-the-wild-2"); -- 2.31.1
