Merge lp:~therve/landscape-client/localhost-hostname into lp:~landscape/landscape-client/trunk

[Thomas Herve]

The branch defines a new get_fqnd function which does some magic if the returned value of socket.getfqdn() is not sensible. I've found the getaddrinfo invocation in hostname source, and the intertubes. It "worked" on my machine which was broken since the upgrade to maverick, and also my lucid server.

[Kevin McDermott (bigkevmcd)]

+ C{get_fqdn} fallbacks to C{socket.getaddrinfo} with C{AI_CANONNAME}

"falls back"...

+ Return the current fqdn of the machine, trying hard to return a meaninful

meaningful

Other than a couple of typos, this is cool, shame we have to work round an Ubuntu bug :-(

+1 for merge

review: Approve

[lp:~therve/landscape-client/localhost-hostname]

301. By Thomas Herve on 2010-12-07

English iz hard

[Björn Tillenius (bjornt)]

+1! It seems like we could get a spurious test failure, if the machine that runs the test has the string 'localhost' in its name, no? Probably not worth worrying about.

review: Approve

=== modified file 'landscape/broker/registration.py'
--- landscape/broker/registration.py	2010-09-09 16:10:27 +0000
+++ landscape/broker/registration.py	2010-12-07 14:52:20 +0000
@@ -8,6 +8,7 @@
 from landscape.lib.log import log_failure
 from landscape.lib.fetch import fetch, FetchError
 from landscape.lib.tag import is_valid_tag_list
+from landscape.lib.network import get_fqdn
 
 
 EC2_HOST = "169.254.169.254"
@@ -242,7 +243,7 @@
                     logging.info("Queueing message to register with OTP")
                     message = {"type": "register-cloud-vm",
                                "otp": self._otp,
-                               "hostname": socket.getfqdn(),
+                               "hostname": get_fqdn(),
                                "account_name": None,
                                "registration_password": None,
                                "tags": tags}
@@ -255,7 +256,7 @@
                         u"as an EC2 instance." % (id.account_name, with_tags))
                     message = {"type": "register-cloud-vm",
                                "otp": None,
-                               "hostname": socket.getfqdn(),
+                               "hostname": get_fqdn(),
                                "account_name": id.account_name,
                                "registration_password": \
                                    id.registration_password,
@@ -274,7 +275,7 @@
                            "computer_title": id.computer_title,
                            "account_name": id.account_name,
                            "registration_password": id.registration_password,
-                           "hostname": socket.getfqdn(),
+                           "hostname": get_fqdn(),
                            "tags": tags}
                 self._exchange.send(message)
             else:

=== modified file 'landscape/lib/network.py'
--- landscape/lib/network.py	2010-08-16 09:31:24 +0000
+++ landscape/lib/network.py	2010-12-07 14:52:20 +0000
@@ -62,7 +62,7 @@
     # Generator over the interface names
     already_found = set()
     for index in range(0, byte_length, IF_STRUCT_SIZE):
-        ifreq_struct = result[index:index+IF_STRUCT_SIZE]
+        ifreq_struct = result[index:index + IF_STRUCT_SIZE]
         interface_name = ifreq_struct[:ifreq_struct.index("\0")]
         if interface_name not in already_found:
             already_found.add(interface_name)
@@ -177,6 +177,24 @@
     return devices
 
 
+def get_fqdn():
+    """
+    Return the current fqdn of the machine, trying hard to return a meaningful
+    name.
+
+    In particular, it means working against a NetworkManager bug which seems to
+    make C{getfqdn} return localhost6.localdomain6 for machine without a domain
+    since Maverick.
+    """
+    fqdn = socket.getfqdn()
+    if "localhost" in fqdn:
+        # Try the heavy artillery
+        fqdn = socket.getaddrinfo(socket.gethostname(), None, socket.AF_INET,
+                                  socket.SOCK_DGRAM, socket.IPPROTO_IP,
+                                  socket.AI_CANONNAME)[0][3]
+    return fqdn
+
+
 if __name__ == "__main__":
     import pprint
     pprint.pprint(get_active_device_info())

=== modified file 'landscape/lib/tests/test_network.py'
--- landscape/lib/tests/test_network.py	2010-07-23 08:08:41 +0000
+++ landscape/lib/tests/test_network.py	2010-12-07 14:52:20 +0000
@@ -5,7 +5,8 @@
 from landscape.tests.helpers import LandscapeTest
 
 from landscape.lib.network import (
-    get_network_traffic, get_active_device_info, get_active_interfaces)
+    get_network_traffic, get_active_device_info, get_active_interfaces,
+    get_fqdn)
 from landscape.tests.mocker import ANY
 
 
@@ -156,3 +157,24 @@
             "send_colls": 19,
             "send_carrier": 0,
             "send_compressed": 0}}
+
+
+class FQDNTest(LandscapeTest):
+
+    def test_default_fqdn(self):
+        """
+        C{get_fqdn} returns the output of C{socket.getfqdn} if it returns
+        something sensible.
+        """
+        self.addCleanup(setattr, socket, "getfqdn", socket.getfqdn)
+        socket.getfqdn = lambda: "foo.bar"
+        self.assertEqual("foo.bar", get_fqdn())
+
+    def test_getaddrinfo_fallback(self):
+        """
+        C{get_fqdn} falls back to C{socket.getaddrinfo} with the
+        C{AI_CANONNAME} flag if C{socket.getfqdn} returns a local hostname.
+        """
+        self.addCleanup(setattr, socket, "getfqdn", socket.getfqdn)
+        socket.getfqdn = lambda: "localhost6.localdomain6"
+        self.assertNotIn("localhost", get_fqdn())

=== modified file 'landscape/monitor/computerinfo.py'
--- landscape/monitor/computerinfo.py	2010-04-23 13:39:22 +0000
+++ landscape/monitor/computerinfo.py	2010-12-07 14:52:20 +0000
@@ -1,7 +1,7 @@
 import logging
-import socket
 
 from landscape.lib.lsb_release import LSB_RELEASE_FILENAME, parse_lsb_release
+from landscape.lib.network import get_fqdn
 from landscape.monitor.plugin import MonitorPlugin
 
 
@@ -14,7 +14,7 @@
 
     persist_name = "computer-info"
 
-    def __init__(self, get_fqdn=socket.getfqdn,
+    def __init__(self, get_fqdn=get_fqdn,
                  meminfo_file="/proc/meminfo",
                  lsb_release_filename=LSB_RELEASE_FILENAME):
         self._get_fqdn = get_fqdn