External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-09-19 14:10:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

network: allow "modify" option for DNS hostname

Browse Source 
The "modify" command allows you to replace an existing record
(its hostname, sub-elements). IP address acts as the primary key.
If it is not found, the attempt ends with an error message. If
the XML contains a duplicate address, it will select the last
one.

Tests in networkxml2xmlupdatetest.c contain replacements of an
existing DNS-Host record and failure due to non-existing record.

Resolves: https://gitlab.com/libvirt/libvirt/-/issues/639
Signed-off-by: Adam Julis <ajulis@redhat.com>
Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Adam Julis 2024-07-09 17:23:02 +02:00 committed by Michal Privoznik
parent 619a915862
commit 09a5d8165c
5 changed files with 69 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/conf/network_conf.c
View File

@ -3138,19 +3138,15 @@ virNetworkDefUpdateDNSHost(virNetworkDef *def,
unsigned int fflags G_GNUC_UNUSED)
{
size_t i, j, k;
int foundIdx = -1, ret = -1;
int foundIdx = -1;
int foundIdxModify = -1;
int ret = -1;
virNetworkDNSDef *dns = &def->dns;
virNetworkDNSHostDef host = { 0 };
bool isAdd = (command == VIR_NETWORK_UPDATE_COMMAND_ADD_FIRST ||
command == VIR_NETWORK_UPDATE_COMMAND_ADD_LAST);
int foundCt = 0;
if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) {
virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
_("DNS HOST records cannot be modified, only added or deleted"));
goto cleanup;
}
if (virNetworkDefUpdateCheckElementName(def, ctxt->node, "host") < 0)
goto cleanup;
@ -3163,6 +3159,12 @@ virNetworkDefUpdateDNSHost(virNetworkDef *def,
if (virSocketAddrEqual(&host.ip, &dns->hosts[i].ip))
foundThisTime = true;
/* modify option required index of matching ip-address, the loop under
* this comment could affect results of found index foundThisTime,
* so the foundIdxModify is there used instead */
if (foundThisTime)
foundIdxModify = i;
/* when adding we want to only check duplicates of address since having
* multiple addresses with the same hostname is a legitimate configuration */
if (!isAdd) {
@ -3213,6 +3215,20 @@ virNetworkDefUpdateDNSHost(virNetworkDef *def,
virNetworkDNSHostDefClear(&dns->hosts[foundIdx]);
VIR_DELETE_ELEMENT(dns->hosts, foundIdx, dns->nhosts);
} else if (command == VIR_NETWORK_UPDATE_COMMAND_MODIFY) {
if (foundCt == 0) {
virReportError(VIR_ERR_OPERATION_INVALID,
_("couldn't locate a matching DNS HOST record in network %1$s"),
def->name);
goto cleanup;
}
virNetworkDNSHostDefClear(&dns->hosts[foundIdxModify]);
memcpy(&dns->hosts[foundIdxModify], &host, sizeof(virNetworkDNSHostDef));
memset(&host, 0, sizeof(virNetworkDNSHostDef));
} else {
virNetworkDefUpdateUnknownCommand(command);
goto cleanup;

4
tests/networkxml2xmlupdatein/dns-host-modify-not-existing.xml Normal file
View File

@ -0,0 +1,4 @@
<host ip='192.168.122.333'>
<hostname>shared</hostname>
<hostname>names</hostname>
</host>

5
tests/networkxml2xmlupdatein/dns-host-modify.xml Normal file
View File

@ -0,0 +1,5 @@
<host ip='192.168.122.2'>
<hostname>Another</hostname>
<hostname>decent</hostname>
<hostname>names</hostname>
</host>

28
tests/networkxml2xmlupdateout/nat-network-dns-hosts-modified.xml Normal file
View File

@ -0,0 +1,28 @@
<network>
<name>default</name>
<uuid>81ff0d90-c91e-6742-64da-4a736edb9a9c</uuid>
<forward dev='eth0' mode='nat'>
<interface dev='eth0'/>
</forward>
<bridge name='virbr0' stp='on' delay='0'/>
<dns forwardPlainNames='no'>
<host ip='192.168.122.122'>
<hostname>pudding</hostname>
</host>
<host ip='192.168.122.1'>
<hostname>host</hostname>
<hostname>gateway</hostname>
</host>
<host ip='192.168.122.2'>
<hostname>Another</hostname>
<hostname>decent</hostname>
<hostname>names</hostname>
</host>
<host ip='fd8f:1391:3a82:150::c0a8:9603'>
<hostname>shared</hostname>
<hostname>names</hostname>
</host>
</dns>
<ip address='192.168.122.1' netmask='255.255.255.0'>
</ip>
</network>

9
tests/networkxml2xmlupdatetest.c
View File

@ -276,6 +276,15 @@ mymain(void)
"nat-network-dns-hosts",
"nat-network-no-hosts",
VIR_NETWORK_UPDATE_COMMAND_DELETE);
DO_TEST("modify-dns-host",
"dns-host-modify",
"nat-network-dns-hosts",
"nat-network-dns-hosts-modified",
VIR_NETWORK_UPDATE_COMMAND_MODIFY);
DO_TEST_FAIL("modify-dns-host-not-existing",
"dns-host-modify-not-existing",
"nat-network-dns-hosts",
VIR_NETWORK_UPDATE_COMMAND_MODIFY);
section = VIR_NETWORK_SECTION_DNS_TXT;