Mirrors/network
1
0
Fork 0
mirror of https://github.com/linux-system-roles/network.git synced 2026-01-23 02:15:17 +00:00
Code Issues Projects Releases Wiki Activity

Reject DNS_search setting if no IP family is enabled

Browse source 
NetworkManager only allows to configure the DNS options for each IP
family, when they are enabled. Therefore, reject DNS settings in
ArgValidator if no IP family is enabled.

Signed-off-by: Wen Liang <liangwen12year@gmail.com>
This commit is contained in:
Wen Liang 2021-12-02 16:57:25 -05:00 • committed by Fernando Fernández Mancera
parent 05b38b4217
commit 5db8d0c5d1
2 changed files with 33 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
module_utils/network_lsr/argument_validator.py
View file

@ -1974,6 +1974,12 @@ class ArgValidator_ListConnections(ArgValidatorList):
"Setting 'dns_search' or 'dns_options' is not allowed when "
"both IPv4 and IPv6 are disabled.",
)
elif not _ipv4_enabled(connection) and _ipv6_is_not_configured(connection):
raise ValidationError.from_connection(
idx,
"Setting 'dns_search' or 'dns_options' is not allowed when "
"IPv4 is disabled and IPv6 is not configured.",
)
# DNS options 'inet6', 'ip6-bytestring', 'ip6-dotint', 'no-ip6-dotint' are only
# supported for IPv6 configuration, so raise errors when IPv6 is disabled
if any(

27
tests/unit/test_network_connections.py
View file

@ -3744,6 +3744,33 @@ class TestValidator(Python26CompatTestCase):
0,
)
def test_dns_search_without_ipv4_and_ipv6_configuration(self):
"""
Test that configuring DNS search setting is not allowed when both IPv4 and
IPv6 are not configured.
"""
validator = network_lsr.argument_validator.ArgValidator_ListConnections()
dns_search_without_ipv4_and_ipv6_configuration = [
{
"name": "test_dns_search",
"type": "ethernet",
"ip": {
"dhcp4": False,
"auto6": False,
"dns_search": ["example.com"],
},
}
]
self.assertRaisesRegex(
ValidationError,
"Setting 'dns_search' or 'dns_options' is not allowed when IPv4 is "
"disabled and IPv6 is not configured",
validator.validate_connection_one,
"nm",
validator.validate(dns_search_without_ipv4_and_ipv6_configuration),
0,
)
def test_auto6_enabled_ipv6_disabled(self):
"""
Test that enabling `auto6` and disabling IPv6 are mutually exclusive.