NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2026-09-03 20:53:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

network: Format <ip/> element using virXMLFormatElement()

Browse Source 
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
This commit is contained in:
Michal Privoznik
2026-03-17 17:24:59 +01:00
parent 05cdfcf568
commit d9b34ad12b
37 changed files with 141 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/conf/network_conf.c
+35 -41
View File
@@ -2065,40 +2065,40 @@ static int
virNetworkIPDefFormat(virBuffer *buf,
const virNetworkIPDef *def)
{
virBufferAddLit(buf, "<ip");
virBuffer ipAttrBuf = VIR_BUFFER_INITIALIZER;
virBuffer ipChildBuf = VIR_BUFFER_INIT_CHILD(buf);
if (def->family)
virBufferAsprintf(buf, " family='%s'", def->family);
virBufferAsprintf(&ipAttrBuf, " family='%s'", def->family);
if (VIR_SOCKET_ADDR_VALID(&def->address)) {
g_autofree char *addr = virSocketAddrFormat(&def->address);
if (!addr)
return -1;
virBufferAsprintf(buf, " address='%s'", addr);
virBufferAsprintf(&ipAttrBuf, " address='%s'", addr);
}
if (VIR_SOCKET_ADDR_VALID(&def->netmask)) {
g_autofree char *addr = virSocketAddrFormat(&def->netmask);
if (!addr)
return -1;
virBufferAsprintf(buf, " netmask='%s'", addr);
virBufferAsprintf(&ipAttrBuf, " netmask='%s'", addr);
}
if (def->prefix > 0)
virBufferAsprintf(buf, " prefix='%u'", def->prefix);
virBufferAsprintf(&ipAttrBuf, " prefix='%u'", def->prefix);
if (def->localPTR) {
virBufferAsprintf(buf, " localPtr='%s'",
virBufferAsprintf(&ipAttrBuf, " localPtr='%s'",
virTristateBoolTypeToString(def->localPTR));
}
virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2);
virBufferEscapeString(buf, "<tftp root='%s'/>\n",
virBufferEscapeString(&ipChildBuf, "<tftp root='%s'/>\n",
def->tftproot);
if ((def->nranges || def->nhosts)) {
virBuffer dhcpChildBuf = VIR_BUFFER_INIT_CHILD(&ipChildBuf);
size_t i;
virBufferAddLit(buf, "<dhcp>\n");
virBufferAdjustIndent(buf, 2);
for (i = 0; i < def->nranges; i++) {
virBuffer rangeAttrBuf = VIR_BUFFER_INITIALIZER;
virBuffer rangeChildBuf = VIR_BUFFER_INIT_CHILD(&dhcpChildBuf);
virSocketAddrRange addr = def->ranges[i].addr;
virNetworkDHCPLeaseTimeDef *lease = def->ranges[i].lease;
g_autofree char *saddr = NULL;
@@ -2110,75 +2110,69 @@ virNetworkIPDefFormat(virBuffer *buf,
if (!(eaddr = virSocketAddrFormat(&addr.end)))
return -1;
virBufferAsprintf(buf, "<range start='%s' end='%s'",
virBufferAsprintf(&rangeAttrBuf, " start='%s' end='%s'",
saddr, eaddr);
if (lease) {
virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2);
if (!lease->expiry) {
virBufferAddLit(buf, "<lease expiry='0'/>\n");
virBufferAddLit(&rangeChildBuf, "<lease expiry='0'/>\n");
} else {
virBufferAsprintf(buf, "<lease expiry='%llu' unit='%s'/>\n",
virBufferAsprintf(&rangeChildBuf, "<lease expiry='%llu' unit='%s'/>\n",
lease->expiry,
virNetworkDHCPLeaseTimeUnitTypeToString(lease->unit));
}
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</range>\n");
} else {
virBufferAddLit(buf, "/>\n");
}
virXMLFormatElement(&dhcpChildBuf, "range", &rangeAttrBuf, &rangeChildBuf);
}
for (i = 0; i < def->nhosts; i++) {
virBuffer hostAttrBuf = VIR_BUFFER_INITIALIZER;
virBuffer hostChildBuf = VIR_BUFFER_INIT_CHILD(&dhcpChildBuf);
virNetworkDHCPLeaseTimeDef *lease = def->hosts[i].lease;
virBufferAddLit(buf, "<host");
if (def->hosts[i].mac)
virBufferAsprintf(buf, " mac='%s'", def->hosts[i].mac);
virBufferAsprintf(&hostAttrBuf, " mac='%s'", def->hosts[i].mac);
if (def->hosts[i].id)
virBufferAsprintf(buf, " id='%s'", def->hosts[i].id);
virBufferAsprintf(&hostAttrBuf, " id='%s'", def->hosts[i].id);
if (def->hosts[i].name)
virBufferAsprintf(buf, " name='%s'", def->hosts[i].name);
virBufferAsprintf(&hostAttrBuf, " name='%s'", def->hosts[i].name);
if (VIR_SOCKET_ADDR_VALID(&def->hosts[i].ip)) {
g_autofree char *ipaddr = virSocketAddrFormat(&def->hosts[i].ip);
if (!ipaddr)
return -1;
virBufferAsprintf(buf, " ip='%s'", ipaddr);
virBufferAsprintf(&hostAttrBuf, " ip='%s'", ipaddr);
}
if (lease) {
virBufferAddLit(buf, ">\n");
virBufferAdjustIndent(buf, 2);
if (!lease->expiry) {
virBufferAddLit(buf, "<lease expiry='0'/>\n");
virBufferAddLit(&hostChildBuf, "<lease expiry='0'/>\n");
} else {
virBufferAsprintf(buf, "<lease expiry='%llu' unit='%s'/>\n",
virBufferAsprintf(&hostChildBuf, "<lease expiry='%llu' unit='%s'/>\n",
lease->expiry,
virNetworkDHCPLeaseTimeUnitTypeToString(lease->unit));
}
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</host>\n");
} else {
virBufferAddLit(buf, "/>\n");
}
virXMLFormatElement(&dhcpChildBuf, "host", &hostAttrBuf, &hostChildBuf);
}
if (def->bootfile) {
virBufferEscapeString(buf, "<bootp file='%s'",
def->bootfile);
virBuffer bootpAttrBuf = VIR_BUFFER_INITIALIZER;
virBufferEscapeString(&bootpAttrBuf, " file='%s'", def->bootfile);
if (VIR_SOCKET_ADDR_VALID(&def->bootserver)) {
g_autofree char *ipaddr = virSocketAddrFormat(&def->bootserver);
if (!ipaddr)
return -1;
virBufferEscapeString(buf, " server='%s'", ipaddr);
virBufferEscapeString(&bootpAttrBuf, " server='%s'", ipaddr);
}
virBufferAddLit(buf, "/>\n");
virXMLFormatElement(&dhcpChildBuf, "bootp", &bootpAttrBuf, NULL);
}
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</dhcp>\n");
virXMLFormatElement(&ipChildBuf, "dhcp", NULL, &dhcpChildBuf);
}
virBufferAdjustIndent(buf, -2);
virBufferAddLit(buf, "</ip>\n");
virXMLFormatElement(buf, "ip", &ipAttrBuf, &ipChildBuf);
return 0;
}
tests/networkxml2xmlupdateout/nat-network-dns-hosts-modified.xml
+1 -2
View File
@@ -24,6 +24,5 @@
<hostname>names</hostname>
</host>
</dns>
<ip address='192.168.122.1' netmask='255.255.255.0'>
</ip>
<ip address='192.168.122.1' netmask='255.255.255.0'/>
</network>
tests/networkxml2xmlupdateout/nat-network-dns-more-hosts.xml
+1 -2
View File
@@ -26,6 +26,5 @@
<hostname>names</hostname>
</host>
</dns>
<ip address='192.168.122.1' netmask='255.255.255.0'>
</ip>
<ip address='192.168.122.1' netmask='255.255.255.0'/>
</network>
tests/networkxml2xmlupdateout/nat-network-dns-srv-record.xml
+4 -8
View File
@@ -15,12 +15,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxml2xmlupdateout/nat-network-dns-srv-records.xml
+4 -8
View File
@@ -22,12 +22,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxml2xmlupdateout/nat-network-dns-txt-modify-ok.xml
+4 -8
View File
@@ -15,12 +15,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxml2xmlupdateout/nat-network-dns-txt-none.xml
+4 -8
View File
@@ -12,12 +12,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxml2xmlupdateout/nat-network-dns-txt-records.xml
+4 -8
View File
@@ -16,12 +16,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxml2xmlupdateout/nat-network-forward-ifaces.xml
+4 -8
View File
@@ -22,12 +22,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxml2xmlupdateout/nat-network-host-updated.xml
+4 -8
View File
@@ -12,12 +12,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxml2xmlupdateout/nat-network-hosts.xml
+4 -8
View File
@@ -13,12 +13,8 @@
<host mac='00:16:3e:77:f0:0d' name='m.example.com' ip='192.168.122.12'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxml2xmlupdateout/nat-network-no-forward-ifaces.xml
+4 -8
View File
@@ -19,12 +19,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxml2xmlupdateout/nat-network-no-hosts.xml
+1 -2
View File
@@ -19,6 +19,5 @@
<hostname>names</hostname>
</host>
</dns>
<ip address='192.168.122.1' netmask='255.255.255.0'>
</ip>
<ip address='192.168.122.1' netmask='255.255.255.0'/>
</network>
tests/networkxml2xmlupdateout/nat-network-no-range.xml
+4 -8
View File
@@ -11,12 +11,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxml2xmlupdateout/nat-network-one-host.xml
+4 -8
View File
@@ -11,12 +11,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxml2xmlupdateout/nat-network.xml
+4 -8
View File
@@ -20,12 +20,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxmlconfdata/dhcp6-nat-network.expect.xml
+2 -4
View File
@@ -13,8 +13,7 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
<dhcp>
<range start='2001:db8:ac10:fd01::1:10' end='2001:db8:ac10:fd01::1:ff'/>
@@ -25,6 +24,5 @@
<host id='0:1:0:1:18:aa:62:fe:0:16:3e:44:55:66' name='badbob' ip='2001:db8:ac10:fd01::1:24'/>
</dhcp>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxmlconfdata/nat-network-dns-forward-plain.expect.xml
+1 -2
View File
@@ -7,6 +7,5 @@
<bridge name='virbr0' stp='on' delay='0'/>
<mac address='52:54:00:00:00:00'/>
<dns forwardPlainNames='yes'/>
<ip address='192.168.122.1' netmask='255.255.255.0'>
</ip>
<ip address='192.168.122.1' netmask='255.255.255.0'/>
</network>
tests/networkxmlconfdata/nat-network-dns-forwarder-no-resolv.expect.xml
+1 -2
View File
@@ -7,6 +7,5 @@
<dns>
<forwarder domain='example.com' addr='192.168.1.1'/>
</dns>
<ip address='192.168.122.1' netmask='255.255.255.0'>
</ip>
<ip address='192.168.122.1' netmask='255.255.255.0'/>
</network>
tests/networkxmlconfdata/nat-network-dns-forwarders.expect.xml
+1 -2
View File
@@ -13,6 +13,5 @@
<forwarder domain='example2.com' addr='192.168.2.1' port='1234'/>
<forwarder domain='www.example.com'/>
</dns>
<ip address='192.168.122.1' netmask='255.255.255.0'>
</ip>
<ip address='192.168.122.1' netmask='255.255.255.0'/>
</network>
tests/networkxmlconfdata/nat-network-dns-hosts.expect.xml
+1 -2
View File
@@ -24,6 +24,5 @@
<hostname>names</hostname>
</host>
</dns>
<ip address='192.168.122.1' netmask='255.255.255.0'>
</ip>
<ip address='192.168.122.1' netmask='255.255.255.0'/>
</network>
tests/networkxmlconfdata/nat-network-dns-local-domain.expect.xml
+1 -2
View File
@@ -7,6 +7,5 @@
<bridge name='virbr0' stp='on' delay='0'/>
<mac address='52:54:00:00:00:00'/>
<domain name='example.com' localOnly='yes'/>
<ip address='192.168.122.1' netmask='255.255.255.0'>
</ip>
<ip address='192.168.122.1' netmask='255.255.255.0'/>
</network>
tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.expect.xml
+4 -8
View File
@@ -16,12 +16,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='fc00:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='fc00:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxmlconfdata/nat-network-dns-srv-record.expect.xml
+4 -8
View File
@@ -22,12 +22,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxmlconfdata/nat-network-dns-srv-records.expect.xml
+4 -8
View File
@@ -17,12 +17,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxmlconfdata/nat-network-dns-txt-record.expect.xml
+4 -8
View File
@@ -16,12 +16,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxmlconfdata/nat-network-explicit-flood.expect.xml
+4 -8
View File
@@ -13,12 +13,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxmlconfdata/nat-network-forward-nat-address.expect.xml
+4 -8
View File
@@ -17,12 +17,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxmlconfdata/nat-network-forward-nat-ipv6.expect.xml
+1 -2
View File
@@ -6,6 +6,5 @@
</forward>
<bridge name='virbr0' stp='on' delay='0'/>
<mac address='52:54:00:00:00:00'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
</network>
tests/networkxmlconfdata/nat-network-forward-nat-no-address.expect.xml
+4 -8
View File
@@ -16,12 +16,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxmlconfdata/nat-network-mtu.expect.xml
+4 -8
View File
@@ -14,12 +14,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxmlconfdata/nat-network-name-with-quotes.expect.xml
+4 -8
View File
@@ -16,12 +16,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='fc00:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='fc00:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='fc00:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='fc00:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxmlconfdata/nat-network.expect.xml
+4 -8
View File
@@ -13,12 +13,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxmlconfdata/open-network.expect.xml
+1 -2
View File
@@ -4,6 +4,5 @@
<forward mode='open'/>
<bridge name='virbr1' stp='on' delay='0'/>
<mac address='12:34:56:78:9a:bc'/>
<ip address='192.168.122.1' netmask='255.255.255.0'>
</ip>
<ip address='192.168.122.1' netmask='255.255.255.0'/>
</network>
tests/networkxmlconfdata/ptr-domains-auto.expect.xml
+4 -8
View File
@@ -13,12 +13,8 @@
<host mac='00:16:3e:3e:a9:1a' name='b.example.com' ip='192.168.122.11'/>
</dhcp>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0' localPtr='no'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64' localPtr='yes'>
</ip>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'>
</ip>
<ip family='ipv4' address='10.24.10.1'>
</ip>
<ip family='ipv4' address='192.168.123.1' netmask='255.255.255.0' localPtr='no'/>
<ip family='ipv6' address='2001:db8:ac10:fe01::1' prefix='64' localPtr='yes'/>
<ip family='ipv6' address='2001:db8:ac10:fd01::1' prefix='64'/>
<ip family='ipv4' address='10.24.10.1'/>
</network>
tests/networkxmlconfdata/routed-network-no-dns.expect.xml
+1 -2
View File
@@ -7,6 +7,5 @@
<bridge name='virbr1' stp='on' delay='0'/>
<mac address='12:34:56:78:9a:bc'/>
<dns enable='no'/>
<ip address='192.168.122.1' netmask='255.255.255.0'>
</ip>
<ip address='192.168.122.1' netmask='255.255.255.0'/>
</network>
tests/networkxmlconfdata/routed-network.expect.xml
+1 -2
View File
@@ -6,6 +6,5 @@
</forward>
<bridge name='virbr1' zone='myzone' stp='on' delay='0'/>
<mac address='12:34:56:78:9a:bc'/>
<ip address='192.168.122.1' netmask='255.255.255.0'>
</ip>
<ip address='192.168.122.1' netmask='255.255.255.0'/>
</network>