Merge ~ltrager/maas:remove_get_boot_sources_v1 into maas:master

[Lee Trager]

Remove the GetBootSources V1 RPC call.

[Björn Tillenius (bjornt)]

+1

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b remove_get_boot_sources_v1 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 4fd1831ecd69b9b74c0c6f76ca2f39ba6fb960d9

review: Approve

diff --git a/src/maasserver/rpc/regionservice.py b/src/maasserver/rpc/regionservice.py
index 1ec0997..950b8d3 100644
--- a/src/maasserver/rpc/regionservice.py
+++ b/src/maasserver/rpc/regionservice.py
@@ -1,4 +1,4 @@
-# Copyright 2014-2018 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """RPC implementation for regions."""
@@ -207,19 +207,6 @@ class Region(RPCProtocol):
 
     @region.GetBootSources.responder
     def get_boot_sources(self, uuid):
-        """get_boot_sources()
-
-        Deprecated: get_boot_sources_v2() should be used instead.
-
-        Implementation of
-        :py:class:`~provisioningserver.rpc.region.GetBootSources`.
-        """
-        d = deferToDatabase(get_simplestream_endpoint)
-        d.addCallback(lambda source: {"sources": [source]})
-        return d
-
-    @region.GetBootSourcesV2.responder
-    def get_boot_sources_v2(self, uuid):
         """get_boot_sources_v2()
 
         Implementation of
diff --git a/src/maasserver/rpc/tests/test_regionservice_calls.py b/src/maasserver/rpc/tests/test_regionservice_calls.py
index 2949f9e..604b168 100644
--- a/src/maasserver/rpc/tests/test_regionservice_calls.py
+++ b/src/maasserver/rpc/tests/test_regionservice_calls.py
@@ -56,7 +56,6 @@ from provisioningserver.rpc.region import (
     GetArchiveMirrors,
     GetBootConfig,
     GetBootSources,
-    GetBootSourcesV2,
     GetControllerType,
     GetDNSConfiguration,
     GetProxies,
@@ -341,26 +340,6 @@ class TestRegionProtocol_GetBootSources(MAASTransactionServerTestCase):
         return d.addCallback(check)
 
 
-class TestRegionProtocol_GetBootSourcesV2(MAASTransactionServerTestCase):
-    def test_get_boot_sources_v2_is_registered(self):
-        protocol = Region()
-        responder = protocol.locateResponder(GetBootSourcesV2.commandName)
-        self.assertIsNotNone(responder)
-
-    @wait_for_reactor
-    def test_get_boot_sources_v2_returns_simplestreams_endpoint(self):
-        uuid = factory.make_name("uuid")
-
-        d = call_responder(Region(), GetBootSourcesV2, {"uuid": uuid})
-
-        def check(response):
-            self.assertEqual(
-                {"sources": [get_simplestream_endpoint()]}, response
-            )
-
-        return d.addCallback(check)
-
-
 class TestRegionProtocol_GetArchiveMirrors(MAASTransactionServerTestCase):
     def test_get_archive_mirrors_is_registered(self):
         protocol = Region()
diff --git a/src/provisioningserver/rackdservices/image_download_service.py b/src/provisioningserver/rackdservices/image_download_service.py
index a86e879..87e8fb1 100644
--- a/src/provisioningserver/rackdservices/image_download_service.py
+++ b/src/provisioningserver/rackdservices/image_download_service.py
@@ -1,4 +1,4 @@
-# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Service to periodically refresh the boot images."""
@@ -7,18 +7,13 @@
 from datetime import timedelta
 
 from twisted.application.internet import TimerService
-from twisted.internet.defer import inlineCallbacks, returnValue
-from twisted.protocols.amp import UnhandledCommand
+from twisted.internet.defer import inlineCallbacks
 
 from provisioningserver.boot import tftppath
 from provisioningserver.logger import get_maas_logger, LegacyLogger
 from provisioningserver.rpc.boot_images import import_boot_images
 from provisioningserver.rpc.exceptions import NoConnectionsAvailable
-from provisioningserver.rpc.region import (
-    GetBootSources,
-    GetBootSourcesV2,
-    GetProxies,
-)
+from provisioningserver.rpc.region import GetBootSources, GetProxies
 from provisioningserver.utils.twisted import pause, retries
 
 maaslog = get_maas_logger("boot_image_download_service")
@@ -58,22 +53,6 @@ class ImageDownloadService(TimerService):
         return self.maybe_start_download().addErrback(download_failure)
 
     @inlineCallbacks
-    def _get_boot_sources(self, client):
-        """Gets the boot sources from the region."""
-        try:
-            sources = yield client(GetBootSourcesV2, uuid=client.localIdent)
-        except UnhandledCommand:
-            # Region has not been upgraded to support the new call, use the
-            # old call. The old call did not provide the new os selection
-            # parameter. Region does not support boot source selection by os,
-            # so its set too allow all operating systems.
-            sources = yield client(GetBootSources, uuid=client.localIdent)
-            for source in sources["sources"]:
-                for selection in source["selections"]:
-                    selection["os"] = "*"
-        returnValue(sources)
-
-    @inlineCallbacks
     def _start_download(self):
         client = None
         # Retry a few times, since this service usually comes up before
@@ -91,7 +70,7 @@ class ImageDownloadService(TimerService):
             return
 
         # Get sources from region
-        sources = yield self._get_boot_sources(client)
+        sources = yield client(GetBootSources, uuid=client.localIdent)
         # Get http proxy from region
         proxies = yield client(GetProxies)
 
diff --git a/src/provisioningserver/rackdservices/tests/test_image_download_service.py b/src/provisioningserver/rackdservices/tests/test_image_download_service.py
index e4e2462..63254a1 100644
--- a/src/provisioningserver/rackdservices/tests/test_image_download_service.py
+++ b/src/provisioningserver/rackdservices/tests/test_image_download_service.py
@@ -1,24 +1,22 @@
-# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for provisioningserver.rackdservices.image_download_service"""
 
 
 from datetime import timedelta
-from unittest.mock import call, Mock, sentinel
+from unittest.mock import Mock, sentinel
 from urllib.parse import urlparse
 
 from fixtures import FakeLogger
 from twisted.application.internet import TimerService
 from twisted.internet import defer
 from twisted.internet.task import Clock
-from twisted.protocols.amp import UnhandledCommand
 
 from maastesting.factory import factory
 from maastesting.matchers import (
     get_mock_calls,
     MockCalledOnceWith,
-    MockCallsMatch,
     MockNotCalled,
 )
 from maastesting.testcase import MAASTestCase, MAASTwistedRunTest
@@ -30,7 +28,6 @@ from provisioningserver.rackdservices.image_download_service import (
 from provisioningserver.rpc import boot_images
 from provisioningserver.rpc.boot_images import _run_import
 from provisioningserver.rpc.exceptions import NoConnectionsAvailable
-from provisioningserver.rpc.region import GetBootSources, GetBootSourcesV2
 
 
 class TestPeriodicImageDownloadService(MAASTestCase):
@@ -196,83 +193,3 @@ class TestPeriodicImageDownloadService(MAASTestCase):
             """,
             logger.output,
         )
-
-
-class TestGetBootSources(MAASTestCase):
-
-    run_tests_with = MAASTwistedRunTest.make_factory(timeout=5)
-
-    @defer.inlineCallbacks
-    def test_get_boot_sources_calls_get_boot_sources_v2_before_v1(self):
-        clock = Clock()
-        client_call = Mock()
-        client_call.side_effect = [
-            defer.succeed(dict(sources=sentinel.sources))
-        ]
-        client_call.localIdent = factory.make_UUID()
-
-        service = ImageDownloadService(sentinel.rpc, sentinel.tftp_root, clock)
-        sources = yield service._get_boot_sources(client_call)
-        self.assertEqual(sources.get("sources"), sentinel.sources)
-        self.assertThat(
-            client_call,
-            MockCalledOnceWith(GetBootSourcesV2, uuid=client_call.localIdent),
-        )
-
-    @defer.inlineCallbacks
-    def test_get_boot_sources_calls_get_boot_sources_v1_on_v2_missing(self):
-        clock = Clock()
-        client_call = Mock()
-        client_call.side_effect = [
-            defer.fail(UnhandledCommand()),
-            defer.succeed(dict(sources=[])),
-        ]
-        client_call.localIdent = factory.make_UUID()
-
-        service = ImageDownloadService(sentinel.rpc, sentinel.tftp_root, clock)
-        yield service._get_boot_sources(client_call)
-        self.assertThat(
-            client_call,
-            MockCallsMatch(
-                call(GetBootSourcesV2, uuid=client_call.localIdent),
-                call(GetBootSources, uuid=client_call.localIdent),
-            ),
-        )
-
-    @defer.inlineCallbacks
-    def test_get_boot_sources_v1_sets_os_to_wildcard(self):
-        sources = [
-            {
-                "path": factory.make_url(),
-                "selections": [
-                    {
-                        "release": "trusty",
-                        "arches": ["amd64"],
-                        "subarches": ["generic"],
-                        "labels": ["release"],
-                    },
-                    {
-                        "release": "precise",
-                        "arches": ["amd64"],
-                        "subarches": ["generic"],
-                        "labels": ["release"],
-                    },
-                ],
-            }
-        ]
-
-        clock = Clock()
-        client_call = Mock()
-        client_call.side_effect = [
-            defer.fail(UnhandledCommand()),
-            defer.succeed(dict(sources=sources)),
-        ]
-
-        service = ImageDownloadService(sentinel.rpc, sentinel.tftp_root, clock)
-        sources = yield service._get_boot_sources(client_call)
-        os_selections = [
-            selection.get("os")
-            for source in sources["sources"]
-            for selection in source["selections"]
-        ]
-        self.assertEqual(["*", "*"], os_selections)
diff --git a/src/provisioningserver/rpc/region.py b/src/provisioningserver/rpc/region.py
index 6c1a741..990632a 100644
--- a/src/provisioningserver/rpc/region.py
+++ b/src/provisioningserver/rpc/region.py
@@ -1,4 +1,4 @@
-# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
+# Copyright 2014-2021 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """RPC declarations for the region.
@@ -13,7 +13,6 @@ __all__ = [
     "GetArchiveMirrors",
     "GetBootConfig",
     "GetBootSources",
-    "GetBootSourcesV2",
     "GetControllerType",
     "GetDiscoveryState",
     "GetDNSConfiguration",
@@ -162,42 +161,6 @@ class GetBootConfig(amp.Command):
 class GetBootSources(amp.Command):
     """Report boot sources and selections for the given cluster.
 
-    :since: 1.6
-    :deprecated: 1.7
-    """
-
-    arguments = [
-        # The cluster UUID.
-        (b"uuid", amp.Unicode())
-    ]
-    response = [
-        (
-            b"sources",
-            AmpList(
-                [
-                    (b"url", amp.Unicode()),
-                    (b"keyring_data", Bytes()),
-                    (
-                        b"selections",
-                        AmpList(
-                            [
-                                (b"release", amp.Unicode()),
-                                (b"arches", amp.ListOf(amp.Unicode())),
-                                (b"subarches", amp.ListOf(amp.Unicode())),
-                                (b"labels", amp.ListOf(amp.Unicode())),
-                            ]
-                        ),
-                    ),
-                ]
-            ),
-        )
-    ]
-    errors = []
-
-
-class GetBootSourcesV2(amp.Command):
-    """Report boot sources and selections for the given cluster.
-
     Includes the new os field for the selections.
 
     :since: 1.7