mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-11 12:25:52 +00:00
936565c701
This patch adds an optional attribute to the <bootp> tag, that allows to specify a TFTP server address other than the address of the DHCP server itself. This can be used to forward the BOOTP settings of the host down to the guest. This is something that configurations such as Xen's default network achieve naturally, but must be done manually for NAT. * docs/formatnetwork.html.in: Document new attribute. * docs/schemas/network.rng: Add it to schema. * src/conf/network_conf.h: Add it to struct. * src/conf/network_conf.c: Add it to parser and pretty printer. * src/network/bridge_driver.c: Put it in the dnsmasq command line. * tests/networkxml2xmlin/netboot-proxy-network.xml tests/networkxml2xmlout/netboot-proxy-network.xml tests/networkxml2xmltest.c: add new tests
98 lines
2.2 KiB
C
98 lines
2.2 KiB
C
#include <config.h>
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <string.h>
|
|
|
|
#include <sys/types.h>
|
|
#include <fcntl.h>
|
|
|
|
#include "internal.h"
|
|
#include "testutils.h"
|
|
#include "network_conf.h"
|
|
#include "testutilsqemu.h"
|
|
|
|
static char *progname;
|
|
static char *abs_srcdir;
|
|
|
|
#define MAX_FILE 4096
|
|
|
|
|
|
static int testCompareXMLToXMLFiles(const char *inxml, const char *outxml) {
|
|
char inXmlData[MAX_FILE];
|
|
char *inXmlPtr = &(inXmlData[0]);
|
|
char outXmlData[MAX_FILE];
|
|
char *outXmlPtr = &(outXmlData[0]);
|
|
char *actual = NULL;
|
|
int ret = -1;
|
|
virNetworkDefPtr dev = NULL;
|
|
|
|
if (virtTestLoadFile(inxml, &inXmlPtr, MAX_FILE) < 0)
|
|
goto fail;
|
|
if (virtTestLoadFile(outxml, &outXmlPtr, MAX_FILE) < 0)
|
|
goto fail;
|
|
|
|
if (!(dev = virNetworkDefParseString(NULL, inXmlData)))
|
|
goto fail;
|
|
|
|
if (!(actual = virNetworkDefFormat(NULL, dev)))
|
|
goto fail;
|
|
|
|
if (STRNEQ(outXmlData, actual)) {
|
|
virtTestDifference(stderr, outXmlData, actual);
|
|
goto fail;
|
|
}
|
|
|
|
ret = 0;
|
|
|
|
fail:
|
|
free(actual);
|
|
virNetworkDefFree(dev);
|
|
return ret;
|
|
}
|
|
|
|
static int testCompareXMLToXMLHelper(const void *data) {
|
|
char inxml[PATH_MAX];
|
|
char outxml[PATH_MAX];
|
|
snprintf(inxml, PATH_MAX, "%s/networkxml2xmlin/%s.xml",
|
|
abs_srcdir, (const char*)data);
|
|
snprintf(outxml, PATH_MAX, "%s/networkxml2xmlout/%s.xml",
|
|
abs_srcdir, (const char*)data);
|
|
return testCompareXMLToXMLFiles(inxml, outxml);
|
|
}
|
|
|
|
|
|
static int
|
|
mymain(int argc, char **argv)
|
|
{
|
|
int ret = 0;
|
|
char cwd[PATH_MAX];
|
|
|
|
progname = argv[0];
|
|
|
|
if (argc > 1) {
|
|
fprintf(stderr, "Usage: %s\n", progname);
|
|
return (EXIT_FAILURE);
|
|
}
|
|
|
|
abs_srcdir = getenv("abs_srcdir");
|
|
if (!abs_srcdir)
|
|
abs_srcdir = getcwd(cwd, sizeof(cwd));
|
|
|
|
#define DO_TEST(name) \
|
|
if (virtTestRun("Network XML-2-XML " name, \
|
|
1, testCompareXMLToXMLHelper, (name)) < 0) \
|
|
ret = -1
|
|
|
|
DO_TEST("isolated-network");
|
|
DO_TEST("routed-network");
|
|
DO_TEST("nat-network");
|
|
DO_TEST("netboot-network");
|
|
DO_TEST("netboot-proxy-network");
|
|
|
|
return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
|
|
}
|
|
|
|
VIRT_TEST_MAIN(mymain)
|