Merge lp:~danilo/maas/bug-16867570-fqdn-controller into lp:~maas-committers/maas/trunk

[Данило Шеган]

Support rack controllers using fully-qualified domain names as their hostnames

When a rack controller has a hostname set including a domain name (in the dotted form, eg. foo.example.com), registering this rack controller to existing MAAS regiond should keep the FQDN for the controller (if a domain does not exist already, it is added as non-authoritative domain name in MAAS).

To avoid introducing any API changes (eg. by allowing a domain argument to register() calls), we instead allow dotted hostname value and only parse it before committing to database.

Testing instructions:

I've reproduced part of the problem described in the bug using:

  uvt-kvm create --memory 2048 --ssh-public-key-file ~/.ssh/authorized_keys maas1
  uvt-kvm ssh --insecure maas1 sudo apt-add-repository ppa:maas/next-proposed
  uvt-kvm ssh --insecure maas1 sudo apt update
  uvt-kvm ssh --insecure maas1 sudo apt install maas

  uvt-kvm create --memory 2048 --ssh-public-key-file ~/.ssh/authorized_keys maas2
  uvt-kvm ssh --insecure maas2 sudo apt-add-repository ppa:maas/next-proposed
  uvt-kvm ssh --insecure maas2 sudo apt update
  uvt-kvm ssh --insecure maas2 sudo apt install maas-rack-controller
  echo maas2.test | uvt-kvm ssh --insecure maas2 sudo tee /etc/hostname

(though, after I restarted from scratch, packages are failing to install for me)

To confirm that the bug is fixed, I've applied the diff from this branch to running instances of both rackd/regiond code on maas1/maas2 VMs (and restarting all MAAS services after), and re-registered the rack controller. It now shows up with the correct domain name.

[Blake Rouse (blake-rouse)]

Looks good. Going to approve with the condition that you add one more test. See inline comment.

review: Approve

=== modified file 'src/maasserver/rpc/rackcontrollers.py'
--- src/maasserver/rpc/rackcontrollers.py	2017-01-28 00:51:47 +0000
+++ src/maasserver/rpc/rackcontrollers.py	2017-05-10 11:10:44 +0000
@@ -20,6 +20,7 @@
 )
 from maasserver.enum import NODE_TYPE
 from maasserver.models import (
+    Domain,
     Node,
     NodeGroupToRackController,
     RackController,
@@ -92,10 +93,18 @@
     if interfaces is None:
         interfaces = {}
 
+    # If hostname is actually a FQDN, split the domain off and
+    # create it as non-authoritative domain if it does not exist already.
+    domain = Domain.objects.get_default_domain()
+    if hostname.find('.') > 0:
+        hostname, domainname = hostname.split('.', 1)
+        (domain, _) = Domain.objects.get_or_create(
+            name=domainname, defaults={'authoritative': False})
+
     this_region = RegionController.objects.get_running_controller()
     node = find(system_id, hostname, interfaces)
     if node is None:
-        node = RackController.objects.create(hostname=hostname)
+        node = RackController.objects.create(hostname=hostname, domain=domain)
         maaslog.info(
             "New rack controller '%s' was created by region '%s' upon "
             "first connection.",

=== modified file 'src/maasserver/rpc/tests/test_rackcontrollers.py'
--- src/maasserver/rpc/tests/test_rackcontrollers.py	2017-01-28 00:51:47 +0000
+++ src/maasserver/rpc/tests/test_rackcontrollers.py	2017-05-10 11:10:44 +0000
@@ -323,6 +323,49 @@
             url=urlparse('http://localhost/MAAS/'), is_loopback=True)
         self.assertEqual('', rack_registered.url)
 
+    def test_creates_rackcontroller_domain(self):
+        # Create a domain if a newly registered rackcontroller uses a FQDN
+        # as the hostname, but the domain does not already existing in MAAS,
+        hostname = "newcontroller.example.com"
+        interfaces = {
+            factory.make_name("eth0"): {
+                "type": "physical",
+                "mac_address": factory.make_mac_address(),
+                "parents": [],
+                "links": [],
+                "enabled": True,
+            }
+        }
+        url = 'http://%s/MAAS' % factory.make_name('host')
+        rack_registered = register(
+            "rack-id-foo", interfaces=interfaces, url=urlparse(url),
+            is_loopback=False, hostname=hostname)
+        self.assertEqual("newcontroller", rack_registered.hostname)
+        self.assertEqual("example.com", rack_registered.domain.name)
+        self.assertFalse(rack_registered.domain.authoritative)
+
+    def test_reuses_rackcontroller_domain(self):
+        # If a domain name already exists for a FQDN hostname, it is
+        # not modified.
+        factory.make_Domain("example.com", authoritative=True)
+        hostname = "newcontroller.example.com"
+        interfaces = {
+            factory.make_name("eth0"): {
+                "type": "physical",
+                "mac_address": factory.make_mac_address(),
+                "parents": [],
+                "links": [],
+                "enabled": True,
+            }
+        }
+        url = 'http://%s/MAAS' % factory.make_name('host')
+        rack_registered = register(
+            "rack-id-foo", interfaces=interfaces, url=urlparse(url),
+            is_loopback=False, hostname=hostname)
+        self.assertEqual("newcontroller", rack_registered.hostname)
+        self.assertEqual("example.com", rack_registered.domain.name)
+        self.assertTrue(rack_registered.domain.authoritative)
+
 
 class TestUpdateForeignDHCP(MAASServerTestCase):
 

=== modified file 'src/provisioningserver/rpc/clusterservice.py'
--- src/provisioningserver/rpc/clusterservice.py	2017-04-11 20:36:41 +0000
+++ src/provisioningserver/rpc/clusterservice.py	2017-05-10 11:10:44 +0000
@@ -751,7 +751,7 @@
 
         # Gather the interface definition and hostname.
         interfaces = get_all_interfaces_definition()
-        hostname = gethostname().split('.')[0]
+        hostname = gethostname()
 
         def cb_register(data):
             self.localIdent = data["system_id"]

=== modified file 'src/provisioningserver/rpc/tests/test_clusterservice.py'
--- src/provisioningserver/rpc/tests/test_clusterservice.py	2017-04-05 14:30:21 +0000
+++ src/provisioningserver/rpc/tests/test_clusterservice.py	2017-05-10 11:10:44 +0000
@@ -1438,7 +1438,9 @@
     @inlineCallbacks
     def test_registerRackWithRegion_end_to_end(self):
         maas_url = factory.make_simple_http_url()
-        hostname = platform.node().split('.')[0]
+        hostname = "rackcontrol.example.com"
+        self.patch_autospec(clusterservice, 'gethostname').return_value = (
+            hostname)
         interfaces = get_all_interfaces_definition()
         self.useFixture(ClusterConfigurationFixture(
             maas_url=maas_url))