mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-23 21:34:54 +03:00
002b7704ff
This is identical to type='bridge', but without the "connect to a bridge" part, so it can be handled by using the same functions (and often even the same cases in switch statements), after renaming virLXCProcessSetupInterfaceBridged() to virLXCProcessInterfaceTap() and enhancing it to skip bridge-related items when brname == NULL. To be truly useful, we need to support setting the ip address on the host side veth as well as guest side veth (already supported for type='bridge'), as well as setting the peer address for both. The <script> element (supported by type='ethernet' in qemu) isn't supported in this patch. An error is logged at domain start time if it is encountered. This may be changed in a later patch.
141 lines
3.1 KiB
C
141 lines
3.1 KiB
C
#include <config.h>
|
|
|
|
#include "testutils.h"
|
|
|
|
#ifdef WITH_LXC
|
|
|
|
# include "lxc/lxc_native.h"
|
|
# include "lxc/lxc_conf.h"
|
|
# include "testutilslxc.h"
|
|
|
|
# define VIR_FROM_THIS VIR_FROM_NONE
|
|
|
|
static virCapsPtr caps;
|
|
static virDomainXMLOptionPtr xmlopt;
|
|
|
|
static int testSanitizeDef(virDomainDefPtr vmdef)
|
|
{
|
|
/* Remove UUID randomness */
|
|
if (virUUIDParse("c7a5fdbd-edaf-9455-926a-d65c16db1809", vmdef->uuid) < 0)
|
|
return -1;
|
|
return 0;
|
|
}
|
|
|
|
static int
|
|
testCompareXMLToConfigFiles(const char *xmlfile,
|
|
const char *configfile,
|
|
bool expectError)
|
|
{
|
|
int ret = -1;
|
|
char *config = NULL;
|
|
char *actualxml = NULL;
|
|
virDomainDefPtr vmdef = NULL;
|
|
|
|
if (virtTestLoadFile(configfile, &config) < 0)
|
|
goto fail;
|
|
|
|
vmdef = lxcParseConfigString(config, caps, xmlopt);
|
|
if ((vmdef && expectError) || (!vmdef && !expectError))
|
|
goto fail;
|
|
|
|
if (vmdef) {
|
|
if (testSanitizeDef(vmdef) < 0)
|
|
goto fail;
|
|
|
|
if (!(actualxml = virDomainDefFormat(vmdef, caps, 0)))
|
|
goto fail;
|
|
|
|
if (virtTestCompareToFile(actualxml, xmlfile) < 0)
|
|
goto fail;
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
fail:
|
|
VIR_FREE(actualxml);
|
|
VIR_FREE(config);
|
|
virDomainDefFree(vmdef);
|
|
return ret;
|
|
}
|
|
|
|
struct testInfo {
|
|
const char *name;
|
|
bool expectError;
|
|
};
|
|
|
|
static int
|
|
testCompareXMLToConfigHelper(const void *data)
|
|
{
|
|
int result = -1;
|
|
const struct testInfo *info = data;
|
|
char *xml = NULL;
|
|
char *config = NULL;
|
|
|
|
if (virAsprintf(&xml, "%s/lxcconf2xmldata/lxcconf2xml-%s.xml",
|
|
abs_srcdir, info->name) < 0 ||
|
|
virAsprintf(&config, "%s/lxcconf2xmldata/lxcconf2xml-%s.config",
|
|
abs_srcdir, info->name) < 0)
|
|
goto cleanup;
|
|
|
|
result = testCompareXMLToConfigFiles(xml, config, info->expectError);
|
|
|
|
cleanup:
|
|
VIR_FREE(xml);
|
|
VIR_FREE(config);
|
|
return result;
|
|
}
|
|
|
|
static int
|
|
mymain(void)
|
|
{
|
|
int ret = EXIT_SUCCESS;
|
|
|
|
if (!(caps = testLXCCapsInit()))
|
|
return EXIT_FAILURE;
|
|
|
|
if (!(xmlopt = lxcDomainXMLConfInit())) {
|
|
virObjectUnref(caps);
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
# define DO_TEST(name, expectError) \
|
|
do { \
|
|
const struct testInfo info = { name, expectError }; \
|
|
if (virtTestRun("LXC Native-2-XML " name, \
|
|
testCompareXMLToConfigHelper, \
|
|
&info) < 0) \
|
|
ret = EXIT_FAILURE; \
|
|
} while (0)
|
|
|
|
DO_TEST("simple", false);
|
|
DO_TEST("fstab", true);
|
|
DO_TEST("nonetwork", false);
|
|
DO_TEST("nonenetwork", false);
|
|
DO_TEST("physnetwork", false);
|
|
DO_TEST("macvlannetwork", false);
|
|
DO_TEST("vlannetwork", false);
|
|
DO_TEST("idmap", false);
|
|
DO_TEST("memtune", false);
|
|
DO_TEST("cputune", false);
|
|
DO_TEST("cpusettune", false);
|
|
DO_TEST("blkiotune", false);
|
|
DO_TEST("ethernet", false);
|
|
|
|
virObjectUnref(xmlopt);
|
|
virObjectUnref(caps);
|
|
|
|
return ret;
|
|
}
|
|
|
|
VIRT_TEST_MAIN(mymain)
|
|
|
|
#else
|
|
|
|
int
|
|
main(void)
|
|
{
|
|
return EXIT_AM_SKIP;
|
|
}
|
|
|
|
#endif /* WITH_LXC */
|