mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-11-09 06:50:22 +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.
304 lines
8.3 KiB
C
304 lines
8.3 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 virDomainXMLOptionPtr xmlopt;
|
|
static virVMXContext ctx;
|
|
|
|
|
|
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);
|
|
caps = NULL;
|
|
}
|
|
|
|
static int
|
|
testCompareFiles(const char *vmx, const char *xml)
|
|
{
|
|
int ret = -1;
|
|
char *vmxData = NULL;
|
|
char *xmlData = NULL;
|
|
char *formatted = NULL;
|
|
virDomainDefPtr def = NULL;
|
|
|
|
if (virtTestLoadFile(vmx, &vmxData) < 0)
|
|
goto cleanup;
|
|
|
|
if (virtTestLoadFile(xml, &xmlData) < 0)
|
|
goto cleanup;
|
|
|
|
if (!(def = virVMXParseConfig(&ctx, xmlopt, vmxData)))
|
|
goto cleanup;
|
|
|
|
if (!virDomainDefCheckABIStability(def, def)) {
|
|
fprintf(stderr, "ABI stability check failed on %s", vmx);
|
|
goto cleanup;
|
|
}
|
|
|
|
if (!(formatted = virDomainDefFormat(def, VIR_DOMAIN_DEF_FORMAT_SECURE)))
|
|
goto cleanup;
|
|
|
|
if (STRNEQ(xmlData, formatted)) {
|
|
virtTestDifference(stderr, xmlData, formatted);
|
|
goto cleanup;
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
cleanup:
|
|
VIR_FREE(vmxData);
|
|
VIR_FREE(xmlData);
|
|
VIR_FREE(formatted);
|
|
virDomainDefFree(def);
|
|
|
|
return ret;
|
|
}
|
|
|
|
struct testInfo {
|
|
const char *input;
|
|
const char *output;
|
|
};
|
|
|
|
static int
|
|
testCompareHelper(const void *data)
|
|
{
|
|
int ret = -1;
|
|
const struct testInfo *info = data;
|
|
char *vmx = NULL;
|
|
char *xml = NULL;
|
|
|
|
if (virAsprintf(&vmx, "%s/vmx2xmldata/vmx2xml-%s.vmx", abs_srcdir,
|
|
info->input) < 0 ||
|
|
virAsprintf(&xml, "%s/vmx2xmldata/vmx2xml-%s.xml", abs_srcdir,
|
|
info->output) < 0) {
|
|
goto cleanup;
|
|
}
|
|
|
|
ret = testCompareFiles(vmx, xml);
|
|
|
|
cleanup:
|
|
VIR_FREE(vmx);
|
|
VIR_FREE(xml);
|
|
|
|
return ret;
|
|
}
|
|
|
|
static char *
|
|
testParseVMXFileName(const char *fileName, void *opaque ATTRIBUTE_UNUSED)
|
|
{
|
|
char *copyOfFileName = NULL;
|
|
char *tmp = NULL;
|
|
char *saveptr = NULL;
|
|
char *datastoreName = NULL;
|
|
char *directoryAndFileName = NULL;
|
|
char *src = NULL;
|
|
|
|
if (STRPREFIX(fileName, "/vmfs/volumes/")) {
|
|
/* Found absolute path referencing a file inside a datastore */
|
|
if (VIR_STRDUP(copyOfFileName, fileName) < 0)
|
|
goto cleanup;
|
|
|
|
/* Expected format: '/vmfs/volumes/<datastore>/<path>' */
|
|
if ((tmp = STRSKIP(copyOfFileName, "/vmfs/volumes/")) == NULL ||
|
|
(datastoreName = strtok_r(tmp, "/", &saveptr)) == NULL ||
|
|
(directoryAndFileName = strtok_r(NULL, "", &saveptr)) == NULL) {
|
|
goto cleanup;
|
|
}
|
|
|
|
if (virAsprintf(&src, "[%s] %s", datastoreName,
|
|
directoryAndFileName) < 0)
|
|
goto cleanup;
|
|
} else if (STRPREFIX(fileName, "/")) {
|
|
/* Found absolute path referencing a file outside a datastore */
|
|
ignore_value(VIR_STRDUP(src, fileName));
|
|
} else if (strchr(fileName, '/') != NULL) {
|
|
/* Found relative path, this is not supported */
|
|
src = NULL;
|
|
} else {
|
|
/* Found single file name referencing a file inside a datastore */
|
|
if (virAsprintf(&src, "[datastore] directory/%s", fileName) < 0)
|
|
goto cleanup;
|
|
}
|
|
|
|
cleanup:
|
|
VIR_FREE(copyOfFileName);
|
|
|
|
return src;
|
|
}
|
|
|
|
static int
|
|
mymain(void)
|
|
{
|
|
int ret = 0;
|
|
|
|
# define DO_TEST(_in, _out) \
|
|
do { \
|
|
struct testInfo info = { _in, _out }; \
|
|
virResetLastError(); \
|
|
if (virtTestRun("VMware VMX-2-XML "_in" -> "_out, \
|
|
testCompareHelper, &info) < 0) { \
|
|
ret = -1; \
|
|
} \
|
|
} while (0)
|
|
|
|
testCapsInit();
|
|
|
|
if (caps == NULL)
|
|
return EXIT_FAILURE;
|
|
|
|
if (!(xmlopt = virVMXDomainXMLConfInit()))
|
|
return EXIT_FAILURE;
|
|
|
|
ctx.opaque = NULL;
|
|
ctx.parseFileName = testParseVMXFileName;
|
|
ctx.formatFileName = NULL;
|
|
ctx.autodetectSCSIControllerModel = NULL;
|
|
|
|
DO_TEST("case-insensitive-1", "case-insensitive-1");
|
|
DO_TEST("case-insensitive-2", "case-insensitive-2");
|
|
|
|
DO_TEST("minimal", "minimal");
|
|
DO_TEST("minimal-64bit", "minimal-64bit");
|
|
|
|
DO_TEST("graphics-vnc", "graphics-vnc");
|
|
|
|
DO_TEST("scsi-driver", "scsi-driver");
|
|
DO_TEST("scsi-writethrough", "scsi-writethrough");
|
|
|
|
DO_TEST("harddisk-scsi-file", "harddisk-scsi-file");
|
|
DO_TEST("harddisk-ide-file", "harddisk-ide-file");
|
|
DO_TEST("harddisk-transient", "harddisk-transient");
|
|
|
|
DO_TEST("cdrom-scsi-file", "cdrom-scsi-file");
|
|
DO_TEST("cdrom-scsi-device", "cdrom-scsi-device");
|
|
DO_TEST("cdrom-scsi-raw-device", "cdrom-scsi-raw-device");
|
|
DO_TEST("cdrom-scsi-raw-auto-detect", "cdrom-scsi-raw-auto-detect");
|
|
DO_TEST("cdrom-ide-file", "cdrom-ide-file");
|
|
DO_TEST("cdrom-ide-device", "cdrom-ide-device");
|
|
DO_TEST("cdrom-ide-raw-device", "cdrom-ide-raw-device");
|
|
DO_TEST("cdrom-ide-raw-auto-detect", "cdrom-ide-raw-auto-detect");
|
|
|
|
DO_TEST("floppy-file", "floppy-file");
|
|
DO_TEST("floppy-device", "floppy-device");
|
|
|
|
DO_TEST("sharedfolder", "sharedfolder");
|
|
|
|
DO_TEST("ethernet-e1000", "ethernet-e1000");
|
|
DO_TEST("ethernet-vmxnet2", "ethernet-vmxnet2");
|
|
|
|
DO_TEST("ethernet-custom", "ethernet-custom");
|
|
DO_TEST("ethernet-bridged", "ethernet-bridged");
|
|
DO_TEST("ethernet-nat", "ethernet-nat");
|
|
|
|
DO_TEST("ethernet-generated", "ethernet-generated");
|
|
DO_TEST("ethernet-static", "ethernet-static");
|
|
DO_TEST("ethernet-vpx", "ethernet-vpx");
|
|
DO_TEST("ethernet-other", "ethernet-other");
|
|
|
|
DO_TEST("serial-file", "serial-file");
|
|
DO_TEST("serial-device", "serial-device");
|
|
DO_TEST("serial-pipe-client-app", "serial-pipe");
|
|
DO_TEST("serial-pipe-server-vm", "serial-pipe");
|
|
DO_TEST("serial-pipe-client-app", "serial-pipe");
|
|
DO_TEST("serial-pipe-server-vm", "serial-pipe");
|
|
DO_TEST("serial-network-server", "serial-network-server");
|
|
DO_TEST("serial-network-client", "serial-network-client");
|
|
|
|
DO_TEST("parallel-file", "parallel-file");
|
|
DO_TEST("parallel-device", "parallel-device");
|
|
|
|
DO_TEST("esx-in-the-wild-1", "esx-in-the-wild-1");
|
|
DO_TEST("esx-in-the-wild-2", "esx-in-the-wild-2");
|
|
DO_TEST("esx-in-the-wild-3", "esx-in-the-wild-3");
|
|
DO_TEST("esx-in-the-wild-4", "esx-in-the-wild-4");
|
|
DO_TEST("esx-in-the-wild-5", "esx-in-the-wild-5");
|
|
DO_TEST("esx-in-the-wild-6", "esx-in-the-wild-6");
|
|
|
|
DO_TEST("gsx-in-the-wild-1", "gsx-in-the-wild-1");
|
|
DO_TEST("gsx-in-the-wild-2", "gsx-in-the-wild-2");
|
|
DO_TEST("gsx-in-the-wild-3", "gsx-in-the-wild-3");
|
|
DO_TEST("gsx-in-the-wild-4", "gsx-in-the-wild-4");
|
|
|
|
DO_TEST("ws-in-the-wild-1", "ws-in-the-wild-1");
|
|
DO_TEST("ws-in-the-wild-2", "ws-in-the-wild-2");
|
|
|
|
DO_TEST("fusion-in-the-wild-1", "fusion-in-the-wild-1");
|
|
|
|
DO_TEST("annotation", "annotation");
|
|
|
|
DO_TEST("smbios", "smbios");
|
|
|
|
DO_TEST("svga", "svga");
|
|
|
|
virObjectUnref(caps);
|
|
virObjectUnref(xmlopt);
|
|
|
|
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
|
|
}
|
|
|
|
VIRT_TEST_MAIN(mymain)
|
|
|
|
#else
|
|
|
|
int main(void)
|
|
{
|
|
return EXIT_AM_SKIP;
|
|
}
|
|
|
|
#endif /* WITH_VMX */
|