Mauricio Faria de Oliveira has proposed merging ~mfo/maas:3.1 into maas:3.1.
Requested reviews: Mauricio Faria de Oliveira (mfo) Related bugs: Bug #1807725 in MAAS: "Machine interfaces allow '_' character, results on a interface based domain breaking bind (as it doesn't allow it for the host part)." https://bugs.launchpad.net/maas/+bug/1807725 For more details, see: https://code.launchpad.net/~mfo/maas/+git/maas/+merge/444214 Please ignore; this is for testing only. -- Your team MAAS Committers is subscribed to branch maas:3.1.
diff --git a/debian/changelog b/debian/changelog index 07efecd..204172d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +maas (1:3.1.2~rc1-0ubuntu1) focal; urgency=medium + + * New upstream release, MAAS 3.1.2 RC1. + + -- Mauricio Faria de Oliveira <[email protected]> Tue, 06 Jun 2023 20:33:57 -0300 + maas (1:3.1.1-0ubuntu1) focal; urgency=medium * New upstream release, MAAS 3.1.1. diff --git a/setup.cfg b/setup.cfg index 8ca0ea2..ca76a6a 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = maas -version = 3.1.1 +version = 3.1.2rc1 description = Metal As A Service long_description = file: README.rst url = https://maas.io/ diff --git a/src/maasserver/models/staticipaddress.py b/src/maasserver/models/staticipaddress.py index af330da..306fb83 100644 --- a/src/maasserver/models/staticipaddress.py +++ b/src/maasserver/models/staticipaddress.py @@ -45,7 +45,10 @@ from maasserver.models.domain import Domain from maasserver.models.subnet import Subnet from maasserver.models.timestampedmodel import TimestampedModel from maasserver.utils import orm -from maasserver.utils.dns import get_ip_based_hostname +from maasserver.utils.dns import ( + get_iface_name_based_hostname, + get_ip_based_hostname, +) from provisioningserver.utils.enum import map_enum_reverse _mapping_base_fields = ( @@ -748,7 +751,14 @@ class StaticIPAddressManager(Manager): # node, then consider adding the IP. if result.assigned or not assigned_ips[result.fqdn]: if result.ip not in mapping[result.fqdn].ips: - entry = mapping["%s.%s" % (result.iface_name, result.fqdn)] + fqdn = mapping[ + "%s.%s" + % ( + get_iface_name_based_hostname(result.iface_name), + result.fqdn, + ) + ] + entry = mapping[fqdn] entry.node_type = result.node_type entry.system_id = result.system_id if result.user_id is not None: diff --git a/src/maasserver/models/tests/test_staticipaddress.py b/src/maasserver/models/tests/test_staticipaddress.py index 75f9a5e..f62b072 100644 --- a/src/maasserver/models/tests/test_staticipaddress.py +++ b/src/maasserver/models/tests/test_staticipaddress.py @@ -53,7 +53,10 @@ from maasserver.testing.testcase import ( MAASTransactionServerTestCase, ) from maasserver.utils import orm -from maasserver.utils.dns import get_ip_based_hostname +from maasserver.utils.dns import ( + get_iface_name_based_hostname, + get_ip_based_hostname, +) from maasserver.utils.orm import reload_object, transactional from maasserver.websockets.base import dehydrate_datetime @@ -496,6 +499,47 @@ class TestStaticIPAddressManagerMapping(MAASServerTestCase): } self.assertEqual(expected, mapping) + def test_get_hostname_ip_mapping_sanitized_iface_name(self): + hostname = factory.make_name("hostname") + domainname = factory.make_name("domain") + factory.make_Domain(name=domainname) + full_hostname = f"{hostname}.{domainname}" + subnet = factory.make_Subnet() + node = factory.make_Node_with_Interface_on_Subnet( + extra_ifnames=["eth_1"], + hostname=full_hostname, + interface_count=2, + subnet=subnet, + ) + boot_interface = node.get_boot_interface() + staticip = factory.make_StaticIPAddress( + alloc_type=IPADDRESS_TYPE.STICKY, + ip=factory.pick_ip_in_Subnet(subnet), + subnet=subnet, + interface=boot_interface, + ) + iface2 = node.current_config.interface_set.exclude( + id=boot_interface.id + ).first() + sip2 = factory.make_StaticIPAddress( + alloc_type=IPADDRESS_TYPE.STICKY, + ip=factory.pick_ip_in_Subnet(subnet), + subnet=subnet, + interface=iface2, + ) + mapping = StaticIPAddress.objects.get_hostname_ip_mapping(subnet) + sanitized_if2name = get_iface_name_based_hostname(iface2.name) + expected = { + full_hostname: HostnameIPMapping( + node.system_id, 30, {staticip.ip}, node.node_type + ), + "%s.%s" + % (sanitized_if2name, full_hostname): HostnameIPMapping( + node.system_id, 30, {sip2.ip}, node.node_type + ), + } + self.assertEqual(expected, mapping) + def make_mapping(self, node, raw_ttl=False): if raw_ttl or node.address_ttl is not None: ttl = node.address_ttl diff --git a/src/maasserver/utils/dns.py b/src/maasserver/utils/dns.py index 0c8cde5..76f553a 100644 --- a/src/maasserver/utils/dns.py +++ b/src/maasserver/utils/dns.py @@ -91,6 +91,16 @@ def get_ip_based_hostname(ip): return hostname +def get_iface_name_based_hostname(iface_name): + """Given the specified interface name, creates an automatically generated + hostname by converting the '_' characters in it to '-' characters. + + :param iface_name: Input value for the interface name. + """ + hostname = iface_name.replace("_", "-") + return hostname + + def validate_url(url, schemes=("http", "https")): """Validator for URLs. diff --git a/src/maasserver/utils/tests/test_dns.py b/src/maasserver/utils/tests/test_dns.py index e6be8ab..41cfe80 100644 --- a/src/maasserver/utils/tests/test_dns.py +++ b/src/maasserver/utils/tests/test_dns.py @@ -8,6 +8,7 @@ from django.core.validators import URLValidator from testtools.matchers import Equals, HasLength from maasserver.utils.dns import ( + get_iface_name_based_hostname, get_ip_based_hostname, validate_domain_name, validate_hostname, @@ -244,3 +245,11 @@ class TestIpBasedHostnameGenerator(MAASTestCase): get_ip_based_hostname("2001:67c:1562::15"), Equals("2001-67c-1562--15"), ) + + +class TestIfaceBasedHostnameGenerator(MAASTestCase): + def test_interface_name_changed(self): + self.assertEqual(get_iface_name_based_hostname("eth_0"), "eth-0") + + def test_interface_name_unchanged(self): + self.assertEqual(get_iface_name_based_hostname("eth0"), "eth0")
-- Mailing list: https://launchpad.net/~sts-sponsors Post to : [email protected] Unsubscribe : https://launchpad.net/~sts-sponsors More help : https://help.launchpad.net/ListHelp
