Merge lp:~rvb/maas/metadata-fix-hostname into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Return node.fqdn instead of node.hostname in the metadataservice.

Return node.fqdn instead of node.hostname in the metadataservice.

= Notes =

I've tested that this fixes the problem described in the bug on my HP microservers.

[Raphaël Badin (rvb)]

The backport to the 1.2 branch is here: https://code.launchpad.net/~rvb/maas/metadata-fix-hostname-1.2/+merge/134303

[Raphaël Badin (rvb)]

I had to create another proposal for the 1.2 branch (I targeted the wrong branch), here is the right MP: https://code.launchpad.net/~rvb/maas/metadata-fix-hostname-1.2/+merge/134305

[Julian Edwards (julian-edwards)]

I hate it that these base properties are exposed - it results in bugs like this. Is there any way we can encapsulate these in another properly, e.g. hostname_for_external_use? We should then make the other properties private.

I realise this is not really possible right now though :(

(I will land this now as I want to use it)

review: Approve

=== modified file 'src/metadataserver/api.py'
--- src/metadataserver/api.py	2012-11-08 06:34:48 +0000
+++ src/metadataserver/api.py	2012-11-14 14:40:28 +0000
@@ -310,7 +310,7 @@
 
     def local_hostname(self, node, version, item):
         """Produce local-hostname attribute."""
-        return make_text_response(node.hostname)
+        return make_text_response(node.fqdn)
 
     def instance_id(self, node, version, item):
         """Produce instance-id attribute."""

=== modified file 'src/metadataserver/tests/test_api.py'
--- src/metadataserver/tests/test_api.py	2012-10-05 14:11:43 +0000
+++ src/metadataserver/tests/test_api.py	2012-11-14 14:40:28 +0000
@@ -20,7 +20,11 @@
 from django.conf import settings
 from django.core.exceptions import PermissionDenied
 from django.core.urlresolvers import reverse
-from maasserver.enum import NODE_STATUS
+from maasserver.enum import (
+    NODE_STATUS,
+    NODEGROUP_STATUS,
+    NODEGROUPINTERFACE_MANAGEMENT,
+    )
 from maasserver.exceptions import (
     MAASAPINotFound,
     Unauthorized,
@@ -220,13 +224,19 @@
         producers = map(handler.get_attribute_producer, handler.fields)
         self.assertNotIn(None, producers)
 
-    def test_meta_data_local_hostname_returns_hostname(self):
+    def test_meta_data_local_hostname_returns_fqdn(self):
+        nodegroup = factory.make_node_group(
+            status=NODEGROUP_STATUS.ACCEPTED,
+            management=NODEGROUPINTERFACE_MANAGEMENT.DHCP_AND_DNS)
         hostname = factory.getRandomString()
-        client = self.make_node_client(factory.make_node(hostname=hostname))
+        domain = factory.getRandomString()
+        node = factory.make_node(
+            hostname='%s.%s' % (hostname, domain), nodegroup=nodegroup)
+        client = self.make_node_client(node)
         url = reverse('metadata-meta-data', args=['latest', 'local-hostname'])
         response = client.get(url)
         self.assertEqual(
-            (httplib.OK, hostname),
+            (httplib.OK, node.fqdn),
             (response.status_code, response.content.decode('ascii')))
         self.assertIn('text/plain', response['Content-Type'])