Merge lp:~rvb/maas/none-interf into lp:~maas-committers/maas/trunk

[Raphaël Badin]

Use empty strings instead of 'None' when generating random ngi parameters.

[Graham Binns (gmb)]

review: Approve

[Julian Edwards (julian-edwards)]

On 03/07/14 19:54, Raphaël Badin wrote:
> Commit message:
> Use empty strings instead of 'None' when generating random ngi parameters.

The commit message should really say why it needs to do this.

Anyway, why does it need to do this?

=== modified file 'src/maasserver/tests/test_api.py'
--- src/maasserver/tests/test_api.py	2014-07-02 07:05:24 +0000
+++ src/maasserver/tests/test_api.py	2014-07-03 09:53:34 +0000
@@ -536,7 +536,12 @@
             reverse('nodegroupinterfaces_handler', args=[nodegroup.uuid]),
             query_data)
         self.assertEqual(httplib.OK, response.status_code, response.content)
-        expected_result = interface_settings
+        # Replace empty strings with None as empty strings are converted into
+        # None for fields with null=True.
+        expected_result = {
+            key: (value if value != '' else None)
+            for key, value in interface_settings.items()
+        }
         new_interface = NodeGroupInterface.objects.get(
             nodegroup=nodegroup, interface=interface_settings['interface'])
         self.assertThat(

=== modified file 'src/maasserver/tests/test_forms.py'
--- src/maasserver/tests/test_forms.py	2014-07-02 14:55:46 +0000
+++ src/maasserver/tests/test_forms.py	2014-07-03 09:53:34 +0000
@@ -1128,8 +1128,8 @@
         static_high = unicode(IPAddress(static_range.last))
     else:
         dynamic_range = managed_ip_range
-        static_low = None
-        static_high = None
+        static_low = ''
+        static_high = ''
     return {
         'ip': factory.getRandomIPInNetwork(network),
         'interface': factory.make_name('interface'),