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

[Mike Pontillo]

Fix bug #1552719: Handle /32 and /128 IP ranges appropriately.

Drive-by fix to remove unused inefficiency field. (it has been removed from the new designs)

[Blake Rouse (blake-rouse)]

Looks good.

review: Approve

=== modified file 'src/provisioningserver/utils/network.py'
--- src/provisioningserver/utils/network.py	2016-03-07 23:20:52 +0000
+++ src/provisioningserver/utils/network.py	2016-03-11 08:43:04 +0000
@@ -191,8 +191,6 @@
             "usage": self.usage_percentage,
             "usage_string": self.usage_percentage_string,
             "available_string": self.available_percentage_string,
-            # XXX LJ 20151004: determine the right calculation, and do it.
-            "inefficiency_string": "TBD",
         }
         if include_ranges:
             data["ranges"] = self.ranges.render_json()
@@ -254,7 +252,12 @@
         unused_ranges = []
         if type(outer_range) == IPNetwork:
             # Skip the network address, if this is a network
-            start = outer_range.first + 1
+            if outer_range.version == 4 and outer_range.prefixlen == 32:
+                start = outer_range.first
+            elif outer_range.version == 6 and outer_range.prefixlen == 128:
+                start = outer_range.first
+            else:
+                start = outer_range.first + 1
         else:
             # Otherwise, assume the first address is the start of the range
             start = outer_range.first
@@ -271,8 +274,11 @@
                     make_iprange(candidate_start, candidate_end, comment))
             candidate_start = used_range.last + 1
         # Skip the broadcast address, if this is an IPv4 network
-        if type(outer_range) == IPNetwork and outer_range.version == 4:
-            candidate_end = outer_range.last - 1
+        if type(outer_range) == IPNetwork:
+            if outer_range.version == 4 and outer_range.prefixlen != 32:
+                candidate_end = outer_range.last - 1
+            else:
+                candidate_end = outer_range.last
         else:
             candidate_end = outer_range.last
         # Check if there is a gap between the last used range and the end

=== modified file 'src/provisioningserver/utils/tests/test_network.py'
--- src/provisioningserver/utils/tests/test_network.py	2016-03-08 18:50:36 +0000
+++ src/provisioningserver/utils/tests/test_network.py	2016-03-11 08:43:04 +0000
@@ -720,7 +720,6 @@
         self.assertThat(json['usage'], Equals(float(4) / float(254)))
         self.assertThat(json['usage_string'], Equals("2%"))
         self.assertThat(json['available_string'], Equals("98%"))
-        self.assertThat(json['inefficiency_string'], Equals("TBD"))
         self.assertThat(json, Not(Contains("ranges")))
 
     def test__statistics_are_accurate_and_ranges_are_returned_if_desired(self):
@@ -734,10 +733,61 @@
         self.assertThat(json['usage'], Equals(float(4) / float(254)))
         self.assertThat(json['usage_string'], Equals('2%'))
         self.assertThat(json['available_string'], Equals("98%"))
-        self.assertThat(json['inefficiency_string'], Equals("TBD"))
         self.assertThat(json, Contains('ranges'))
         self.assertThat(json['ranges'], Equals(stats.ranges.render_json()))
 
+    def test__statistics_are_accurate_for_full_slash_32(self):
+        s = MAASIPSet(['10.0.0.1'])
+        u = s.get_full_range('10.0.0.1/32')
+        stats = IPRangeStatistics(u)
+        json = stats.render_json()
+        self.assertThat(json['num_available'], Equals(0))
+        self.assertThat(json['largest_available'], Equals(0))
+        self.assertThat(json['num_unavailable'], Equals(1))
+        self.assertThat(json['usage'], Equals(float(1) / float(1)))
+        self.assertThat(json['usage_string'], Equals("100%"))
+        self.assertThat(json['available_string'], Equals("0%"))
+        self.assertThat(json, Not(Contains("ranges")))
+
+    def test__statistics_are_accurate_for_empty_slash_32(self):
+        s = MAASIPSet([])
+        u = s.get_full_range('10.0.0.1/32')
+        stats = IPRangeStatistics(u)
+        json = stats.render_json()
+        self.assertThat(json['num_available'], Equals(1))
+        self.assertThat(json['largest_available'], Equals(1))
+        self.assertThat(json['num_unavailable'], Equals(0))
+        self.assertThat(json['usage'], Equals(float(0) / float(1)))
+        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_full_slash_128(self):
+        s = MAASIPSet(['2001:db8::1'])
+        u = s.get_full_range('2001:db8::1/128')
+        stats = IPRangeStatistics(u)
+        json = stats.render_json()
+        self.assertThat(json['num_available'], Equals(0))
+        self.assertThat(json['largest_available'], Equals(0))
+        self.assertThat(json['num_unavailable'], Equals(1))
+        self.assertThat(json['usage'], Equals(float(1) / float(1)))
+        self.assertThat(json['usage_string'], Equals("100%"))
+        self.assertThat(json['available_string'], Equals("0%"))
+        self.assertThat(json, Not(Contains("ranges")))
+
+    def test__statistics_are_accurate_for_empty_slash_128(self):
+        s = MAASIPSet([])
+        u = s.get_full_range('2001:db8::1/128')
+        stats = IPRangeStatistics(u)
+        json = stats.render_json()
+        self.assertThat(json['num_available'], Equals(1))
+        self.assertThat(json['largest_available'], Equals(1))
+        self.assertThat(json['num_unavailable'], Equals(0))
+        self.assertThat(json['usage'], Equals(float(0) / float(1)))
+        self.assertThat(json['usage_string'], Equals("0%"))
+        self.assertThat(json['available_string'], Equals("100%"))
+        self.assertThat(json, Not(Contains("ranges")))
+
 
 class TestParseInteger(MAASTestCase):