Merge lp:~lamont/maas/bug-1614584-2.1 into lp:maas/2.1

[LaMont Jones]

Handle the case where gethostname() returns an FQDN.

Handle the case where gethostname() returns an FQDN.

[LaMont Jones (lamont)]

Self-approval of trivial backport.

review: Approve

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2016-12-06 13:20:47 +0000
+++ docs/changelog.rst	2016-12-07 12:55:26 +0000
@@ -9,6 +9,8 @@
 --------------------------
 
 
+LP: #1614584    MAAS fails to start when gethostname returns an FQDN.
+
 LP: #1582323    Select MAAS datasource specifically to ensure commissioning doesn't fail when competing cloud metadata resides on disk
 
 LP: #1646163    [2.1] Icon need to be improved

=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2016-10-31 21:41:45 +0000
+++ src/maasserver/models/node.py	2016-12-07 12:55:26 +0000
@@ -755,7 +755,19 @@
         regiond has run on it. Create a region controller only; it can be
         upgraded to a region+rack controller later if necessary.
         """
-        return self.create(owner=get_worker_user(), hostname=gethostname())
+        hostname = gethostname()
+        # Bug#1614584: it is possible that gethostname() reurns the FQDN.
+        # Split it up, and get the appropriate domain.  If we wind up creating
+        # one for it, we are not authoritative.
+        # Just in case the default domain has not been created, let's create it
+        # here, even if we subsequently overwrite it inside the if statement.
+        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})
+        return self.create(
+            owner=get_worker_user(), hostname=hostname, domain=domain)
 
 
 def get_default_domain():

=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2016-10-31 20:37:57 +0000
+++ src/maasserver/models/tests/test_node.py	2016-12-07 12:55:26 +0000
@@ -595,7 +595,12 @@
         super().setUp()
         # Patch out gethostname and get_mac_addresses.
         self.patch_autospec(node_module, "gethostname")
-        node_module.gethostname.return_value = factory.make_name("host")
+        hostname = factory.make_name('host')
+        # Bug#1614584: make sure that we handle the case where gethostname()
+        # returns an FQDN, instead of a domainless hostname.
+        if factory.pick_bool():
+            hostname += ".%s" % factory.make_name('domain')
+        node_module.gethostname.return_value = hostname
         self.patch_autospec(node_module, "get_mac_addresses")
         node_module.get_mac_addresses.return_value = []
 

=== modified file 'src/maasserver/models/tests/test_staticipaddress.py'
--- src/maasserver/models/tests/test_staticipaddress.py	2016-10-18 08:00:37 +0000
+++ src/maasserver/models/tests/test_staticipaddress.py	2016-12-07 12:55:26 +0000
@@ -397,20 +397,21 @@
             alloc_type=IPADDRESS_TYPE.STICKY,
             ip=factory.pick_ip_in_Subnet(subnet),
             subnet=subnet, interface=boot_interface)
-        ifaces = node.interface_set.exclude(interface=boot_interface)
+        iface2 = node.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=ifaces[0])
+            subnet=subnet, interface=iface2)
         mapping = StaticIPAddress.objects.get_hostname_ip_mapping(subnet)
-        self.assertEqual({
+        expected = {
             full_hostname:
                 HostnameIPMapping(
                     node.system_id, 30, {staticip.ip}, node.node_type),
-            "%s.%s" % (ifaces[0].name, full_hostname):
+            "%s.%s" % (iface2.name, full_hostname):
                 HostnameIPMapping(
                     node.system_id, 30, {sip2.ip}, node.node_type),
-            }, mapping)
+        }
+        self.assertEqual(expected, mapping)
 
     def make_mapping(self, node, raw_ttl=False):
         if raw_ttl or node.address_ttl is not None: