Merge lp:~lamont/maas/rfc2317-small-subnet-rdns into lp:maas/trunk

Proposed by LaMont Jones on 2016-01-27
Status: Merged
Merged at revision: 4621
Proposed branch: lp:~lamont/maas/rfc2317-small-subnet-rdns
Merge into: lp:maas/trunk
Diff against target: 27 lines (+8/-2)
1 file modified
src/maastesting/factory.py (+8/-2)
To merge this branch: bzr merge lp:~lamont/maas/rfc2317-small-subnet-rdns
Reviewer Review Type Date Requested Status
Blake Rouse (community) 2016-01-27 Approve on 2016-01-28
Review via email: mp+284195@code.launchpad.net

Commit message

Avoid test failures for super-small subnet reverse dns (ipv4 smaller than /24, ipv6 smaller than /124), while I develop the necessary fix for handling that correctly in the DNS config.

Description of the change

Avoid test failures for super-small subnet reverse dns (ipv4 smaller than /24, ipv6 smaller than /124), while I develop the necessary fix for handling that correctly in the DNS config.

To post a comment you must log in.
Blake Rouse (blake-rouse) wrote :

It would be better to also place this comment where the code generates the zones, that way it is know there as well.

review: Approve
MAAS Lander (maas-lander) wrote :
Download full text (17.7 KiB)

The attempt to merge lp:~lamont/maas/rfc2317-small-subnet-rdns into lp:maas failed. Below is the output from the failed tests.

Hit:1 http://security.ubuntu.com/ubuntu xenial-security InRelease
Get:2 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial InRelease [227 kB]
Hit:3 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-updates InRelease
Hit:4 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial-backports InRelease
Get:5 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/main Sources [1,129 kB]
Get:6 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe Sources [7,632 kB]
Get:7 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/main amd64 Packages [1,480 kB]
Get:8 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe amd64 Packages [7,218 kB]
Get:9 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe Translation-en [4,826 kB]
Fetched 22.5 MB in 6s (3,586 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 authbind bind9 bind9utils build-essential 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 libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm postgresql pxelinux python3-apt python3-bson python3-convoy python3-coverage python3-crochet python3-cssselect python3-curtin python3-dev python3-distro-info python3-django python3-django-nose python3-django-piston3 python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-mock python3-netaddr python3-netifaces python3-oauth python3-openssl python3-paramiko python3-petname python3-pexpect python3-psycopg2 python3-pyinotify python3-pyparsing python3-pyvmomi python3-seamicroclient python3-simplejson 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-tempita python-twisted python-yaml socat syslinux-common tgt ubuntu-cloudimage-keyring wget xvfb
Reading package lists...
Building dependency tree...
Reading state information...
apache2 is already the newest version (2.4.18-1ubuntu1).
authbind is already the newest version (2.1.1+nmu1).
bind9 is already the newest version (1:9.9.5.dfsg-12.1).
bind9utils is already the newest version (1:9.9.5.dfsg-12.1).
build-essential is already the newest version (12.1ubuntu2).
curl is already the newest version (7.46.0-1ubuntu1).
debhelper is already the newest version (9.20160115ubuntu2).
dh-apport is already the newest version (2.19.4-0ubuntu1).
dh-systemd is already the newest version (1.26ubuntu1).
distro-info is already the newest version (0.14build1).
dnsutils is already the newest version (1:9.9.5.dfsg-12.1).
firefox is already the newest version (44.0+bui...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/maastesting/factory.py'
2--- src/maastesting/factory.py 2015-12-01 18:12:59 +0000
3+++ src/maastesting/factory.py 2016-01-27 23:54:56 +0000
4@@ -229,7 +229,10 @@
5 :rtype: :class:`IPNetwork`
6 """
7 if slash is None:
8- slash = random.randint(16, 29)
9+ # XXX lamont 2016-01-27 bug#1356012 reverse DNS needs cname glue
10+ # for rfc2317. See comment 7 in the bug.
11+ # once fixed, s/24/29/ in the next line.
12+ slash = random.randint(16, 24)
13 return self._make_random_network(
14 slash=slash, but_not=but_not, disjoint_from=disjoint_from,
15 random_address_factory=self.make_ipv4_address)
16@@ -250,7 +253,10 @@
17 :rtype: :class:`IPNetwork`
18 """
19 if slash is None:
20- slash = random.randint(112, 125)
21+ # XXX lamont 2016-01-27 bug#1356012 reverse DNS needs cname glue
22+ # for rfc2317. See comment 7 in the bug.
23+ # once fixed, s/124/125/ in the next line.
24+ slash = random.randint(112, 124)
25 return self._make_random_network(
26 slash=slash, but_not=but_not, disjoint_from=disjoint_from,
27 random_address_factory=self.make_ipv6_address)