Merge lp:~bjornt/maas/get-apt-proxy into lp:~maas-committers/maas/trunk

[Björn Tillenius]

Factor out getting the APT proxy.

The same logic was duplicated in two places. I'm going to change the
logic later, so having it in one place makes it easier.

[Mike Pontillo (mpontillo)]

Looks good to me!

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~bjornt/maas/get-apt-proxy into lp:maas failed. Below is the output from the failed tests.

Hit:1 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease
Get:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease [102 kB]
Get:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease [102 kB]
Get:4 http://security.ubuntu.com/ubuntu xenial-security InRelease [102 kB]
Fetched 306 kB in 0s (661 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind avahi-utils bash bind9 bind9utils build-essential bzr bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common isc-dhcp-server libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libnss-wrapper libpq-dev make nodejs-legacy npm postgresql psmisc pxelinux python3-all python3-apt python3-attr python3-bson python3-convoy python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-netaddr python3-netifaces python3-novaclient python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-simplejson python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
authbind is already the newest version (2.1.1+nmu1).
avahi-utils is already the newest version (0.6.32~rc+dfsg-1ubuntu2).
build-essential is already the newest version (12.1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest version (0.14build1).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-yui3-full is already the newest version (3.5.1-1ubuntu3).
libjs-yui3-min is already the newest version (3.5.1-1ubuntu3).
make is already the newest version (4.1-6).
postgresql is already the newest version (9.5+173).
psmisc is already the newest version (22.21-2.1build1).
pxelinux is already the newest version (3:6.03+dfsg-11ubuntu1).
python-formencode is already the newest version (1.3.0-0ubuntu5).
python-lxml is already the newest version (3.5.0-1build1).
python-netaddr is already the newest version (0.7.18-1).
python-netifaces is already the newest version (0.10.4-0.1build2).
python-p...

[MAAS Lander (maas-lander)]

The attempt to merge lp:~bjornt/maas/get-apt-proxy into lp:maas failed. Below is the output from the failed tests.

Hit:1 http://security.ubuntu.com/ubuntu xenial-security InRelease
Hit:2 http://archive.ubuntu.com/ubuntu xenial InRelease
Hit:3 http://archive.ubuntu.com/ubuntu xenial-updates InRelease
Hit:4 http://archive.ubuntu.com/ubuntu xenial-backports InRelease
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind avahi-utils bash bind9 bind9utils build-essential bzr bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common isc-dhcp-server libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libnss-wrapper libpq-dev make nodejs-legacy npm postgresql psmisc pxelinux python3-all python3-apt python3-attr python3-bson python3-convoy python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-netaddr python3-netifaces python3-novaclient python3-oauth python3-oauthlib python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-requests python3-seamicroclient python3-setuptools python3-simplestreams python3-sphinx python3-tempita python3-twisted python3-txtftp python3-tz python3-yaml python3-zope.interface python-bson python-crochet python-django python-django-piston python-djorm-ext-pgarray python-formencode python-lxml python-netaddr python-netifaces python-pocket-lint python-psycopg2 python-simplejson python-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
authbind is already the newest version (2.1.1+nmu1).
avahi-utils is already the newest version (0.6.32~rc+dfsg-1ubuntu2).
build-essential is already the newest version (12.1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest version (0.14build1).
libjs-angularjs is already the newest version (1.2.28-1ubuntu2).
libjs-jquery is already the newest version (1.11.3+dfsg-4).
libjs-yui3-full is already the newest version (3.5.1-1ubuntu3).
libjs-yui3-min is already the newest version (3.5.1-1ubuntu3).
make is already the newest version (4.1-6).
postgresql is already the newest version (9.5+173).
psmisc is already the newest version (22.21-2.1build1).
pxelinux is already the newest version (3:6.03+dfsg-11ubuntu1).
python-formencode is already the newest version (1.3.0-0ubuntu5).
python-lxml is already the newest version (3.5.0-1build1).
python-netaddr is already the newest version (0.7.18-1).
python-netifaces is already the newest version (0.10.4-0.1build2).
python-psycopg2 is already the newest version (2.6.1-1build2).
python-simplejson is already the newest version (3.8.1-1ubuntu2).
python-tem...

[lp:~bjornt/maas/get-apt-proxy]

6070. By Björn Tillenius on 2017-06-16

Fix imports.

=== modified file 'src/maasserver/compose_preseed.py'
--- src/maasserver/compose_preseed.py	2017-03-29 21:13:51 +0000
+++ src/maasserver/compose_preseed.py	2017-06-16 09:11:46 +0000
@@ -31,17 +31,17 @@
 RSYSLOG_PORT = 514
 
 
-def get_apt_proxy_for_node(node):
-    """Return the APT proxy for the `node`."""
+def get_apt_proxy(rack_controller=None):
+    """Return the APT proxy for the `rack_controller`."""
     if Config.objects.get_config("enable_http_proxy"):
         http_proxy = Config.objects.get_config("http_proxy")
-        if (http_proxy is not None and len(http_proxy) > 0 and
-                not http_proxy.isspace()):
+        if http_proxy is not None:
+            http_proxy = http_proxy.strip()
+        if http_proxy:
             return http_proxy
         else:
             return compose_URL(
-                "http://:8000/", get_maas_facing_server_host(
-                    node.get_boot_rack_controller()))
+                "http://:8000/", get_maas_facing_server_host(rack_controller))
     else:
         return None
 
@@ -58,7 +58,7 @@
     arch = node.split_arch()[0]
     archive = PackageRepository.objects.get_default_archive(arch)
     repositories = PackageRepository.objects.get_additional_repositories(arch)
-    apt_proxy = get_apt_proxy_for_node(node)
+    apt_proxy = get_apt_proxy(node.get_boot_rack_controller())
 
     # Process the default Ubuntu Archives or Mirror.
     archives = {}
@@ -225,7 +225,7 @@
     }
     # Add the system configuration information.
     config.update(get_system_info())
-    apt_proxy = get_apt_proxy_for_node(node)
+    apt_proxy = get_apt_proxy(node.get_boot_rack_controller())
     if apt_proxy:
         config['apt_proxy'] = apt_proxy
     # Add APT configuration for new cloud-init (>= 0.7.7-17)
@@ -313,7 +313,7 @@
     }
     # Add the system configuration information.
     cloud_config.update(get_system_info())
-    apt_proxy = get_apt_proxy_for_node(node)
+    apt_proxy = get_apt_proxy(node.get_boot_rack_controller())
     if apt_proxy:
         cloud_config['apt_proxy'] = apt_proxy
     # Add APT configuration for new cloud-init (>= 0.7.7-17)

=== modified file 'src/maasserver/preseed.py'
--- src/maasserver/preseed.py	2017-06-13 10:54:20 +0000
+++ src/maasserver/preseed.py	2017-06-16 09:11:46 +0000
@@ -33,6 +33,7 @@
 from maasserver.compose_preseed import (
     compose_cloud_init_preseed,
     compose_preseed,
+    get_apt_proxy,
     get_archive_config,
     get_system_info,
     RSYSLOG_PORT,
@@ -111,13 +112,7 @@
     :return: The rendered enlistment user-data string.
     :rtype: unicode.
     """
-    server_host = get_maas_facing_server_host(rack_controller=rack_controller)
-    http_proxy = None
-    if Config.objects.get_config('enable_http_proxy'):
-        if Config.objects.get_config('http_proxy'):
-            http_proxy = Config.objects.get_config('http_proxy')
-        elif server_host:
-            http_proxy = "http://%s:8000/" % server_host
+    http_proxy = get_apt_proxy(rack_controller=rack_controller)
     enlist_userdata = render_enlistment_preseed(
         USERDATA_TYPE.ENLIST, rack_controller=rack_controller)
     config = get_system_info()

=== modified file 'src/maasserver/tests/test_compose_preseed.py'
--- src/maasserver/tests/test_compose_preseed.py	2017-03-29 22:00:38 +0000
+++ src/maasserver/tests/test_compose_preseed.py	2017-06-16 09:11:46 +0000
@@ -9,7 +9,7 @@
 
 from maasserver.compose_preseed import (
     compose_preseed,
-    get_apt_proxy_for_node,
+    get_apt_proxy,
 )
 from maasserver.enum import (
     NODE_STATUS,
@@ -89,7 +89,7 @@
             interface=True, status=NODE_STATUS.COMMISSIONING)
         Config.objects.set_config("enable_http_proxy", self.enable)
         Config.objects.set_config("http_proxy", self.http_proxy)
-        actual = get_apt_proxy_for_node(node)
+        actual = get_apt_proxy(node.get_boot_rack_controller())
         self.assertEqual(self.result, actual)
 
 
@@ -180,7 +180,7 @@
         nic.vlan.dhcp_on = True
         nic.vlan.primary_rack = rack_controller
         nic.vlan.save()
-        apt_proxy = get_apt_proxy_for_node(node)
+        apt_proxy = get_apt_proxy(node.get_boot_rack_controller())
         preseed = yaml.safe_load(
             compose_preseed(PRESEED_TYPE.COMMISSIONING, node))
         self.assertIn('datasource', preseed)
@@ -365,7 +365,7 @@
         nic.vlan.primary_rack = rack_controller
         nic.vlan.save()
         self.useFixture(RunningClusterRPCFixture())
-        apt_proxy = get_apt_proxy_for_node(node)
+        apt_proxy = get_apt_proxy(node.get_boot_rack_controller())
         preseed = yaml.safe_load(
             compose_preseed(PRESEED_TYPE.CURTIN, node))