Merge lp:~rvb/maas/bug-1364591 into lp:~maas-committers/maas/trunk

[Raphaël Badin]

When generating the preseed, use the port from the 'main_archive' setting if provided.

[Graham Binns (gmb)]

review: Approve

=== modified file 'src/maasserver/preseed.py'
--- src/maasserver/preseed.py	2014-08-13 21:49:35 +0000
+++ src/maasserver/preseed.py	2014-09-03 08:19:34 +0000
@@ -354,10 +354,14 @@
     return get_template(prefix, None, default=True)
 
 
-def get_hostname_and_path(url):
-    """Return a tuple of the hostname and the hierarchical path from a url."""
+def get_netloc_and_path(url):
+    """Return a tuple of the netloc and the hierarchical path from a url.
+
+    The netloc, the "Network location part", is composed of the hostname
+    and, optionally, the port.
+    """
     parsed_url = urlparse(url)
-    return parsed_url.hostname, parsed_url.path
+    return parsed_url.netloc, parsed_url.path
 
 
 def pick_cluster_controller_address(node):
@@ -408,9 +412,9 @@
     :rtype: dict.
     """
     server_host = get_maas_facing_server_host(nodegroup=nodegroup)
-    main_archive_hostname, main_archive_directory = get_hostname_and_path(
+    main_archive_hostname, main_archive_directory = get_netloc_and_path(
         Config.objects.get_config('main_archive'))
-    ports_archive_hostname, ports_archive_directory = get_hostname_and_path(
+    ports_archive_hostname, ports_archive_directory = get_netloc_and_path(
         Config.objects.get_config('ports_archive'))
     if nodegroup is None:
         base_url = None

=== modified file 'src/maasserver/tests/test_preseed.py'
--- src/maasserver/tests/test_preseed.py	2014-08-19 11:05:33 +0000
+++ src/maasserver/tests/test_preseed.py	2014-09-03 08:19:34 +0000
@@ -38,7 +38,7 @@
     get_curtin_installer_url,
     get_curtin_userdata,
     get_enlist_preseed,
-    get_hostname_and_path,
+    get_netloc_and_path,
     get_node_preseed_context,
     get_preseed,
     get_preseed_context,
@@ -83,19 +83,22 @@
         self.assertEqual(['amd64', 'test'], split_subarch('amd64/test'))
 
 
-class TestGetHostnameAndPath(MAASServerTestCase):
-    """Tests for `get_hostname_and_path`."""
+class TestGetNetlocAndPath(MAASServerTestCase):
+    """Tests for `get_netloc_and_path`."""
 
-    def test_get_hostname_and_path(self):
+    def test_get_netloc_and_path(self):
         input_and_results = [
+            ('http://name.domain:66/my/path', ('name.domain:66', '/my/path')),
+            ('http://name.domain:80/my/path', ('name.domain:80', '/my/path')),
             ('http://name.domain/my/path', ('name.domain', '/my/path')),
             ('https://domain/path', ('domain', '/path')),
+            ('http://domain:12', ('domain:12', '')),
             ('http://domain/', ('domain', '/')),
             ('http://domain', ('domain', '')),
             ]
         inputs = [input for input, _ in input_and_results]
         results = [result for _, result in input_and_results]
-        self.assertEqual(results, map(get_hostname_and_path, inputs))
+        self.assertEqual(results, map(get_netloc_and_path, inputs))
 
 
 class TestGetPreseedFilenames(MAASServerTestCase):