From: Michal Privoznik <mprivozn@redhat.com> Signed-off-by: Michal Privoznik <mprivozn@redhat.com> --- src/conf/network_conf.c | 76 +++++++++---------- .../nat-network-dns-hosts-modified.xml | 3 +- .../nat-network-dns-more-hosts.xml | 3 +- .../nat-network-dns-srv-record.xml | 12 +-- .../nat-network-dns-srv-records.xml | 12 +-- .../nat-network-dns-txt-modify-ok.xml | 12 +-- .../nat-network-dns-txt-none.xml | 12 +-- .../nat-network-dns-txt-records.xml | 12 +-- .../nat-network-forward-ifaces.xml | 12 +-- .../nat-network-host-updated.xml | 12 +-- .../nat-network-hosts.xml | 12 +-- .../nat-network-no-forward-ifaces.xml | 12 +-- .../nat-network-no-hosts.xml | 3 +- .../nat-network-no-range.xml | 12 +-- .../nat-network-one-host.xml | 12 +-- tests/networkxml2xmlupdateout/nat-network.xml | 12 +-- .../dhcp6-nat-network.expect.xml | 6 +- .../nat-network-dns-forward-plain.expect.xml | 3 +- ...network-dns-forwarder-no-resolv.expect.xml | 3 +- .../nat-network-dns-forwarders.expect.xml | 3 +- .../nat-network-dns-hosts.expect.xml | 3 +- .../nat-network-dns-local-domain.expect.xml | 3 +- ...-network-dns-srv-record-minimal.expect.xml | 12 +-- .../nat-network-dns-srv-record.expect.xml | 12 +-- .../nat-network-dns-srv-records.expect.xml | 12 +-- .../nat-network-dns-txt-record.expect.xml | 12 +-- .../nat-network-explicit-flood.expect.xml | 12 +-- ...nat-network-forward-nat-address.expect.xml | 12 +-- .../nat-network-forward-nat-ipv6.expect.xml | 3 +- ...-network-forward-nat-no-address.expect.xml | 12 +-- .../nat-network-mtu.expect.xml | 12 +-- .../nat-network-name-with-quotes.expect.xml | 12 +-- .../networkxmlconfdata/nat-network.expect.xml | 12 +-- .../open-network.expect.xml | 3 +- .../ptr-domains-auto.expect.xml | 12 +-- .../routed-network-no-dns.expect.xml | 3 +- .../routed-network.expect.xml | 3 +- 37 files changed, 141 insertions(+), 253 deletions(-) diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c index 26887342e4..17ef1c2a08 100644 --- a/src/conf/network_conf.c +++ b/src/conf/network_conf.c @@ -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; } diff --git a/tests/networkxml2xmlupdateout/nat-network-dns-hosts-modified.xml b/tests/networkxml2xmlupdateout/nat-network-dns-hosts-modified.xml index 3183671376..1a334e77d2 100644 --- a/tests/networkxml2xmlupdateout/nat-network-dns-hosts-modified.xml +++ b/tests/networkxml2xmlupdateout/nat-network-dns-hosts-modified.xml @@ -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> diff --git a/tests/networkxml2xmlupdateout/nat-network-dns-more-hosts.xml b/tests/networkxml2xmlupdateout/nat-network-dns-more-hosts.xml index 21e4ebde5f..5fb300061d 100644 --- a/tests/networkxml2xmlupdateout/nat-network-dns-more-hosts.xml +++ b/tests/networkxml2xmlupdateout/nat-network-dns-more-hosts.xml @@ -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> diff --git a/tests/networkxml2xmlupdateout/nat-network-dns-srv-record.xml b/tests/networkxml2xmlupdateout/nat-network-dns-srv-record.xml index 3dd19e6698..cca69213a1 100644 --- a/tests/networkxml2xmlupdateout/nat-network-dns-srv-record.xml +++ b/tests/networkxml2xmlupdateout/nat-network-dns-srv-record.xml @@ -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> diff --git a/tests/networkxml2xmlupdateout/nat-network-dns-srv-records.xml b/tests/networkxml2xmlupdateout/nat-network-dns-srv-records.xml index 2bdd9321ff..e643323a9d 100644 --- a/tests/networkxml2xmlupdateout/nat-network-dns-srv-records.xml +++ b/tests/networkxml2xmlupdateout/nat-network-dns-srv-records.xml @@ -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> diff --git a/tests/networkxml2xmlupdateout/nat-network-dns-txt-modify-ok.xml b/tests/networkxml2xmlupdateout/nat-network-dns-txt-modify-ok.xml index 4b4dda094a..03861b9d6a 100644 --- a/tests/networkxml2xmlupdateout/nat-network-dns-txt-modify-ok.xml +++ b/tests/networkxml2xmlupdateout/nat-network-dns-txt-modify-ok.xml @@ -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> diff --git a/tests/networkxml2xmlupdateout/nat-network-dns-txt-none.xml b/tests/networkxml2xmlupdateout/nat-network-dns-txt-none.xml index 93bc7db51d..3f1da54ed8 100644 --- a/tests/networkxml2xmlupdateout/nat-network-dns-txt-none.xml +++ b/tests/networkxml2xmlupdateout/nat-network-dns-txt-none.xml @@ -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> diff --git a/tests/networkxml2xmlupdateout/nat-network-dns-txt-records.xml b/tests/networkxml2xmlupdateout/nat-network-dns-txt-records.xml index 63254d2d88..99090d45c9 100644 --- a/tests/networkxml2xmlupdateout/nat-network-dns-txt-records.xml +++ b/tests/networkxml2xmlupdateout/nat-network-dns-txt-records.xml @@ -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> diff --git a/tests/networkxml2xmlupdateout/nat-network-forward-ifaces.xml b/tests/networkxml2xmlupdateout/nat-network-forward-ifaces.xml index 13d1fdfa6d..7b3001e287 100644 --- a/tests/networkxml2xmlupdateout/nat-network-forward-ifaces.xml +++ b/tests/networkxml2xmlupdateout/nat-network-forward-ifaces.xml @@ -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> diff --git a/tests/networkxml2xmlupdateout/nat-network-host-updated.xml b/tests/networkxml2xmlupdateout/nat-network-host-updated.xml index 816ab3835d..d325f8a6ab 100644 --- a/tests/networkxml2xmlupdateout/nat-network-host-updated.xml +++ b/tests/networkxml2xmlupdateout/nat-network-host-updated.xml @@ -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> diff --git a/tests/networkxml2xmlupdateout/nat-network-hosts.xml b/tests/networkxml2xmlupdateout/nat-network-hosts.xml index eb7acd7083..e05ae29151 100644 --- a/tests/networkxml2xmlupdateout/nat-network-hosts.xml +++ b/tests/networkxml2xmlupdateout/nat-network-hosts.xml @@ -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> diff --git a/tests/networkxml2xmlupdateout/nat-network-no-forward-ifaces.xml b/tests/networkxml2xmlupdateout/nat-network-no-forward-ifaces.xml index 79c97a508f..30019b3db3 100644 --- a/tests/networkxml2xmlupdateout/nat-network-no-forward-ifaces.xml +++ b/tests/networkxml2xmlupdateout/nat-network-no-forward-ifaces.xml @@ -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> diff --git a/tests/networkxml2xmlupdateout/nat-network-no-hosts.xml b/tests/networkxml2xmlupdateout/nat-network-no-hosts.xml index e3c88ff534..d44e940dee 100644 --- a/tests/networkxml2xmlupdateout/nat-network-no-hosts.xml +++ b/tests/networkxml2xmlupdateout/nat-network-no-hosts.xml @@ -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> diff --git a/tests/networkxml2xmlupdateout/nat-network-no-range.xml b/tests/networkxml2xmlupdateout/nat-network-no-range.xml index 7128783cbe..66c1e6cca0 100644 --- a/tests/networkxml2xmlupdateout/nat-network-no-range.xml +++ b/tests/networkxml2xmlupdateout/nat-network-no-range.xml @@ -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> diff --git a/tests/networkxml2xmlupdateout/nat-network-one-host.xml b/tests/networkxml2xmlupdateout/nat-network-one-host.xml index 62778e4c5f..38ba109a6e 100644 --- a/tests/networkxml2xmlupdateout/nat-network-one-host.xml +++ b/tests/networkxml2xmlupdateout/nat-network-one-host.xml @@ -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> diff --git a/tests/networkxml2xmlupdateout/nat-network.xml b/tests/networkxml2xmlupdateout/nat-network.xml index 741352ef14..ebcb7477e0 100644 --- a/tests/networkxml2xmlupdateout/nat-network.xml +++ b/tests/networkxml2xmlupdateout/nat-network.xml @@ -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> diff --git a/tests/networkxmlconfdata/dhcp6-nat-network.expect.xml b/tests/networkxmlconfdata/dhcp6-nat-network.expect.xml index 44bb2d1f5d..20b795ec89 100644 --- a/tests/networkxmlconfdata/dhcp6-nat-network.expect.xml +++ b/tests/networkxmlconfdata/dhcp6-nat-network.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/nat-network-dns-forward-plain.expect.xml b/tests/networkxmlconfdata/nat-network-dns-forward-plain.expect.xml index 76e0f926a9..f87c09e0bd 100644 --- a/tests/networkxmlconfdata/nat-network-dns-forward-plain.expect.xml +++ b/tests/networkxmlconfdata/nat-network-dns-forward-plain.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/nat-network-dns-forwarder-no-resolv.expect.xml b/tests/networkxmlconfdata/nat-network-dns-forwarder-no-resolv.expect.xml index ab2800331c..0ae5154416 100644 --- a/tests/networkxmlconfdata/nat-network-dns-forwarder-no-resolv.expect.xml +++ b/tests/networkxmlconfdata/nat-network-dns-forwarder-no-resolv.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/nat-network-dns-forwarders.expect.xml b/tests/networkxmlconfdata/nat-network-dns-forwarders.expect.xml index ee8ba7b1dd..dd117fb9b0 100644 --- a/tests/networkxmlconfdata/nat-network-dns-forwarders.expect.xml +++ b/tests/networkxmlconfdata/nat-network-dns-forwarders.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/nat-network-dns-hosts.expect.xml b/tests/networkxmlconfdata/nat-network-dns-hosts.expect.xml index f8a609f9cb..a231ea6309 100644 --- a/tests/networkxmlconfdata/nat-network-dns-hosts.expect.xml +++ b/tests/networkxmlconfdata/nat-network-dns-hosts.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/nat-network-dns-local-domain.expect.xml b/tests/networkxmlconfdata/nat-network-dns-local-domain.expect.xml index 33f4bbfc32..7b05cb09b0 100644 --- a/tests/networkxmlconfdata/nat-network-dns-local-domain.expect.xml +++ b/tests/networkxmlconfdata/nat-network-dns-local-domain.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.expect.xml b/tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.expect.xml index 16032c9af2..559d826c16 100644 --- a/tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.expect.xml +++ b/tests/networkxmlconfdata/nat-network-dns-srv-record-minimal.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/nat-network-dns-srv-record.expect.xml b/tests/networkxmlconfdata/nat-network-dns-srv-record.expect.xml index 0f54a72f95..589c715353 100644 --- a/tests/networkxmlconfdata/nat-network-dns-srv-record.expect.xml +++ b/tests/networkxmlconfdata/nat-network-dns-srv-record.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/nat-network-dns-srv-records.expect.xml b/tests/networkxmlconfdata/nat-network-dns-srv-records.expect.xml index 26b802e1eb..a8e064854d 100644 --- a/tests/networkxmlconfdata/nat-network-dns-srv-records.expect.xml +++ b/tests/networkxmlconfdata/nat-network-dns-srv-records.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/nat-network-dns-txt-record.expect.xml b/tests/networkxmlconfdata/nat-network-dns-txt-record.expect.xml index cba7e9d1f8..4d35e36b5e 100644 --- a/tests/networkxmlconfdata/nat-network-dns-txt-record.expect.xml +++ b/tests/networkxmlconfdata/nat-network-dns-txt-record.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/nat-network-explicit-flood.expect.xml b/tests/networkxmlconfdata/nat-network-explicit-flood.expect.xml index c039955543..15950c017b 100644 --- a/tests/networkxmlconfdata/nat-network-explicit-flood.expect.xml +++ b/tests/networkxmlconfdata/nat-network-explicit-flood.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/nat-network-forward-nat-address.expect.xml b/tests/networkxmlconfdata/nat-network-forward-nat-address.expect.xml index e3276ac338..af1df7dc2d 100644 --- a/tests/networkxmlconfdata/nat-network-forward-nat-address.expect.xml +++ b/tests/networkxmlconfdata/nat-network-forward-nat-address.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/nat-network-forward-nat-ipv6.expect.xml b/tests/networkxmlconfdata/nat-network-forward-nat-ipv6.expect.xml index 642929cc8d..e42939318f 100644 --- a/tests/networkxmlconfdata/nat-network-forward-nat-ipv6.expect.xml +++ b/tests/networkxmlconfdata/nat-network-forward-nat-ipv6.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/nat-network-forward-nat-no-address.expect.xml b/tests/networkxmlconfdata/nat-network-forward-nat-no-address.expect.xml index 77fc0b5324..c29debdd30 100644 --- a/tests/networkxmlconfdata/nat-network-forward-nat-no-address.expect.xml +++ b/tests/networkxmlconfdata/nat-network-forward-nat-no-address.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/nat-network-mtu.expect.xml b/tests/networkxmlconfdata/nat-network-mtu.expect.xml index 97044c70ec..1865cd0ea3 100644 --- a/tests/networkxmlconfdata/nat-network-mtu.expect.xml +++ b/tests/networkxmlconfdata/nat-network-mtu.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/nat-network-name-with-quotes.expect.xml b/tests/networkxmlconfdata/nat-network-name-with-quotes.expect.xml index c0a9cedc7d..c1f5fee466 100644 --- a/tests/networkxmlconfdata/nat-network-name-with-quotes.expect.xml +++ b/tests/networkxmlconfdata/nat-network-name-with-quotes.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/nat-network.expect.xml b/tests/networkxmlconfdata/nat-network.expect.xml index 9d3757f0e0..da274e0682 100644 --- a/tests/networkxmlconfdata/nat-network.expect.xml +++ b/tests/networkxmlconfdata/nat-network.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/open-network.expect.xml b/tests/networkxmlconfdata/open-network.expect.xml index 29e968442b..a4842f6688 100644 --- a/tests/networkxmlconfdata/open-network.expect.xml +++ b/tests/networkxmlconfdata/open-network.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/ptr-domains-auto.expect.xml b/tests/networkxmlconfdata/ptr-domains-auto.expect.xml index fe2047b708..3653852adb 100644 --- a/tests/networkxmlconfdata/ptr-domains-auto.expect.xml +++ b/tests/networkxmlconfdata/ptr-domains-auto.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/routed-network-no-dns.expect.xml b/tests/networkxmlconfdata/routed-network-no-dns.expect.xml index f68ce8a941..eeec0563ae 100644 --- a/tests/networkxmlconfdata/routed-network-no-dns.expect.xml +++ b/tests/networkxmlconfdata/routed-network-no-dns.expect.xml @@ -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> diff --git a/tests/networkxmlconfdata/routed-network.expect.xml b/tests/networkxmlconfdata/routed-network.expect.xml index 2e13cf4ffa..92e94ac83f 100644 --- a/tests/networkxmlconfdata/routed-network.expect.xml +++ b/tests/networkxmlconfdata/routed-network.expect.xml @@ -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> -- 2.52.0