Merge lp:~mpontillo/maas/bug-1569984 into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Fix bug #1569984: don't try to render the JSON for a dynamic range if we don't have a suggestion for that.

[Andres Rodriguez (andreserl)]

lgtm! The question is why would we never have one!"?

review: Approve

[Mike Pontillo (mpontillo)]

There is no need to calculate the suggested range (or send it over the websocket) if a dynamic range already exists.

=== modified file 'src/provisioningserver/utils/network.py'
--- src/provisioningserver/utils/network.py	2016-04-13 01:15:25 +0000
+++ src/provisioningserver/utils/network.py	2016-04-13 17:29:37 +0000
@@ -293,9 +293,12 @@
             data["ranges"] = self.ranges.render_json()
         if include_suggestions:
             data["suggested_gateway"] = self.suggested_gateway
-            data["suggested_dynamic_range"] = (
-                self.suggested_dynamic_range.render_json()
-            )
+            suggested_dynamic_range = None
+            if self.suggested_dynamic_range is not None:
+                suggested_dynamic_range = (
+                    self.suggested_dynamic_range.render_json()
+                )
+            data["suggested_dynamic_range"] = suggested_dynamic_range
         return data
 
 

=== modified file 'src/provisioningserver/utils/tests/test_network.py'
--- src/provisioningserver/utils/tests/test_network.py	2016-04-13 01:15:25 +0000
+++ src/provisioningserver/utils/tests/test_network.py	2016-04-13 17:29:37 +0000
@@ -819,6 +819,15 @@
         stats = IPRangeStatistics(u)
         self.assertThat(stats.suggested_gateway, Is(None))
 
+    def test__suggests_no_dynamic_range_if_dynamic_range_exists(self):
+        s = MAASIPSet([
+            MAASIPRange(start="10.0.0.2", end="10.0.0.99", purpose="dynamic")])
+        u = s.get_full_range('10.0.0.0/24')
+        stats = IPRangeStatistics(u)
+        json = stats.render_json(include_suggestions=True)
+        self.assertThat(stats.suggested_dynamic_range, Is(None))
+        self.assertThat(json["suggested_dynamic_range"], Is(None))
+
     def test__suggests_upper_one_fourth_range_for_dynamic_by_default(self):
         s = MAASIPSet([])
         u = s.get_full_range('10.0.0.0/24')