Merge lp:~rvb/maas/enlistment-user-data into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Fix the enlistment user data: use the maas_url stored on the related nodegroup.

[Gavin Panella (allenap)]

Looks good.

[1]

+        ng_url = 'http://%s' % factory.make_name('host')
...
+        ud_url = reverse('enlist-metadata-user-data', args=['latest'])

I'm running a bit slow today, but it took me a while to figure out
what the prefixes ng and ud here meant.

[2]

+            MatchesAll(*[Contains(ng_url), Not(Contains(maas_url))]))

Or:

            MatchesAll(Contains(ng_url), Not(Contains(maas_url)))

?

review: Approve

[Raphaël Badin (rvb)]

> Looks good.
>
> [1]
[...]
> [2]
[...]

Fixed, thanks for the review!

=== modified file 'src/metadataserver/api.py'
--- src/metadataserver/api.py	2012-11-27 10:26:19 +0000
+++ src/metadataserver/api.py	2012-11-28 15:14:21 +0000
@@ -377,7 +377,9 @@
 
     def read(self, request, version):
         check_version(version)
-        return HttpResponse(get_enlist_userdata(), mimetype="text/plain")
+        nodegroup = find_nodegroup(request)
+        return HttpResponse(
+            get_enlist_userdata(nodegroup=nodegroup), mimetype="text/plain")
 
 
 class EnlistVersionIndexHandler(OperationsHandler):
 
=== modified file 'src/metadataserver/tests/test_api.py'
--- src/metadataserver/tests/test_api.py	2012-11-26 08:52:01 +0000
+++ src/metadataserver/tests/test_api.py	2012-11-28 15:14:21 +0000
@@ -53,7 +53,11 @@
 from mock import Mock
 from netaddr import IPNetwork
 from provisioningserver.enum import POWER_TYPE
-from testtools.matchers import Contains
+from testtools.matchers import (
+    Contains,
+    MatchesAll,
+    Not,
+    )
 
 
 class TestHelpers(DjangoTestCase):
@@ -722,13 +726,27 @@
         # instance-id must be available
         ud_url = reverse('enlist-metadata-user-data', args=['latest'])
         fake_preseed = factory.getRandomString()
-        self.patch(api, "get_enlist_userdata", lambda: fake_preseed)
+        self.patch(
+            api, "get_enlist_userdata", Mock(return_value= fake_preseed))
         response = self.client.get(ud_url)
         self.assertEqual(
             (httplib.OK, "text/plain", fake_preseed),
             (response.status_code, response["Content-Type"], response.content),
             response)
 
+    def test_get_userdata_detects_request_origin(self):
+        nodegroup_url = 'http://%s' % factory.make_name('host')
+        maas_url = 'http://%s' % factory.make_hostname()
+        self.patch(settings, 'DEFAULT_MAAS_URL', maas_url)
+        network = IPNetwork("10.1.1/24")
+        ip = factory.getRandomIPInNetwork(network)
+        factory.make_node_group(maas_url=nodegroup_url, network=network)
+        url = reverse('enlist-metadata-user-data', args=['latest'])
+        response = self.client.get(url, SERVER_NAME=ip)
+        self.assertThat(
+            response.content,
+            MatchesAll(Contains(nodegroup_url), Not(Contains(maas_url))))
+
     def test_metadata_list(self):
         # /enlist/latest/metadata request should list available keys
         md_url = reverse('enlist-metadata-meta-data', args=['latest', ""])