From nobody Tue Jun 9 21:00:33 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) client-ip=38.145.34.151; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1778603200; cv=none; d=zohomail.com; s=zohoarc; b=c79S9JOvfj6/5fJDmSbMDFpvV+3H6YhRakKbN/c+SaA4YSR/dK7hsExi4bLsRaI7Hdi4BmOxX+3Ywy325OD/AlUgRxJO+Gny/6eZAlcrE+FCiTWnlKzvo655uURz/CkSy7bifriR9W/iqikiEgy+Jd7RopnHDplNPFGs3yHPoHA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778603200; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:Subject:Subject:To:To:Message-Id:Cc; bh=A50DEluevUduyoJ7Zh9z2QnaLZINjez0qVKMuck/hqs=; b=Wc/uGMRxlln5T61bEjcQe6jz8bHAlkuQiriJKPq43tDCrZ5AbuyU1wqiVeG9pc3sC3iAPuSrICT8OhORydXPWwGjB3iDYQzyd8ooVNiEKZQKOaKt84Ax089fkkzZHiwS9tM5x8ylnhtcihBfipvxw/DTB4le3snu+YAX7gdu4RE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 38.145.34.151 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [38.145.34.151]) by mx.zohomail.com with SMTPS id 1778603199991900.7125286603032; Tue, 12 May 2026 09:26:39 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 993) id F290841908; Tue, 12 May 2026 12:26:38 -0400 (EDT) Received: from [172.19.199.9] (unknown [10.16.107.18]) by lists.libvirt.org (Postfix) with ESMTP id 18B9741A36; Tue, 12 May 2026 12:23:56 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 993) id 09024417EE; Tue, 12 May 2026 12:23:47 -0400 (EDT) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 3BE65418B5 for ; Tue, 12 May 2026 12:23:43 -0400 (EDT) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-551-wfun3kwXMjW8K-04q2jq7w-1; Tue, 12 May 2026 12:23:40 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-48a7994e8ddso37155685e9.0 for ; Tue, 12 May 2026 09:23:39 -0700 (PDT) Received: from carol.localdomain (cst-prg-94-221.cust.vodafone.cz. [46.135.94.221]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48fc8d22d03sm7377265e9.9.2026.05.12.09.23.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2026 09:23:37 -0700 (PDT) Received: from carol.k8r (carol.k8r.cz [127.0.0.1]) by carol.localdomain (Postfix) with ESMTP id C403224107505 for ; Tue, 12 May 2026 18:23:36 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778603022; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A50DEluevUduyoJ7Zh9z2QnaLZINjez0qVKMuck/hqs=; b=hpGjIJP0IOr8VAVwOYI1zSkk0NLMmDEpommsA9ytYVN0q2h8Ld/TOrrRcJT/sRVLAFI+7d 64M9sE2R/hbsicbGCjJXvsRNrMNlc99icPUD5xN7AuAwCwVlYOJ8SZNGaNs1Zj+EEDjxKz ntOApZsBow7cdrWxww88OFTzCuiptaE= X-MC-Unique: wfun3kwXMjW8K-04q2jq7w-1 X-Mimecast-MFC-AGG-ID: wfun3kwXMjW8K-04q2jq7w_1778603019 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778603019; x=1779207819; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=A50DEluevUduyoJ7Zh9z2QnaLZINjez0qVKMuck/hqs=; b=FN7gevVislq1rBubl4oLkA1DKjhUcHteddYgmQU5goEih1/r0OzQOCOlN1GusrtQoq MnwmEfhZwUEastRXHdjUaHcZN8oKgl6UAtb4lUzK3hPkTsD2BBq5HHjIXgil9zUW6an2 IHYqkWD6gQiqovtwbmRsaMPwohvb69t5TuzHd1D3gDvxUtskuvbjzm5XawKPoEh2OeG7 QzwLX8/I8ZWtJ8HIMN7iWWaP+Yk1vtpXA9CUe3R3kFGJN2omkQUsG16/9XpRlBkjfKys 4uZ88p1thIDXFzRelXlXMJ165HxmnCN9Jio1n8dqA2b7RbSzrvXnfHlE0JfCApBzJuqx qiYg== X-Gm-Message-State: AOJu0Yz/sLzFCCMPHXrlhVTxXvLEzkE7K+Lr4kRWnU3cHjoTqCfd9W26 zu1gX7qcAaidELz8zyA0IHUBxnQzhKnEWUjgBDZSTfonQvuhY1nHASeknn3yJv7WEG2soHEIbTx 2yuNT0BBwSo1TODQt/iZxuuS2Nry+l66Uddb4WtTOk8fPm1eE2guScnVu1s49F5y0gq/E0ksGc4 phiQKxYwA2avrVI7lRm4XmZ4rsehrpdAitcXISUPNMD0I= X-Gm-Gg: Acq92OGDw6Ugv6Z0zhBEnCzivxH7bAYLcMHmqNUgBz8S7d6e7bOcFIuFc3ScGGHmg7q CKJOuK0UUreA0x5dBjH19zTqxemX1CFBq0bBPLKHuYm6jlGZG+hGSLlQcH0LQ6+4ZZ6wWDTAoWo 0HUVnho30pGX3ngwqLAHipWQfpuJMFbvpS7LUrB2lOvN6xYoAlE8n6WfzXJisHGTwUM0nSTCwYl +CtgccDwJTlngDqlzzTFAMQFjSq7O48EsD2Lv/9QVc+QTaRE+hny6VTxTClSQIjnPuEoPaGttBp n4i/PJPp30FbZ0hM2Igtr1QAX5id2lKGVg6ZXokA/V282ey3XGOvH9ePqQmmQ6+3bdYSy6epfKt xgt32navuNrgaaNDRrCl8g1PHZBUahqE9+pxiZ0TTe1xfsFsRQoPm+xJ01gg03A== X-Received: by 2002:a05:600c:4695:b0:48a:76a3:2b9b with SMTP id 5b1f17b1804b1-48e706b26fdmr228603675e9.17.1778603018697; Tue, 12 May 2026 09:23:38 -0700 (PDT) X-Received: by 2002:a05:600c:4695:b0:48a:76a3:2b9b with SMTP id 5b1f17b1804b1-48e706b26fdmr228603265e9.17.1778603018077; Tue, 12 May 2026 09:23:38 -0700 (PDT) To: devel@lists.libvirt.org Subject: [PATCH] esx: Track VMs by instanceUuid instead of UUID Date: Tue, 12 May 2026 18:23:30 +0200 Message-ID: <3ff8fe24fe284eb623c05519f85c76493b7e0fad.1778603010.git.mkletzan@redhat.com> X-Mailer: git-send-email 2.54.0 MIME-Version: 1.0 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: BWuuc6zMSrlJFUPm95mj6B5Ou_0yY1Yt7no4xAUEysc_1778603019 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: WEKRADQVZ2CIBNNDRJWXHYQFDXR5MAOD X-Message-ID-Hash: WEKRADQVZ2CIBNNDRJWXHYQFDXR5MAOD X-MailFrom: mkletzan@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Martin Kletzander via Devel Reply-To: Martin Kletzander X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1778603206266154100 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Martin Kletzander The difference is that the usual UUID is supposed to be unique per host and instanceUuid should be unique across the whole cluster. One could think of them as HUID and CUID (as the first "U" does apparently mean something else in the Broadcom world). That _would_ be fine for our scenario. However, that piece of information turns out to be false as well and the UUID we were using (`config.uuid`, or in VMX the `uuid.bios`) can be the same in two machines on the same host. Fortunately the `FindByUuid()` function can also search for VMs based on their `instanceUuid`, dictated by the so far omitted third parameter. Unfortunately that parameter is not parsed (or at least properly) before vSphere API 4.0 (the documentation says 2.0, but we are not using that namespace and 4.0 is the lowest we can target), which we are not specifying in the server returns a 500 HTTP error if we use the `instanceUuid` parameter. So this patch adds the `SOAPAction: urn:vim25/4.0` header to the cURL requests which makes that `FindByUuid()` function work even with the `instanceUuid` set, but without any extra labor. After that this patch also changes all UUIDs to be parsed from the `config.instanceUuid` (or `vc.uuid` in the VMX, but there's a fallback to the old `uuid.bios`) and adjusts tests accordingly. Last, but not least it changes the parameter to aforementioned function to be always true and henceforth all searching ought to be done with the more unique ID. Resolves: https://redhat.atlassian.net/browse/RHEL-174300 Signed-off-by: Martin Kletzander Tested-by: Richard W.M. Jones --- src/esx/esx_driver.c | 8 ++++---- src/esx/esx_vi.c | 16 ++++++++++++++-- src/vmx/vmx.c | 10 +++++++--- tests/vmx2xmldata/esx-in-the-wild-10.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-11.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-12.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-13.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-14.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-15.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-16.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-17.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-5.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-6.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-7.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-8.xml | 2 +- tests/vmx2xmldata/esx-in-the-wild-9.xml | 2 +- 16 files changed, 38 insertions(+), 22 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 010c62b8e880..7cc54af69239 100644 --- a/src/esx/esx_driver.c +++ b/src/esx/esx_driver.c @@ -1419,7 +1419,7 @@ esxDomainLookupByID(virConnectPtr conn, int id) "configStatus\0" "name\0" "runtime.powerState\0" - "config.uuid\0") < 0 || + "config.instanceUuid\0") < 0 || esxVI_LookupVirtualMachineList(priv->primary, propertyNameList, &virtualMachineList) < 0) { goto cleanup; @@ -1522,7 +1522,7 @@ esxDomainLookupByName(virConnectPtr conn, const char = *name) if (esxVI_String_AppendValueListToList(&propertyNameList, "configStatus\0" "runtime.powerState\0" - "config.uuid\0") < 0 || + "config.instanceUuid\0") < 0 || esxVI_LookupVirtualMachineByName(priv->primary, name, propertyName= List, &virtualMachine, esxVI_Occurrence_RequiredItem) < = 0) { @@ -4788,7 +4788,7 @@ esxConnectListAllDomains(virConnectPtr conn, if (esxVI_String_AppendValueListToList(&propertyNameList, "configStatus\0" "name\0" - "config.uuid\0") < 0) { + "config.instanceUuid\0") < = 0) { goto cleanup; } } @@ -4970,7 +4970,7 @@ esxDomainHasManagedSaveImage(virDomainPtr domain, uns= igned int flags) =20 if (esxVI_FindByUuid(priv->primary, priv->primary->datacenter->_refere= nce, uuid_string, esxVI_Boolean_True, - esxVI_Boolean_Undefined, + esxVI_Boolean_True, &managedObjectReference) < 0) { return -1; } diff --git a/src/esx/esx_vi.c b/src/esx/esx_vi.c index db006ed16f40..55d5d1478586 100644 --- a/src/esx/esx_vi.c +++ b/src/esx/esx_vi.c @@ -300,6 +300,17 @@ esxVI_CURL_Connect(esxVI_CURL *curl, esxUtil_ParsedUri= *parsedUri) curl->headers =3D curl_slist_append(curl->headers, "Content-Type: text/xml; charset=3DU= TF-8"); =20 + /* + * Testing showed that the 4.0 version is most close to our current ty= pes in + * esx_vi_generator.input data. We could update the version if new me= thod + * parameters or object properties are needed. + * + * The other option is to drop the "/x.y" suffix completely once + * https://gitlab.com/libvirt/libvirt/-/work_items/878 is implemented = since + * that will not limit the version at all. + */ + curl->headers =3D curl_slist_append(curl->headers, "SOAPAction: urn:vi= m25/4.0"); + /* * Add an empty expect header to stop CURL from waiting for a response= code * 100 (Continue) from the server before continuing the POST operation. @@ -2452,7 +2463,8 @@ esxVI_GetVirtualMachineIdentity(esxVI_ObjectContent *= virtualMachine, for (dynamicProperty =3D virtualMachine->propSet; dynamicProperty; dynamicProperty =3D dynamicProperty->_next) { - if (STREQ(dynamicProperty->name, "config.uuid")) { + + if (STREQ(dynamicProperty->name, "config.instanceUuid")) { if (esxVI_AnyType_ExpectType(dynamicProperty->val, esxVI_Type_String) < 0) { goto failure; @@ -2682,7 +2694,7 @@ esxVI_LookupVirtualMachineByUuid(esxVI_Context *ctx, = const unsigned char *uuid, virUUIDFormat(uuid, uuid_string); =20 if (esxVI_FindByUuid(ctx, ctx->datacenter->_reference, uuid_string, - esxVI_Boolean_True, esxVI_Boolean_Undefined, + esxVI_Boolean_True, esxVI_Boolean_True, &managedObjectReference) < 0) { return -1; } diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 084b4154427f..a2422c37355c 100644 --- a/src/vmx/vmx.c +++ b/src/vmx/vmx.c @@ -1492,9 +1492,13 @@ virVMXParseConfig(virVMXContext *ctx, def->scsiBusMaxUnit =3D SCSI_SUPER_WIDE_BUS_MAX_CONT_UNIT; } =20 - /* vmx:uuid.bios -> def:uuid */ - /* FIXME: Need to handle 'uuid.action =3D "create"' */ - if (virVMXGetConfigUUID(conf, "uuid.bios", def->uuid, true) < 0) + /* vmx:vc.uuid (fallback to uuid.bios) -> def:uuid */ + if (virVMXGetConfigUUID(conf, "vc.uuid", def->uuid, true) < 0) + goto cleanup; + + /* FIXME: Need to handle 'uuid.action =3D "create"' ? */ + if (!virUUIDIsValid(def->uuid) && + virVMXGetConfigUUID(conf, "uuid.bios", def->uuid, true) < 0) goto cleanup; =20 /* vmx:displayName -> def:name */ diff --git a/tests/vmx2xmldata/esx-in-the-wild-10.xml b/tests/vmx2xmldata/e= sx-in-the-wild-10.xml index 1b1fdf06623f..3a8bb20140a1 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-10.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-10.xml @@ -1,6 +1,6 @@ w2019biosvmware - 421a6177-5aa9-abb7-5924-fc376c18a1b4 + 501af9f2-6d29-1c76-19a9-b208ede5f374 13c67c91-9f47-526f-b0d6-e4dd2e4bb4f9 4194304 4194304 diff --git a/tests/vmx2xmldata/esx-in-the-wild-11.xml b/tests/vmx2xmldata/e= sx-in-the-wild-11.xml index 0dd297af43f0..6398e50c5c6c 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-11.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-11.xml @@ -1,6 +1,6 @@ esx6.7-rhel7.7-x86_64 - 422c0152-63ab-cd03-9650-4301ae77aefd + 502ca229-12eb-24f6-0c37-c025ff5da005 2097152 2097152 1 diff --git a/tests/vmx2xmldata/esx-in-the-wild-12.xml b/tests/vmx2xmldata/e= sx-in-the-wild-12.xml index ac83982b9b88..d505ff58d12d 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-12.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-12.xml @@ -1,6 +1,6 @@ Auto-esx8.0-rhell9.3-efi-with-empty-cdrom - 4220fca7-11dd-d67e-19cc-fcad0a37c342 + 5020ca5b-7ac1-5c44-cfa1-9e762e2f933b 2097152 2097152 1 diff --git a/tests/vmx2xmldata/esx-in-the-wild-13.xml b/tests/vmx2xmldata/e= sx-in-the-wild-13.xml index cef9fd4e48c9..2bea51a087eb 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-13.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-13.xml @@ -1,6 +1,6 @@ Test-Mig-VM-1 (01ce57d0-4e20-41a5-8b6c-bcbf49a032ec) - 421eb458-5448-fc12-2074-83d5e419e138 + 01ce57d0-4e20-41a5-8b6c-bcbf49a032ec name:Test-Mig-VM-1 userid:962314ba515c48388a0e95c0961709ff username:admin diff --git a/tests/vmx2xmldata/esx-in-the-wild-14.xml b/tests/vmx2xmldata/e= sx-in-the-wild-14.xml index f10707d1d412..574dd2097455 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-14.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-14.xml @@ -1,6 +1,6 @@ wild14 - 421b223a-f2c1-c7c9-a399-34d2d9fde26d + 501b831e-75d8-15f8-36fa-b9e225f395aa execution env sandbox automation platform 33554432 33554432 diff --git a/tests/vmx2xmldata/esx-in-the-wild-15.xml b/tests/vmx2xmldata/e= sx-in-the-wild-15.xml index 78d15e1538e6..4c753f87e2ea 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-15.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-15.xml @@ -1,6 +1,6 @@ dokuwiki - 420338bd-1c9e-ad50-99a2-59e92ddda8b6 + 500341d5-fe23-ac46-8cb3-77a8e5a1143d 2097152 2097152 2 diff --git a/tests/vmx2xmldata/esx-in-the-wild-16.xml b/tests/vmx2xmldata/e= sx-in-the-wild-16.xml index 51746dd77ef0..8c5bc7f43513 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-16.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-16.xml @@ -1,6 +1,6 @@ Auto-esx8.0-rhel9.4-efi-nvme-disk - 4220df89-e3a8-8513-f611-ad252bfd7047 + 5020196e-c5c8-7310-fcdb-d2933d0c4b2f 2097152 2097152 1 diff --git a/tests/vmx2xmldata/esx-in-the-wild-17.xml b/tests/vmx2xmldata/e= sx-in-the-wild-17.xml index 725f21bdf601..506e08fc54ec 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-17.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-17.xml @@ -1,6 +1,6 @@ esx8.0-win11-with-second-disk-in-subfolder - 42256ec1-e066-9364-3dd1-36a0b75263dd + 50250f27-538b-5091-a43b-a50ce95f2382 3191ed70-eb21-9c71-2478-373fb27fed9b 4194304 4194304 diff --git a/tests/vmx2xmldata/esx-in-the-wild-5.xml b/tests/vmx2xmldata/es= x-in-the-wild-5.xml index c88e60bdc070..a86119508c70 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-5.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-5.xml @@ -1,6 +1,6 @@ vmtest.local - 423e94a9-a1c7-b31d-7161-76c7586c830e + 503e06db-f8d5-458e-a2fb-f9820253a7be Centos 5.5 64bit Server 2097152 2097152 diff --git a/tests/vmx2xmldata/esx-in-the-wild-6.xml b/tests/vmx2xmldata/es= x-in-the-wild-6.xml index 805f03356129..f252304f9796 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-6.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-6.xml @@ -1,6 +1,6 @@ el6-test - 564d15d4-d062-fe9a-80f5-eb8e1a2c3afc + 5200b69b-8d88-7bdf-a14a-02705d653772 1048576 1048576 1 diff --git a/tests/vmx2xmldata/esx-in-the-wild-7.xml b/tests/vmx2xmldata/es= x-in-the-wild-7.xml index b641574776b6..076655f37ac2 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-7.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-7.xml @@ -1,6 +1,6 @@ esx-rhel6-mini-with-scsi-device - 564d9176-621f-0239-f5ad-3a002371953b + 52409533-33a2-56c5-36ce-80d605f8ecf4 2097152 2097152 1 diff --git a/tests/vmx2xmldata/esx-in-the-wild-8.xml b/tests/vmx2xmldata/es= x-in-the-wild-8.xml index f13e6f744880..2ef609e87bdb 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-8.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-8.xml @@ -1,6 +1,6 @@ RHEL7_10_NICs - 42359420-99dc-4261-5264-ba58ddae20e4 + 50351de6-7d56-29ab-9d72-c7f9ea3fcfd0 2097152 2097152 8 diff --git a/tests/vmx2xmldata/esx-in-the-wild-9.xml b/tests/vmx2xmldata/es= x-in-the-wild-9.xml index 6b4d878ab18a..4fbe141f6c47 100644 --- a/tests/vmx2xmldata/esx-in-the-wild-9.xml +++ b/tests/vmx2xmldata/esx-in-the-wild-9.xml @@ -1,6 +1,6 @@ v2v-windows-kkulkarn - 42009372-17da-be73-779d-007ccf1bd228 + 5000d2b0-616e-6129-8c06-82b07440a871 MIQ GUID=3Db55c806d-99b9-4fa5-bbcc-a4de04f822e5 16777216 16777216 --=20 2.54.0