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

[Blake Rouse]

Call create_services_for before calling update_rackd_service in the services triggers.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

=== modified file 'src/maasserver/models/signals/services.py'
--- src/maasserver/models/signals/services.py	2016-03-09 16:24:22 +0000
+++ src/maasserver/models/signals/services.py	2016-03-12 02:34:24 +0000
@@ -14,6 +14,7 @@
 from maasserver.models.node import RackController
 from maasserver.models.regioncontrollerprocess import RegionControllerProcess
 from maasserver.models.regionrackrpcconnection import RegionRackRPCConnection
+from maasserver.models.service import Service
 from maasserver.utils.signals import SignalsManager
 
 
@@ -24,6 +25,7 @@
     """Update status of the rackd service for the rack controller the
     RPC connection was added or removed.
     """
+    Service.objects.create_services_for(instance.rack_controller)
     instance.rack_controller.update_rackd_status()
 
 
@@ -41,6 +43,7 @@
     added or removed.
     """
     for rack_controller in RackController.objects.all():
+        Service.objects.create_services_for(rack_controller)
         rack_controller.update_rackd_status()
 
 

=== modified file 'src/maasserver/models/signals/tests/test_services.py'
--- src/maasserver/models/signals/tests/test_services.py	2016-03-09 16:24:22 +0000
+++ src/maasserver/models/signals/tests/test_services.py	2016-03-12 02:34:24 +0000
@@ -8,6 +8,7 @@
 from maasserver.models import (
     RackController,
     RegionRackRPCConnection,
+    Service,
 )
 from maasserver.testing.factory import factory
 from maasserver.testing.testcase import MAASServerTestCase
@@ -20,6 +21,14 @@
 
 class TestRegionRackRPCConnection(MAASServerTestCase):
 
+    def test__calls_create_services_for_on_create(self):
+        endpoint = factory.make_RegionControllerProcessEndpoint()
+        rack_controller = factory.make_RackController()
+        mock_create_for = self.patch(Service.objects, "create_services_for")
+        RegionRackRPCConnection.objects.create(
+            endpoint=endpoint, rack_controller=rack_controller)
+        self.assertThat(mock_create_for, MockCalledOnceWith(rack_controller))
+
     def test__calls_update_rackd_status_on_create(self):
         endpoint = factory.make_RegionControllerProcessEndpoint()
         rack_controller = factory.make_RackController()
@@ -29,6 +38,17 @@
             endpoint=endpoint, rack_controller=rack_controller)
         self.assertThat(mock_update_rackd_status, MockCalledOnceWith())
 
+    def test__calls_create_services_for_on_update(self):
+        endpoint = factory.make_RegionControllerProcessEndpoint()
+        rack_controller = factory.make_RackController()
+        mock_create_for = self.patch(Service.objects, "create_services_for")
+        connection = RegionRackRPCConnection.objects.create(
+            endpoint=endpoint, rack_controller=rack_controller)
+        connection.save()
+        self.assertThat(
+            mock_create_for,
+            MockCallsMatch(call(rack_controller), call(rack_controller)))
+
     def test__calls_update_rackd_status_on_update(self):
         endpoint = factory.make_RegionControllerProcessEndpoint()
         rack_controller = factory.make_RackController()
@@ -40,6 +60,17 @@
         self.assertThat(
             mock_update_rackd_status, MockCallsMatch(call(), call()))
 
+    def test__calls_create_services_for_on_delete(self):
+        endpoint = factory.make_RegionControllerProcessEndpoint()
+        rack_controller = factory.make_RackController()
+        mock_create_for = self.patch(Service.objects, "create_services_for")
+        connection = RegionRackRPCConnection.objects.create(
+            endpoint=endpoint, rack_controller=rack_controller)
+        connection.delete()
+        self.assertThat(
+            mock_create_for,
+            MockCallsMatch(call(rack_controller), call(rack_controller)))
+
     def test__calls_update_rackd_status_on_delete(self):
         endpoint = factory.make_RegionControllerProcessEndpoint()
         rack_controller = factory.make_RackController()
@@ -54,6 +85,16 @@
 
 class TestRegionControllerProcess(MAASServerTestCase):
 
+    def test__calls_create_services_for_on_all_racks_on_create(self):
+        rack_controllers = [
+            factory.make_RackController()
+            for _ in range(3)
+        ]
+        mock_create_for = self.patch(Service.objects, "create_services_for")
+        factory.make_RegionControllerProcess()
+        self.assertEquals(
+            len(rack_controllers) + 1, mock_create_for.call_count)
+
     def test__calls_update_rackd_status_on_all_racks_on_create(self):
         rack_controllers = [
             factory.make_RackController()
@@ -65,14 +106,25 @@
         self.assertEquals(
             len(rack_controllers), mock_update_rackd_status.call_count)
 
+    def test__calls_create_services_for_on_all_racks_on_delete(self):
+        rack_controllers = [
+            factory.make_RackController()
+            for _ in range(3)
+        ]
+        process = factory.make_RegionControllerProcess()
+        mock_create_for = self.patch(Service.objects, "create_services_for")
+        process.delete()
+        self.assertEquals(
+            len(rack_controllers), mock_create_for.call_count)
+
     def test__calls_update_rackd_status_on_all_racks_on_delete(self):
         rack_controllers = [
             factory.make_RackController()
             for _ in range(3)
         ]
+        process = factory.make_RegionControllerProcess()
         mock_update_rackd_status = self.patch(
             RackController, "update_rackd_status")
-        process = factory.make_RegionControllerProcess()
         process.delete()
         self.assertEquals(
-            len(rack_controllers) * 2, mock_update_rackd_status.call_count)
+            len(rack_controllers), mock_update_rackd_status.call_count)