2009-10-09 12:47:43 +00:00
|
|
|
#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"
|
|
|
|
|
2011-04-24 22:25:10 +00:00
|
|
|
static int
|
2011-12-14 10:50:40 +00:00
|
|
|
testCompareXMLToXMLFiles(const char *inxml, const char *outxml,
|
|
|
|
unsigned int flags)
|
2011-04-24 22:25:10 +00:00
|
|
|
{
|
|
|
|
char *inXmlData = NULL;
|
|
|
|
char *outXmlData = NULL;
|
2009-10-09 12:47:43 +00:00
|
|
|
char *actual = NULL;
|
|
|
|
int ret = -1;
|
|
|
|
virNetworkDefPtr dev = NULL;
|
|
|
|
|
2011-04-24 22:25:10 +00:00
|
|
|
if (virtTestLoadFile(inxml, &inXmlData) < 0)
|
2009-10-09 12:47:43 +00:00
|
|
|
goto fail;
|
2011-04-24 22:25:10 +00:00
|
|
|
if (virtTestLoadFile(outxml, &outXmlData) < 0)
|
2009-10-09 12:47:43 +00:00
|
|
|
goto fail;
|
|
|
|
|
2010-02-10 10:22:52 +00:00
|
|
|
if (!(dev = virNetworkDefParseString(inXmlData)))
|
2009-10-09 12:47:43 +00:00
|
|
|
goto fail;
|
|
|
|
|
2011-12-14 10:50:40 +00:00
|
|
|
if (!(actual = virNetworkDefFormat(dev, flags)))
|
2009-10-09 12:47:43 +00:00
|
|
|
goto fail;
|
|
|
|
|
|
|
|
if (STRNEQ(outXmlData, actual)) {
|
|
|
|
virtTestDifference(stderr, outXmlData, actual);
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
fail:
|
2012-02-02 23:16:43 +00:00
|
|
|
VIR_FREE(inXmlData);
|
|
|
|
VIR_FREE(outXmlData);
|
|
|
|
VIR_FREE(actual);
|
2009-10-09 12:47:43 +00:00
|
|
|
virNetworkDefFree(dev);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-12-14 10:50:40 +00:00
|
|
|
struct testInfo {
|
|
|
|
const char *name;
|
|
|
|
unsigned int flags;
|
|
|
|
};
|
|
|
|
|
2011-04-24 22:25:10 +00:00
|
|
|
static int
|
|
|
|
testCompareXMLToXMLHelper(const void *data)
|
|
|
|
{
|
2011-12-14 10:50:40 +00:00
|
|
|
const struct testInfo *info = data;
|
2011-04-24 22:25:10 +00:00
|
|
|
int result = -1;
|
|
|
|
char *inxml = NULL;
|
|
|
|
char *outxml = NULL;
|
|
|
|
|
|
|
|
if (virAsprintf(&inxml, "%s/networkxml2xmlin/%s.xml",
|
2011-12-14 10:50:40 +00:00
|
|
|
abs_srcdir, info->name) < 0 ||
|
2011-04-24 22:25:10 +00:00
|
|
|
virAsprintf(&outxml, "%s/networkxml2xmlout/%s.xml",
|
2011-12-14 10:50:40 +00:00
|
|
|
abs_srcdir, info->name) < 0) {
|
2011-04-24 22:25:10 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
|
|
|
|
2011-12-14 10:50:40 +00:00
|
|
|
result = testCompareXMLToXMLFiles(inxml, outxml, info->flags);
|
2009-10-09 12:47:43 +00:00
|
|
|
|
2011-04-24 22:25:10 +00:00
|
|
|
cleanup:
|
2012-02-02 23:16:43 +00:00
|
|
|
VIR_FREE(inxml);
|
|
|
|
VIR_FREE(outxml);
|
2011-04-24 22:25:10 +00:00
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
2009-10-09 12:47:43 +00:00
|
|
|
|
|
|
|
static int
|
2011-04-29 16:21:20 +00:00
|
|
|
mymain(void)
|
2009-10-09 12:47:43 +00:00
|
|
|
{
|
|
|
|
int ret = 0;
|
|
|
|
|
2011-12-14 10:50:40 +00:00
|
|
|
#define DO_TEST_FULL(name, flags) \
|
|
|
|
do { \
|
|
|
|
const struct testInfo info = {name, flags}; \
|
|
|
|
if (virtTestRun("Network XML-2-XML " name, \
|
|
|
|
1, testCompareXMLToXMLHelper, &info) < 0) \
|
|
|
|
ret = -1; \
|
|
|
|
} while (0)
|
|
|
|
#define DO_TEST(name) DO_TEST_FULL(name, 0)
|
2009-10-09 12:47:43 +00:00
|
|
|
|
|
|
|
DO_TEST("isolated-network");
|
|
|
|
DO_TEST("routed-network");
|
|
|
|
DO_TEST("nat-network");
|
|
|
|
DO_TEST("netboot-network");
|
2009-10-28 14:57:49 +00:00
|
|
|
DO_TEST("netboot-proxy-network");
|
2011-06-24 10:04:36 +00:00
|
|
|
DO_TEST("nat-network-dns-txt-record");
|
2011-06-24 10:04:40 +00:00
|
|
|
DO_TEST("nat-network-dns-hosts");
|
conf: support abstracted interface info in network XML
The network XML is updated in the following ways:
1) The <forward> element can now contain a list of forward interfaces:
<forward .... >
<interface dev='eth10'/>
<interface dev='eth11'/>
<interface dev='eth12'/>
<interface dev='eth13'/>
</forward>
The first of these takes the place of the dev attribute that is
normally in <forward> - when defining a network you can specify
either one, and on output both will be present. If you specify
both on input, they must match.
2) In addition to forward modes of 'nat' and 'route', these new modes
are supported:
private, passthrough, vepa - when this network is referenced by a
domain's interface, it will have the same effect as if the
interface had been defined as type='direct', e.g.:
<interface type='direct'>
<source mode='${mode}' dev='${dev}>
...
</interface>
where ${mode} is one of the three new modes, and ${dev} is an interface
selected from the list given in <forward>.
bridge - if a <forward> dev (or multiple devs) is defined, and
forward mode is 'bridge' this is just like the modes 'private',
'passthrough', and 'vepa' above. If there is no forward dev
specified but a bridge name is given (e.g. "<bridge
name='br0'/>"), then guest interfaces using this network will use
libvirt's "host bridge" mode, equivalent to this:
<interface type='bridge'>
<source bridge='${bridge-name}'/>
...
</interface>
3) A network can have multiple <portgroup> elements, which may be
selected by the guest interface definition (by adding
"portgroup='${name}'" in the <source> element along with the
network name). Currently a portgroup can only contain a
virtportprofile, but the intent is that other configuration items
may be put there int the future (e.g. bandwidth config). When
building a guest's interface, if the <interface> XML itself has no
virtportprofile, and if the requested network has a portgroup with
a name matching the name given in the <interface> (or if one of the
network's portgroups is marked with the "default='yes'" attribute),
the virtportprofile from that portgroup will be used by the
interface.
4) A network can have a virtportprofile defined at the top level,
which will be used by a guest interface when connecting in one of
the 'direct' modes if the guest interface XML itself hasn't
specified any virtportprofile, and if there are also no matching
portgroups on the network.
2011-07-20 03:01:09 +00:00
|
|
|
DO_TEST("8021Qbh-net");
|
|
|
|
DO_TEST("direct-net");
|
|
|
|
DO_TEST("host-bridge-net");
|
|
|
|
DO_TEST("vepa-net");
|
2011-07-22 14:07:28 +00:00
|
|
|
DO_TEST("bandwidth-network");
|
2011-12-14 10:50:40 +00:00
|
|
|
DO_TEST_FULL("passthrough-pf", VIR_NETWORK_XML_INACTIVE);
|
2009-10-09 12:47:43 +00:00
|
|
|
|
|
|
|
return (ret==0 ? EXIT_SUCCESS : EXIT_FAILURE);
|
|
|
|
}
|
|
|
|
|
|
|
|
VIRT_TEST_MAIN(mymain)
|