Merge lp:~allenap/maas/remove-get-active-peer-addresses into lp:~maas-committers/maas/trunk

[Gavin Panella]

Remove Node.get_active_peer_addresses; it's unused.

Quick one, before I forget.

[Mike Pontillo (mpontillo)]

Looks good; thanks for the cleanup.

review: Approve

[Gavin Panella (allenap)]

Ta!

=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2016-09-23 21:34:51 +0000
+++ src/maasserver/models/node.py	2016-09-29 08:12:48 +0000
@@ -18,16 +18,11 @@
 )
 from datetime import timedelta
 from functools import partial
-from itertools import groupby
-from operator import (
-    attrgetter,
-    itemgetter,
-)
+from operator import attrgetter
 import random
 import re
 import socket
 from socket import gethostname
-from textwrap import dedent
 from urllib.parse import urlparse
 
 from crochet import TimeoutError
@@ -761,31 +756,6 @@
         """
         return self.create(owner=get_worker_user(), hostname=gethostname())
 
-    _sql_active_peers = dedent("""\
-    SELECT rcp.region_id, rcpe.address
-      FROM maasserver_regioncontrollerprocessendpoint AS rcpe
-      JOIN maasserver_regioncontrollerprocess AS rcp
-        ON rcpe.process_id = rcp.id
-      JOIN maasserver_node AS rc
-        ON rcp.region_id = rc.id
-     WHERE rc.system_id != %s
-     ORDER BY rcp.region_id
-    """)
-
-    def get_active_peer_addresses(self):
-        """Return addresses of peer region controllers.
-
-        Excludes addresses belonging to the host on which this function is
-        called.
-
-        :return: An immutable set of sets of peer IP addresses.
-        """
-        with connection.cursor() as cursor:
-            cursor.execute(self._sql_active_peers, [get_maas_id()])
-            return frozenset(
-                frozenset(address for _, address in addresses)
-                for _, addresses in groupby(cursor, itemgetter(0)))
-
 
 def get_default_domain():
     """Get the default domain name."""

=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2016-09-23 21:34:51 +0000
+++ src/maasserver/models/tests/test_node.py	2016-09-29 08:12:48 +0000
@@ -543,53 +543,6 @@
             RegionController.DoesNotExist,
             RegionController.objects.get_running_controller)
 
-    def make_endpoints(self, region):
-        process = factory.make_RegionControllerProcess(region)
-        return [
-            factory.make_RegionControllerProcessEndpoint(process)
-            for _ in range(3)
-        ]
-
-    def set_maas_id(self):
-        maas_id_fixture = MAASIDFixture(factory.make_name("maas-id"))
-        return self.useFixture(maas_id_fixture).system_id
-
-    def test_get_active_peer_addresses_returns_frozenset_of_frozensets(self):
-        self.set_maas_id()
-
-        # Populate the database with example peers.
-        region_one = factory.make_RegionController()
-        region_two = factory.make_RegionController()
-        endpoints_one = self.make_endpoints(region_one)
-        endpoints_two = self.make_endpoints(region_two)
-
-        observed = RegionController.objects.get_active_peer_addresses()
-        expected = frozenset({
-            frozenset(endpoint.address for endpoint in endpoints_one),
-            frozenset(endpoint.address for endpoint in endpoints_two),
-        })
-
-        self.assertThat(observed, IsInstance(frozenset))
-        self.assertThat(observed, Equals(expected))
-
-    def test_get_active_peer_addresses_excludes_this_host(self):
-        # Populate the database with example peers.
-        region_this = factory.make_RegionController()
-        endpoints_this = self.make_endpoints(region_this)  # noqa
-        region_other = factory.make_RegionController()
-        endpoints_other = self.make_endpoints(region_other)
-
-        region_this.system_id = self.set_maas_id()
-        region_this.save()
-
-        observed = RegionController.objects.get_active_peer_addresses()
-        expected = frozenset({
-            frozenset(endpoint.address for endpoint in endpoints_other)
-        })
-
-        self.assertThat(observed, IsInstance(frozenset))
-        self.assertThat(observed, Equals(expected))
-
 
 class TestRegionControllerManagerGetOrCreateRunningController(
         MAASServerTestCase):