Merge lp:~mpontillo/maas/fix-1570606 into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Add support for /31 and /127 subnets. Fixes bug #1570606.

[LaMont Jones (lamont)]

Looks good. And yeah, /31 and /127 are strange corner cases that cause me to wonder at the sanity of the admin...

review: Approve

[Blake Rouse (blake-rouse)]

Looks good.

It might be good to create a test that runs through all of the different /n to make sure that it handles all cases.

review: Approve

[Mike Pontillo (mpontillo)]

Agreed about testing all /n, but I think in order for the test to be valuable it couldn't just be a loop; I would want to examine the sanity of the data for each /n manually.

So... not today. =|

[MAAS Lander (maas-lander)]

The attempt to merge lp:~mpontillo/maas/fix-1570606 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 [247 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 [866 kB]
Get:6 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe Sources [7,753 kB]
Get:7 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/main amd64 Packages [1,183 kB]
Get:8 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe amd64 Packages [7,538 kB]
Get:9 http://prodstack-zone-2.clouds.archive.ubuntu.com/ubuntu xenial/universe Translation-en [4,358 kB]
Fetched 21.9 MB in 3s (5,841 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
    --no-install-recommends install apache2 archdetect-deb authbind bash 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-all 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-dnspython python3-docutils python3-formencode python3-hivex python3-httplib2 python3-jinja2 python3-jsonschema python3-lxml python3-mock python3-netaddr python3-netifaces 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-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-2ubuntu2).
archdetect-deb is already the newest version (1.117ubuntu2).
authbind is already the newest version (2.1.1+nmu1).
bash is already the newest version (4.3-14ubuntu1).
bind9 is already the newest version (1:9.10.3.dfsg.P4-8).
bind9utils is already the newest version (1:9.10.3.dfsg.P4-8).
build-essential is already the newest version (12.1ubuntu2).
curl is already the newest version (7.47.0-1ubuntu2).
debhelper is already the newest version (9.20160115ubuntu3).
distro-info is already the newest version (0.14build1).
dnsutils is already the newest versi...

=== modified file '.idea/maas.iml'
--- .idea/maas.iml	2015-12-09 01:35:30 +0000
+++ .idea/maas.iml	2016-04-15 16:47:24 +0000
@@ -9,7 +9,7 @@
       <excludeFolder url="file://$MODULE_DIR$/local" />
       <excludeFolder url="file://$MODULE_DIR$/logs" />
     </content>
-    <orderEntry type="jdk" jdkName="Python 3.5.1rc1 (/usr/bin/python3.5)" jdkType="Python SDK" />
+    <orderEntry type="jdk" jdkName="Python 3.5.1+ (/usr/bin/python3.5)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TemplatesService">

=== modified file '.idea/misc.xml'
--- .idea/misc.xml	2015-12-09 01:35:30 +0000
+++ .idea/misc.xml	2016-04-15 16:47:24 +0000
@@ -10,5 +10,5 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.5.1rc1 (/usr/bin/python3.5)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.5.1+ (/usr/bin/python3.5)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file

=== modified file '.idea/modules.xml'
--- .idea/modules.xml	2015-05-14 04:40:12 +0000
+++ .idea/modules.xml	2016-04-15 16:47:24 +0000
@@ -5,4 +5,4 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/maas.iml" filepath="$PROJECT_DIR$/.idea/maas.iml" />
     </modules>
   </component>
-</project>
+</project>
\ No newline at end of file

=== modified file 'src/provisioningserver/utils/network.py'
--- src/provisioningserver/utils/network.py	2016-04-14 15:25:36 +0000
+++ src/provisioningserver/utils/network.py	2016-04-15 16:47:24 +0000
@@ -415,9 +415,10 @@
         unused_ranges = []
         if type(outer_range) == IPNetwork:
             # Skip the network address, if this is a network
-            if outer_range.version == 4 and outer_range.prefixlen == 32:
+            prefixlen = outer_range.prefixlen
+            if outer_range.version == 4 and prefixlen in (31, 32):
                 start = outer_range.first
-            elif outer_range.version == 6 and outer_range.prefixlen == 128:
+            elif outer_range.version == 6 and prefixlen in (127, 128):
                 start = outer_range.first
             else:
                 start = outer_range.first + 1
@@ -438,7 +439,8 @@
             candidate_start = used_range.last + 1
         # Skip the broadcast address, if this is an IPv4 network
         if type(outer_range) == IPNetwork:
-            if outer_range.version == 4 and outer_range.prefixlen != 32:
+            prefixlen = outer_range.prefixlen
+            if outer_range.version == 4 and prefixlen not in (31, 32):
                 candidate_end = outer_range.last - 1
             else:
                 candidate_end = outer_range.last
@@ -453,7 +455,16 @@
 
     def get_full_range(self, outer_range):
         unused_ranges = self.get_unused_ranges(outer_range)
-        return MAASIPSet(self | unused_ranges, cidr=outer_range)
+        full_range = MAASIPSet(self | unused_ranges, cidr=outer_range)
+        # The full_range should always contain at least one IP address.
+        # However, in bug #1570606 we observed a situation where there were
+        # no resulting ranges. This assert is just in case the fix didn't cover
+        # all cases where this could happen.
+        assert len(full_range.ranges) > 0, (
+            "get_full_range(): No ranges for CIDR: %s; "
+            "self=%r, unused_ranges=%r" % (
+                outer_range, self, unused_ranges))
+        return full_range
 
     def __repr__(self):
         item_repr = []

=== modified file 'src/provisioningserver/utils/tests/test_network.py'
--- src/provisioningserver/utils/tests/test_network.py	2016-04-14 15:25:36 +0000
+++ src/provisioningserver/utils/tests/test_network.py	2016-04-15 16:47:24 +0000
@@ -789,6 +789,32 @@
         self.assertThat(json['available_string'], Equals("100%"))
         self.assertThat(json, Not(Contains("ranges")))
 
+    def test__statistics_are_accurate_for_empty_slash_127(self):
+        s = MAASIPSet([])
+        u = s.get_full_range('2001:db8::1/127')
+        stats = IPRangeStatistics(u)
+        json = stats.render_json()
+        self.assertThat(json['num_available'], Equals(2))
+        self.assertThat(json['largest_available'], Equals(2))
+        self.assertThat(json['num_unavailable'], Equals(0))
+        self.assertThat(json['usage'], Equals(float(0) / float(2)))
+        self.assertThat(json['usage_string'], Equals("0%"))
+        self.assertThat(json['available_string'], Equals("100%"))
+        self.assertThat(json, Not(Contains("ranges")))
+
+    def test__statistics_are_accurate_for_empty_slash_31(self):
+        s = MAASIPSet([])
+        u = s.get_full_range('10.0.0.0/31')
+        stats = IPRangeStatistics(u)
+        json = stats.render_json()
+        self.assertThat(json['num_available'], Equals(2))
+        self.assertThat(json['largest_available'], Equals(2))
+        self.assertThat(json['num_unavailable'], Equals(0))
+        self.assertThat(json['usage'], Equals(float(0) / float(2)))
+        self.assertThat(json['usage_string'], Equals("0%"))
+        self.assertThat(json['available_string'], Equals("100%"))
+        self.assertThat(json, Not(Contains("ranges")))
+
     def test__suggests_subnet_anycast_address_for_ipv6(self):
         s = MAASIPSet([])
         u = s.get_full_range('2001:db8::/64')