Merge ~troyanov/maas:backport-7a8e0f3-3.4 into maas:3.4

[Anton Troyanov]

handle additional return value in registerConnection

Resolves LP:2033505

(cherry picked from commit 7a8e0f3c47b58e8e0adeb7c55cd3a99b4c448ab5)

[Anton Troyanov (troyanov)]

Self-approve

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b backport-7a8e0f3-3.4 lp:~troyanov/maas/+git/maas into -b 3.4 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: d3f414b473081586d105761dc466813e307f4b2f

review: Approve

diff --git a/src/maasserver/ipc.py b/src/maasserver/ipc.py
index 6423416..0f41a47 100644
--- a/src/maasserver/ipc.py
+++ b/src/maasserver/ipc.py
@@ -515,7 +515,7 @@ class IPCMasterService(service.Service):
                 ).values_list("id", flat=True)
             )
             for _, (ident, host, port) in connections.items():
-                db_conn = self._registerConnection(
+                db_conn, _ = self._registerConnection(
                     process, ident, host, port, force_save=False
                 )
                 previous_connection_ids.discard(db_conn.id)
diff --git a/src/maasserver/tests/test_ipc.py b/src/maasserver/tests/test_ipc.py
index f60a147..19344fd 100644
--- a/src/maasserver/tests/test_ipc.py
+++ b/src/maasserver/tests/test_ipc.py
@@ -630,3 +630,43 @@ class TestIPCCommunication(MAASTransactionServerTestCase):
         )
 
         yield master.stopService()
+
+    @wait_for_reactor
+    @inlineCallbacks
+    def test_updateConnections(self):
+        yield deferToDatabase(load_builtin_scripts)
+        master = self.make_IPCMasterService()
+        yield master.startService()
+
+        pid = random.randint(1, 512)
+        port = random.randint(1, 512)
+        ip = factory.make_ip_address()
+        yield master.registerWorker(pid, MagicMock())
+        yield master.registerWorkerRPC(pid, port)
+
+        rack_controller = yield deferToDatabase(factory.make_RackController)
+
+        for _ in range(2):
+            yield master.registerWorkerRPCConnection(
+                pid,
+                random.randint(1, 512),
+                rack_controller.system_id,
+                ip,
+                random.randint(1, 512),
+            )
+
+        for pid, conn in master.connections.items():
+            process = yield deferToDatabase(master._getProcessObjFor, pid)
+            rpc_conns = conn["rpc"]["connections"].copy()
+            rpc_conns.pop(random.choice(list(rpc_conns.keys())))
+            yield deferToDatabase(
+                master._updateConnections, process, rpc_conns
+            )
+
+        def _get_conn_count():
+            return RegionRackRPCConnection.objects.filter(
+                rack_controller=rack_controller
+            ).count()
+
+        count = yield deferToDatabase(_get_conn_count)
+        self.assertEqual(count, 1)