Merge into 1.7 : bug-1415538-1.7 : Code : MAAS

Status:

Merged

Approved by:

Raphaël Badin on 2015-02-05

Approved revision:

no longer in the source branch.

Merged at revision:

3343

Proposed branch:

lp:~rvb/maas/bug-1415538-1.7

Merge into:

lp:maas/1.7

Diff against target:

63 lines (+22/-2)

3 files modified

src/maasserver/dhcp.py (+3/-1)
src/maasserver/tests/test_dhcp.py (+8/-0)
src/provisioningserver/dhcp/tests/test_config.py (+11/-1)

To merge this branch:

bzr merge lp:~rvb/maas/bug-1415538-1.7

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Raphaël Badin (community)			Approve on 2015-02-05
Review via email: mp+248726@code.launchpad.net

Commit message

Backport 3497: Do not generate the 'option routers' stanza if router IP is None.

Revision history for this message

Raphaël Badin (rvb) wrote on 2015-02-05:

#

Simple backport: self-approving.

review: Approve

Revision history for this message

MAAS Lander (maas-lander) wrote on 2015-02-05:

#

Download full text (20.2 KiB)

The attempt to merge lp:~rvb/maas/bug-1415538-1.7 into lp:maas/1.7 failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Get:1 http://security.ubuntu.com trusty-security Release.gpg [933 B]
Get:2 http://security.ubuntu.com trusty-security Release [62.0 kB]
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates Release [62.0 kB]
Get:5 http://security.ubuntu.com trusty-security/main Sources [64.8 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Get:6 http://security.ubuntu.com trusty-security/universe Sources [17.5 kB]
Get:7 http://security.ubuntu.com trusty-security/main amd64 Packages [200 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Get:8 http://security.ubuntu.com trusty-security/universe amd64 Packages [85.3 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Get:9 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [161 kB]
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Get:10 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [99.9 kB]
Get:11 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [412 kB]
Get:12 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [244 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Fetched 1,409 kB in 2s (475 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
--no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools gjs ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make pep8 postgresql pyflakes python-amqplib python-bzrlib python-celery python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-mimeparse python-mock python-netaddr python-netifaces python-nose python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-openssl...

The attempt to merge lp:~rvb/maas/bug-1415538-1.7 into lp:maas/1.7 failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Get:1 http://security.ubuntu.com trusty-security Release.gpg [933 B]
Get:2 http://security.ubuntu.com trusty-security Release [62.0 kB]
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates Release [62.0 kB]
Get:5 http://security.ubuntu.com trusty-security/main Sources [64.8 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Get:6 http://security.ubuntu.com trusty-security/universe Sources [17.5 kB]
Get:7 http://security.ubuntu.com trusty-security/main amd64 Packages [200 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Get:8 http://security.ubuntu.com trusty-security/universe amd64 Packages [85.3 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Get:9 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [161 kB]
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Get:10 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [99.9 kB]
Get:11 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [412 kB]
Get:12 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [244 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Fetched 1,409 kB in 2s (475 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb curl daemontools debhelper dh-apport distro-info dnsutils firefox freeipmi-tools gjs ipython isc-dhcp-common libjs-raphael libjs-yui3-full libjs-yui3-min libpq-dev make pep8 postgresql pyflakes python-amqplib python-bzrlib python-celery python-convoy python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-jinja2 python-jsonschema python-lockfile python-lxml python-mimeparse python-mock python-netaddr python-netifaces python-nose python-oauth python-oops python-oops-amqp python-oops-datedir-repo python-oops-twisted python-oops-wsgi python-openssl python-paramiko python-pexpect python-pip python-pocket-lint python-psycopg2 python-pyinotify python-seamicroclient python-simplejson python-simplestreams python-sphinx python-subunit python-tempita python-testresources python-testscenarios python-testtools python-twisted python-txamqp python-txtftp python-tz python-virtualenv python-yaml python-zope.interface syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
authbind is already the newest version.
build-essential is already the newest version.
debhelper is already the newest version.
distro-info is already the newest version.
isc-dhcp-common is already the newest version.
libjs-raphael is already the newest version.
libjs-yui3-full is already the newest version.
libjs-yui3-min is already the newest version.
make is already the newest version.
pep8 is already the newest version.
postgresql is already the newest version.
pyflakes is already the newest version.
python-amqplib is already the newest version.
python-celery is already the newest version.
python-convoy is already the newest version.
python-crochet is already the newest version.
python-dev is already the newest version.
python-distro-info is already the newest version.
python-django-piston is already the newest version.
python-django-south is already the newest version.
python-djorm-ext-pgarray is already the newest version.
python-docutils is already the newest version.
python-extras is already the newest version.
python-fixtures is already the newest version.
python-formencode is already the newest version.
python-httplib2 is already the newest version.
python-jinja2 is already the newest version.
python-jsonschema is already the newest version.
python-lockfile is already the newest version.
python-mimeparse is already the newest version.
python-mock is already the newest version.
python-netaddr is already the newest version.
python-netifaces is already the newest version.
python-nose is already the newest version.
python-oauth is already the newest version.
python-oops is already the newest version.
python-oops-amqp is already the newest version.
python-oops-datedir-repo is already the newest version.
python-oops-twisted is already the newest version.
python-oops-wsgi is already the newest version.
python-openssl is already the newest version.
python-paramiko is already the newest version.
python-psycopg2 is already the newest version.
python-pyinotify is already the newest version.
python-simplejson is already the newest version.
python-subunit is already the newest version.
python-tempita is already the newest version.
python-testresources is already the newest version.
python-testscenarios is already the newest version.
python-testtools is already the newest version.
python-twisted is already the newest version.
python-txamqp is already the newest version.
python-txtftp is already the newest version.
python-tz is already the newest version.
python-zope.interface is already the newest version.
syslinux-common is already the newest version.
tgt is already the newest version.
ubuntu-cloudimage-keyring is already the newest version.
bzr-builddeb is already the newest version.
daemontools is already the newest version.
ipython is already the newest version.
python-cssselect is already the newest version.
python-flake8 is already the newest version.
python-hivex is already the newest version.
python-pip is already the newest version.
python-pocket-lint is already the newest version.
python-virtualenv is already the newest version.
apache2 is already the newest version.
bind9 is already the newest version.
bind9utils is already the newest version.
curl is already the newest version.
dh-apport is already the newest version.
dnsutils is already the newest version.
firefox is already the newest version.
freeipmi-tools is already the newest version.
libpq-dev is already the newest version.
python-bzrlib is already the newest version.
python-curtin is already the newest version.
python-django is already the newest version.
python-lxml is already the newest version.
python-pexpect is already the newest version.
python-seamicroclient is already the newest version.
python-simplestreams is already the newest version.
python-sphinx is already the newest version.
python-yaml is already the newest version.
wget is already the newest version.
xvfb is already the newest version.
gjs is already the newest version.
The following packages were automatically installed and are no longer required:
  linux-headers-3.13.0-40 linux-headers-3.13.0-40-generic
  linux-image-3.13.0-40-generic
Use 'apt-get autoremove' to remove them.
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
	    purge 
Reading package lists...
Building dependency tree...
Reading state information...
The following packages were automatically installed and are no longer required:
  linux-headers-3.13.0-40 linux-headers-3.13.0-40-generic
  linux-image-3.13.0-40-generic
Use 'apt-get autoremove' to remove them.
0 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.0yuE2w/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.0yuE2w/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
rm -f -r bin include lib local
rm -f -r eggs develop-eggs
rm -f -r build dist logs/* parts
rm -f tags TAGS .installed.cfg
rm -f -r *.egg *.egg-info src/*.egg-info
rm -f -r run/* services/*/supervise
virtualenv --python=python2.7 --system-site-packages /tmp/tarmac/branch.0yuE2w
New python executable in /tmp/tarmac/branch.0yuE2w/bin/python2.7
Also creating executable in /tmp/tarmac/branch.0yuE2w/bin/python
Installing setuptools, pip...done.
Running virtualenv with interpreter /usr/bin/python2.7
bin/python -m pip --quiet install --ignore-installed \
	    --no-dependencies bootstrap/zc.buildout-1.5.2.tar.gz
rm -f -f README.txt  # zc.buildout installs an annoying README.txt.
bin/buildout install database
Creating directory '/tmp/tarmac/branch.0yuE2w/parts'.
Creating directory '/tmp/tarmac/branch.0yuE2w/develop-eggs'.
Installing database.
Generated script '/tmp/tarmac/branch.0yuE2w/bin/database'.
bin/buildout install repl
Installing repl.
Generated script '/tmp/tarmac/branch.0yuE2w/bin/ipy'.
Generated interpreter '/tmp/tarmac/branch.0yuE2w/bin/py'.
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Installing maas.
Generated script '/tmp/tarmac/branch.0yuE2w/bin/maas-region-admin'.
bin/buildout install maas-test
Installing maas-test.
Generated script '/tmp/tarmac/branch.0yuE2w/bin/test.maas'.
bin/buildout install maascli
Installing maascli.
Generated script '/tmp/tarmac/branch.0yuE2w/bin/maas'.
bin/buildout install maascli-test
Installing maascli-test.
Generated script '/tmp/tarmac/branch.0yuE2w/bin/test.maascli'.
bin/buildout install maastesting-test
Installing maastesting-test.
Generated script '/tmp/tarmac/branch.0yuE2w/bin/test.maastesting'.
bin/buildout install pserv
Installing pserv.
Generated script '/tmp/tarmac/branch.0yuE2w/bin/maas-provision'.
Generated script '/tmp/tarmac/branch.0yuE2w/bin/twistd.pserv'.
bin/buildout install pserv-test
Installing pserv-test.
Generated script '/tmp/tarmac/branch.0yuE2w/bin/test.pserv'.
bin/buildout install config-test
Installing config-test.
Generated script '/tmp/tarmac/branch.0yuE2w/bin/test.config'.
bin/buildout install maas-probe-dhcp
Installing maas-probe-dhcp.
Generated script '/tmp/tarmac/branch.0yuE2w/bin/maas-probe-dhcp'.
make -C acceptance clean
make[1]: Entering directory `/tmp/tarmac/branch.0yuE2w/acceptance'
rm -f -r source build *.build *.changes *.deb
make[1]: Leaving directory `/tmp/tarmac/branch.0yuE2w/acceptance'
find . -type f -name '*.py[co]' -print0 | xargs -r0 rm -f
find . -type f -name '*~' -print0 | xargs -r0 rm -f
find . -type f -name dropin.cache -print0 | xargs -r0 rm -f
rm -f -r media/demo/* media/development
rm -f src/maasserver/static/js/enums.js
rm -f *.log
rm -f docs/api.rst
rm -f -r docs/_autosummary docs/_build
rm -f -r man/.doctrees
bin/py -m src/maasserver/utils/jsenums src/maasserver/enum.py src/metadataserver/enum.py > src/maasserver/static/js/enums.js
bin/buildout install maas
Updating maas.
bin/buildout install maas-test
Updating maas-test.
echo bin/test.config bin/test.maas bin/test.maascli bin/test.maastesting bin/test.pserv | xargs -n1 env
nosetests --exclude=provisioningserver --exclude=maastesting --exclude=maascli --logging-level=INFO --verbosity=1
Creating test database for alias 'default'...
Destroying test database for alias 'default'...

..............................................
----------------------------------------------------------------------
Ran 46 tests in 0.324s

OK
..S...............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................S....................................................................................................................................................................................................................................................................................................................................................................................................................................................................S.....................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................S.....................................................................................................................................................................S.................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................S..S.................................................................E........................................................................................................
======================================================================
ERROR: maasserver.tests.test_js.YUIUnitTestsLocal.test_YUI3_unit_tests
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/tmp/tarmac/branch.0yuE2w/src/maasserver/tests/test_js.py", line 148, in __call__
    self.multiply(result)
  File "/tmp/tarmac/branch.0yuE2w/src/maasserver/tests/test_js.py", line 183, in multiply
    with SSTFixture(browser_name):
  File "/usr/lib/python2.7/dist-packages/fixtures/fixture.py", line 130, in __enter__
    self.setUp()
  File "/tmp/tarmac/branch.0yuE2w/src/maastesting/fixtures.py", line 128, in setUp
    start(self.browser_name)
  File "/home/ubuntu/.buildout/eggs/sst-0.2.2-py2.7.egg/sst/actions.py", line 200, in start
    browser = getattr(webdriver, browser_type)(profile)
  File "/home/ubuntu/.buildout/eggs/selenium-2.43.0-py2.7.egg/selenium/webdriver/firefox/webdriver.py", line 59, in __init__
    self.binary, timeout),
  File "/home/ubuntu/.buildout/eggs/selenium-2.43.0-py2.7.egg/selenium/webdriver/firefox/extension_connection.py", line 47, in __init__
    self.binary.launch_browser(self.profile)
  File "/home/ubuntu/.buildout/eggs/selenium-2.43.0-py2.7.egg/selenium/webdriver/firefox/firefox_binary.py", line 64, in launch_browser
    self._wait_until_connectable()
  File "/home/ubuntu/.buildout/eggs/selenium-2.43.0-py2.7.egg/selenium/webdriver/firefox/firefox_binary.py", line 103, in _wait_until_connectable
    self._get_firefox_output())
WebDriverException: Message: 'The browser appears to have exited before we could connect. The output was: None' 
-------------------- >> begin captured stdout << ---------------------

Starting browser: Firefox

--------------------- >> end captured stdout << ----------------------

----------------------------------------------------------------------
Ran 3938 tests in 279.299s

FAILED (SKIP=7, errors=1)
...............................................................................................................................
----------------------------------------------------------------------
Ran 127 tests in 1.836s

OK
...............................................................S........................................................................................
----------------------------------------------------------------------
Ran 152 tests in 29.703s

OK (SKIP=1)
..................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................
----------------------------------------------------------------------
Ran 1746 tests in 16.605s

OK
make: *** [test] Error 123

1	=== modified file 'src/maasserver/dhcp.py'
2	--- src/maasserver/dhcp.py 2014-10-03 19:29:51 +0000
3	+++ src/maasserver/dhcp.py 2015-02-05 10:00:03 +0000
4	@@ -56,7 +56,9 @@
5	'subnet_cidr': unicode(interface.network.cidr),
6	'broadcast_ip': interface.broadcast_ip,
7	'interface': interface.interface,
8	- 'router_ip': unicode(interface.router_ip),
9	+ 'router_ip': (
10	+ None if not interface.router_ip
11	+ else unicode(interface.router_ip)),
12	'dns_servers': dns_servers,
13	'ntp_server': ntp_server,
14	'domain_name': interface.nodegroup.name,
15
16	=== modified file 'src/maasserver/tests/test_dhcp.py'
17	--- src/maasserver/tests/test_dhcp.py 2014-11-07 13:16:58 +0000
18	+++ src/maasserver/tests/test_dhcp.py 2015-02-05 10:00:03 +0000
19	@@ -200,6 +200,14 @@
20	self.expectThat(
21	config['ip_range_low'], Not(Equals(interface.static_ip_range_low)))
22
23	+ def test__doesnt_convert_None_router_ip(self):
24	+ interface = factory.make_NodeGroupInterface(factory.make_NodeGroup())
25	+ interface.router_ip = None
26	+ interface.save()
27	+ config = make_subnet_config(
28	+ interface, factory.make_name('dns'), factory.make_name('ntp'))
29	+ self.assertEqual(None, config['router_ip'])
30	+
31
32	class TestDoConfigureDHCP(MAASServerTestCase):
33	"""Tests for `do_configure_dhcp`."""
34
35	=== modified file 'src/provisioningserver/dhcp/tests/test_config.py'
36	--- src/provisioningserver/dhcp/tests/test_config.py 2014-11-07 15:50:30 +0000
37	+++ src/provisioningserver/dhcp/tests/test_config.py 2015-02-05 10:00:03 +0000
38	@@ -147,7 +147,7 @@
39	config.get_config('dhcpd.conf.template', **params),
40	Contains(router_ip))
41
42	- def test__renders_without_router_ip(self):
43	+ def test__renders_with_empty_string_router_ip(self):
44	params = make_sample_params()
45	params['dhcp_subnets'][0]['router_ip'] = ''
46	template = self.patch_template()
47	@@ -157,6 +157,16 @@
48	config.get_config('dhcpd.conf.template', **params))
49	self.assertNotIn("routers", rendered)
50
51	+ def test__renders_with_None_router_ip(self):
52	+ params = make_sample_params()
53	+ params['dhcp_subnets'][0]['router_ip'] = None
54	+ template = self.patch_template()
55	+ rendered = template.substitute(params)
56	+ self.assertEqual(
57	+ rendered,
58	+ config.get_config('dhcpd.conf.template', **params))
59	+ self.assertNotIn("routers", rendered)
60	+
61
62	class TestComposeConditionalBootloader(PservTestCase):
63	"""Tests for `compose_conditional_bootloader`."""

MAAS

Merge lp:~rvb/maas/bug-1415538-1.7 into lp:maas/1.7

Commit message

Description of the change

Preview Diff

Subscribers