Merge ~blake-rouse/maas:fix-1768575 into maas:master

[Blake Rouse]

LP: #1768575 - Disable the DHCP probing service for now. Being split into its own process in later branch.

[Mike Pontillo (mpontillo)]

Ship it!

review: Approve

diff --git a/src/provisioningserver/plugin.py b/src/provisioningserver/plugin.py
index 98c7e31..4f0a88a 100644
--- a/src/provisioningserver/plugin.py
+++ b/src/provisioningserver/plugin.py
@@ -183,7 +183,11 @@ class ProvisioningServiceMaker:
         # Other services that make up the MAAS Region Controller.
         yield self._makeRPCPingService(rpc_service, clock=clock)
         yield self._makeNetworksMonitoringService(rpc_service, clock=clock)
-        yield self._makeDHCPProbeService(rpc_service)
+        # XXX blake_r: #1768575 - DHCP probing service using `socket.bind`
+        # with authbind and uvloop causes `socket.bind` to block indefinitely.
+        # Disable the DHCP probing service until its moved to use its own
+        # subprocess.
+        # yield self._makeDHCPProbeService(rpc_service)
         yield self._makeLeaseSocketService(rpc_service)
         yield self._makeNodePowerMonitorService()
         yield self._makeServiceMonitorService(rpc_service)
diff --git a/src/provisioningserver/tests/test_plugin.py b/src/provisioningserver/tests/test_plugin.py
index a253ea8..130cdfc 100644
--- a/src/provisioningserver/tests/test_plugin.py
+++ b/src/provisioningserver/tests/test_plugin.py
@@ -22,9 +22,6 @@ from provisioningserver.plugin import (
     Options,
     ProvisioningServiceMaker,
 )
-from provisioningserver.rackdservices.dhcp_probe_service import (
-    DHCPProbeService,
-)
 from provisioningserver.rackdservices.image import BootImageEndpointService
 from provisioningserver.rackdservices.image_download_service import (
     ImageDownloadService,
@@ -108,7 +105,7 @@ class TestProvisioningServiceMaker(MAASTestCase):
         service = service_maker.makeService(options, clock=None)
         self.assertIsInstance(service, MultiService)
         expected_services = [
-            "dhcp_probe", "networks_monitor", "image_download",
+            "networks_monitor", "image_download",
             "lease_socket_service", "node_monitor", "ntp", "rpc", "rpc-ping",
             "tftp", "image_service", "service_monitor",
             ]
@@ -132,7 +129,7 @@ class TestProvisioningServiceMaker(MAASTestCase):
         service = service_maker.makeService(options, clock=None)
         self.assertIsInstance(service, MultiService)
         expected_services = [
-            "dhcp_probe", "networks_monitor", "image_download",
+            "networks_monitor", "image_download",
             "lease_socket_service", "node_monitor", "ntp", "rpc", "rpc-ping",
             "tftp", "image_service", "service_monitor",
             ]
@@ -191,12 +188,13 @@ class TestProvisioningServiceMaker(MAASTestCase):
         networks_monitor = service.getServiceNamed("networks_monitor")
         self.assertIsInstance(networks_monitor, RackNetworksMonitoringService)
 
-    def test_dhcp_probe_service(self):
-        options = Options()
-        service_maker = ProvisioningServiceMaker("Spike", "Milligan")
-        service = service_maker.makeService(options, clock=None)
-        dhcp_probe = service.getServiceNamed("dhcp_probe")
-        self.assertIsInstance(dhcp_probe, DHCPProbeService)
+    # XXX blake_r: #1768575 - Disabled DHCP probing service.
+    # def test_dhcp_probe_service(self):
+    #     options = Options()
+    #     service_maker = ProvisioningServiceMaker("Spike", "Milligan")
+    #     service = service_maker.makeService(options, clock=None)
+    #     dhcp_probe = service.getServiceNamed("dhcp_probe")
+    #     self.assertIsInstance(dhcp_probe, DHCPProbeService)
 
     def test_service_monitor_service(self):
         options = Options()