Merge lp:~blake-rouse/maas/fix-1524482 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Fix writing DHCP configuration so that it is encoded into a byte string before calling sudo_write_file.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

=== modified file 'src/provisioningserver/rpc/dhcp.py'
--- src/provisioningserver/rpc/dhcp.py	2015-12-09 19:53:51 +0000
+++ src/provisioningserver/rpc/dhcp.py	2015-12-10 00:35:47 +0000
@@ -84,8 +84,10 @@
         interfaces = {subnet['interface'] for subnet in subnet_configs}
         interfaces_config = ' '.join(sorted(interfaces))
         try:
-            sudo_write_file(server.config_filename, dhcpd_config)
-            sudo_write_file(server.interfaces_filename, interfaces_config)
+            sudo_write_file(
+                server.config_filename, dhcpd_config.encode("utf-8"))
+            sudo_write_file(
+                server.interfaces_filename, interfaces_config.encode("utf-8"))
         except ExternalProcessError as e:
             # ExternalProcessError.__str__ contains a generic failure message
             # as well as the command and its error output. On the other hand,

=== modified file 'src/provisioningserver/rpc/tests/test_dhcp.py'
--- src/provisioningserver/rpc/tests/test_dhcp.py	2015-12-09 21:00:58 +0000
+++ src/provisioningserver/rpc/tests/test_dhcp.py	2015-12-10 00:35:47 +0000
@@ -76,11 +76,13 @@
         self.patch_restart_service()
         subnets = [make_subnet_config() for _ in range(3)]
         self.configure(factory.make_name('key'), subnets)
+        interfaces = ' '.join(
+            sorted(subnet['interface'] for subnet in subnets))
         self.assertThat(
             write_file,
             MockCalledWith(
                 ANY,
-                ' '.join(sorted(subnet['interface'] for subnet in subnets))))
+                interfaces.encode("utf-8")))
 
     def test__eliminates_duplicate_interfaces(self):
         write_file = self.patch_sudo_write_file()
@@ -90,7 +92,8 @@
         for subnet in subnets:
             subnet['interface'] = interface
         self.configure(factory.make_name('key'), subnets)
-        self.assertThat(write_file, MockCalledWith(ANY, interface))
+        self.assertThat(
+            write_file, MockCalledWith(ANY, interface.encode("utf-8")))
 
     def test__composes_dhcp_config(self):
         self.patch_sudo_write_file()
@@ -117,7 +120,8 @@
 
         self.assertThat(
             write_file,
-            MockAnyCall(self.server.config_filename, expected_config))
+            MockAnyCall(
+                self.server.config_filename, expected_config.encode("utf-8")))
 
     def test__writes_interfaces_file(self):
         write_file = self.patch_sudo_write_file()