mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-11 12:25:52 +00:00
0ecd685109
The virDomainDefParse* and virDomainDefFormat* methods both accept the VIR_DOMAIN_XML_* flags defined in the public API, along with a set of other VIR_DOMAIN_XML_INTERNAL_* flags defined in domain_conf.c. This is seriously confusing & error prone for a number of reasons: - VIR_DOMAIN_XML_SECURE, VIR_DOMAIN_XML_MIGRATABLE and VIR_DOMAIN_XML_UPDATE_CPU are only relevant for the formatting operation - Some of the VIR_DOMAIN_XML_INTERNAL_* flags only apply to parse or to format, but not both. This patch cleanly separates out the flags. There are two distint VIR_DOMAIN_DEF_PARSE_* and VIR_DOMAIN_DEF_FORMAT_* flags that are used by the corresponding methods. The VIR_DOMAIN_XML_* flags received via public API calls must be converted to the VIR_DOMAIN_DEF_FORMAT_* flags where needed. The various calls to virDomainDefParse which hardcoded the use of the VIR_DOMAIN_XML_INACTIVE flag change to use the VIR_DOMAIN_DEF_PARSE_INACTIVE flag.
324 lines
8.7 KiB
C
324 lines
8.7 KiB
C
#include <config.h>
|
|
|
|
#include "testutils.h"
|
|
|
|
#ifdef WITH_VMX
|
|
|
|
# include <stdio.h>
|
|
# include <string.h>
|
|
# include <unistd.h>
|
|
|
|
# include "internal.h"
|
|
# include "viralloc.h"
|
|
# include "vmx/vmx.h"
|
|
# include "virstring.h"
|
|
|
|
# define VIR_FROM_THIS VIR_FROM_VMWARE
|
|
|
|
static virCapsPtr caps;
|
|
static virVMXContext ctx;
|
|
static virDomainXMLOptionPtr xmlopt;
|
|
|
|
|
|
static void
|
|
testCapsInit(void)
|
|
{
|
|
virCapsGuestPtr guest = NULL;
|
|
|
|
caps = virCapabilitiesNew(VIR_ARCH_I686, true, true);
|
|
|
|
if (caps == NULL)
|
|
return;
|
|
|
|
virCapabilitiesAddHostMigrateTransport(caps, "esx");
|
|
|
|
|
|
/* i686 guest */
|
|
guest =
|
|
virCapabilitiesAddGuest(caps, "hvm",
|
|
VIR_ARCH_I686,
|
|
NULL, NULL, 0, NULL);
|
|
|
|
if (guest == NULL)
|
|
goto failure;
|
|
|
|
if (virCapabilitiesAddGuestDomain(guest, "vmware", NULL, NULL, 0,
|
|
NULL) == NULL) {
|
|
goto failure;
|
|
}
|
|
|
|
/* x86_64 guest */
|
|
guest =
|
|
virCapabilitiesAddGuest(caps, "hvm",
|
|
VIR_ARCH_X86_64,
|
|
NULL, NULL, 0, NULL);
|
|
|
|
if (guest == NULL)
|
|
goto failure;
|
|
|
|
if (virCapabilitiesAddGuestDomain(guest, "vmware", NULL, NULL, 0,
|
|
NULL) == NULL) {
|
|
goto failure;
|
|
}
|
|
|
|
return;
|
|
|
|
failure:
|
|
virObjectUnref(caps);
|
|
virObjectUnref(xmlopt);
|
|
caps = NULL;
|
|
}
|
|
|
|
static int
|
|
testCompareFiles(const char *xml, const char *vmx, int virtualHW_version)
|
|
{
|
|
int result = -1;
|
|
char *xmlData = NULL;
|
|
char *vmxData = NULL;
|
|
char *formatted = NULL;
|
|
virDomainDefPtr def = NULL;
|
|
|
|
if (virtTestLoadFile(xml, &xmlData) < 0)
|
|
goto failure;
|
|
|
|
if (virtTestLoadFile(vmx, &vmxData) < 0)
|
|
goto failure;
|
|
|
|
def = virDomainDefParseString(xmlData, caps, xmlopt,
|
|
1 << VIR_DOMAIN_VIRT_VMWARE,
|
|
VIR_DOMAIN_DEF_PARSE_INACTIVE);
|
|
|
|
if (def == NULL)
|
|
goto failure;
|
|
|
|
if (!virDomainDefCheckABIStability(def, def)) {
|
|
fprintf(stderr, "ABI stability check failed on %s", xml);
|
|
goto failure;
|
|
}
|
|
|
|
formatted = virVMXFormatConfig(&ctx, xmlopt, def, virtualHW_version);
|
|
|
|
if (formatted == NULL)
|
|
goto failure;
|
|
|
|
if (STRNEQ(vmxData, formatted)) {
|
|
virtTestDifference(stderr, vmxData, formatted);
|
|
goto failure;
|
|
}
|
|
|
|
result = 0;
|
|
|
|
failure:
|
|
VIR_FREE(xmlData);
|
|
VIR_FREE(vmxData);
|
|
VIR_FREE(formatted);
|
|
virDomainDefFree(def);
|
|
|
|
return result;
|
|
}
|
|
|
|
struct testInfo {
|
|
const char *input;
|
|
const char *output;
|
|
int virtualHW_version;
|
|
};
|
|
|
|
static int
|
|
testCompareHelper(const void *data)
|
|
{
|
|
int result = -1;
|
|
const struct testInfo *info = data;
|
|
char *xml = NULL;
|
|
char *vmx = NULL;
|
|
|
|
if (virAsprintf(&xml, "%s/xml2vmxdata/xml2vmx-%s.xml", abs_srcdir,
|
|
info->input) < 0 ||
|
|
virAsprintf(&vmx, "%s/xml2vmxdata/xml2vmx-%s.vmx", abs_srcdir,
|
|
info->output) < 0) {
|
|
goto cleanup;
|
|
}
|
|
|
|
result = testCompareFiles(xml, vmx, info->virtualHW_version);
|
|
|
|
cleanup:
|
|
VIR_FREE(xml);
|
|
VIR_FREE(vmx);
|
|
|
|
return result;
|
|
}
|
|
|
|
static int
|
|
testAutodetectSCSIControllerModel(virDomainDiskDefPtr def ATTRIBUTE_UNUSED,
|
|
int *model, void *opaque ATTRIBUTE_UNUSED)
|
|
{
|
|
*model = VIR_DOMAIN_CONTROLLER_MODEL_SCSI_LSILOGIC;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static char *
|
|
testFormatVMXFileName(const char *src, void *opaque ATTRIBUTE_UNUSED)
|
|
{
|
|
bool success = false;
|
|
char *copyOfDatastorePath = NULL;
|
|
char *tmp = NULL;
|
|
char *saveptr = NULL;
|
|
char *datastoreName = NULL;
|
|
char *directoryAndFileName = NULL;
|
|
char *absolutePath = NULL;
|
|
|
|
if (STRPREFIX(src, "[")) {
|
|
/* Found potential datastore path */
|
|
if (VIR_STRDUP(copyOfDatastorePath, src) < 0)
|
|
goto cleanup;
|
|
|
|
/* Expected format: '[<datastore>] <path>' where <path> is optional */
|
|
if ((tmp = STRSKIP(copyOfDatastorePath, "[")) == NULL || *tmp == ']' ||
|
|
(datastoreName = strtok_r(tmp, "]", &saveptr)) == NULL) {
|
|
goto cleanup;
|
|
}
|
|
|
|
directoryAndFileName = strtok_r(NULL, "", &saveptr);
|
|
|
|
if (directoryAndFileName == NULL) {
|
|
directoryAndFileName = (char *)"";
|
|
} else {
|
|
directoryAndFileName += strspn(directoryAndFileName, " ");
|
|
}
|
|
|
|
if (virAsprintf(&absolutePath, "/vmfs/volumes/%s/%s", datastoreName,
|
|
directoryAndFileName) < 0)
|
|
goto cleanup;
|
|
} else if (STRPREFIX(src, "/")) {
|
|
/* Found absolute path */
|
|
ignore_value(VIR_STRDUP(absolutePath, src));
|
|
} else {
|
|
/* Found relative path, this is not supported */
|
|
goto cleanup;
|
|
}
|
|
|
|
success = true;
|
|
|
|
cleanup:
|
|
if (! success)
|
|
VIR_FREE(absolutePath);
|
|
|
|
VIR_FREE(copyOfDatastorePath);
|
|
|
|
return absolutePath;
|
|
}
|
|
|
|
static int
|
|
mymain(void)
|
|
{
|
|
int result = 0;
|
|
|
|
# define DO_TEST(_in, _out, _version) \
|
|
do { \
|
|
struct testInfo info = { _in, _out, _version }; \
|
|
virResetLastError(); \
|
|
if (virtTestRun("VMware XML-2-VMX "_in" -> "_out, \
|
|
testCompareHelper, &info) < 0) { \
|
|
result = -1; \
|
|
} \
|
|
} while (0)
|
|
|
|
testCapsInit();
|
|
|
|
if (caps == NULL)
|
|
return EXIT_FAILURE;
|
|
|
|
if (!(xmlopt = virVMXDomainXMLConfInit()))
|
|
return EXIT_FAILURE;
|
|
|
|
ctx.opaque = NULL;
|
|
ctx.parseFileName = NULL;
|
|
ctx.formatFileName = testFormatVMXFileName;
|
|
ctx.autodetectSCSIControllerModel = testAutodetectSCSIControllerModel;
|
|
|
|
DO_TEST("minimal", "minimal", 4);
|
|
DO_TEST("minimal-64bit", "minimal-64bit", 4);
|
|
|
|
DO_TEST("graphics-vnc", "graphics-vnc", 4);
|
|
|
|
DO_TEST("scsi-driver", "scsi-driver", 4);
|
|
DO_TEST("scsi-writethrough", "scsi-writethrough", 4);
|
|
|
|
DO_TEST("harddisk-scsi-file", "harddisk-scsi-file", 4);
|
|
DO_TEST("harddisk-ide-file", "harddisk-ide-file", 4);
|
|
|
|
DO_TEST("cdrom-scsi-file", "cdrom-scsi-file", 4);
|
|
DO_TEST("cdrom-scsi-device", "cdrom-scsi-device", 4);
|
|
DO_TEST("cdrom-scsi-raw-device", "cdrom-scsi-raw-device", 4);
|
|
DO_TEST("cdrom-scsi-raw-auto-detect", "cdrom-scsi-raw-auto-detect", 4);
|
|
DO_TEST("cdrom-ide-file", "cdrom-ide-file", 4);
|
|
DO_TEST("cdrom-ide-device", "cdrom-ide-device", 4);
|
|
DO_TEST("cdrom-ide-raw-device", "cdrom-ide-raw-device", 4);
|
|
DO_TEST("cdrom-ide-raw-auto-detect", "cdrom-ide-raw-auto-detect", 4);
|
|
|
|
DO_TEST("floppy-file", "floppy-file", 4);
|
|
DO_TEST("floppy-device", "floppy-device", 4);
|
|
|
|
DO_TEST("sharedfolder", "sharedfolder", 4);
|
|
|
|
DO_TEST("ethernet-e1000", "ethernet-e1000", 4);
|
|
DO_TEST("ethernet-vmxnet2", "ethernet-vmxnet2", 4);
|
|
|
|
DO_TEST("ethernet-custom", "ethernet-custom", 4);
|
|
DO_TEST("ethernet-bridged", "ethernet-bridged", 4);
|
|
DO_TEST("ethernet-nat", "ethernet-nat", 4);
|
|
|
|
DO_TEST("ethernet-generated", "ethernet-generated", 4);
|
|
DO_TEST("ethernet-static", "ethernet-static", 4);
|
|
DO_TEST("ethernet-vpx", "ethernet-vpx", 4);
|
|
DO_TEST("ethernet-other", "ethernet-other", 4);
|
|
|
|
DO_TEST("serial-file", "serial-file", 4);
|
|
DO_TEST("serial-device", "serial-device", 4);
|
|
DO_TEST("serial-pipe", "serial-pipe", 4);
|
|
DO_TEST("serial-network-server", "serial-network-server", 7);
|
|
DO_TEST("serial-network-client", "serial-network-client", 7);
|
|
|
|
DO_TEST("parallel-file", "parallel-file", 4);
|
|
DO_TEST("parallel-device", "parallel-device", 4);
|
|
|
|
DO_TEST("esx-in-the-wild-1", "esx-in-the-wild-1", 4);
|
|
DO_TEST("esx-in-the-wild-2", "esx-in-the-wild-2", 4);
|
|
DO_TEST("esx-in-the-wild-3", "esx-in-the-wild-3", 4);
|
|
DO_TEST("esx-in-the-wild-4", "esx-in-the-wild-4", 4);
|
|
DO_TEST("esx-in-the-wild-5", "esx-in-the-wild-5", 4);
|
|
DO_TEST("esx-in-the-wild-6", "esx-in-the-wild-6", 4);
|
|
|
|
DO_TEST("gsx-in-the-wild-1", "gsx-in-the-wild-1", 4);
|
|
DO_TEST("gsx-in-the-wild-2", "gsx-in-the-wild-2", 4);
|
|
DO_TEST("gsx-in-the-wild-3", "gsx-in-the-wild-3", 4);
|
|
DO_TEST("gsx-in-the-wild-4", "gsx-in-the-wild-4", 4);
|
|
|
|
DO_TEST("ws-in-the-wild-1", "ws-in-the-wild-1", 8);
|
|
DO_TEST("ws-in-the-wild-2", "ws-in-the-wild-2", 8);
|
|
|
|
DO_TEST("fusion-in-the-wild-1", "fusion-in-the-wild-1", 9);
|
|
|
|
DO_TEST("annotation", "annotation", 4);
|
|
|
|
DO_TEST("smbios", "smbios", 4);
|
|
|
|
DO_TEST("svga", "svga", 4);
|
|
|
|
virObjectUnref(caps);
|
|
virObjectUnref(xmlopt);
|
|
|
|
return result == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
|
|
}
|
|
|
|
VIRT_TEST_MAIN(mymain)
|
|
|
|
#else
|
|
|
|
int main(void)
|
|
{
|
|
return EXIT_AM_SKIP;
|
|
}
|
|
|
|
#endif /* WITH_VMX */
|