Merge ~vtapia/maas:lp1894116-29 into maas:2.9

[Victor Tapia]

Set PORTS_ARCHES instead of MAIN_ARCHES as default for the ports archive (LP:#1894116)

The default arches for all package repositories are i386 and amd64 (MAIN_ARCHES). This commit changes the default arches for the ports package repository, so when the form is cleared, it pulls the correct arches (PORTS_ARCHES).

Backport of f75199f7e in master

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1894116-29 lp:~vtapia/maas/+git/maas into -b 2.9 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 33a75ad73c3a4e1597e332d311091fdead1ee4fd

review: Approve

[Adam Collard (adam-collard)]

review: Approve

diff --git a/src/maasserver/forms/packagerepository.py b/src/maasserver/forms/packagerepository.py
index 4b62214..87b4856 100644
--- a/src/maasserver/forms/packagerepository.py
+++ b/src/maasserver/forms/packagerepository.py
@@ -102,9 +102,13 @@ class PackageRepositoryForm(MAASModelForm):
                     "'%s' is not a valid architecture. Known architectures: "
                     "%s" % (value, ", ".join(sorted(known_arches)))
                 )
-        # If no arches provided, use MAIN_ARCHES.
+        # If no arches provided, use PORTS_ARCHES for the ports archive,
+        # MAIN_ARCHES as default fallback.
         if len(arches) == 0:
-            arches = PackageRepository.MAIN_ARCHES
+            if self.cleaned_data.get("name") == "ports_archive":
+                arches = PackageRepository.PORTS_ARCHES
+            else:
+                arches = PackageRepository.MAIN_ARCHES
         return arches
 
     def clean_distributions(self):
diff --git a/src/maasserver/forms/tests/test_packagerepository.py b/src/maasserver/forms/tests/test_packagerepository.py
index 1898d89..d6696c2 100644
--- a/src/maasserver/forms/tests/test_packagerepository.py
+++ b/src/maasserver/forms/tests/test_packagerepository.py
@@ -191,6 +191,22 @@ class TestPackageRepositoryForm(MAASServerTestCase):
             package_repository.arches, PackageRepository.MAIN_ARCHES
         )
 
+    def test_default_ports_package_repository_arches(self):
+        package_repository = PackageRepository.objects.get(
+            name="ports_archive"
+        )
+        form = PackageRepositoryForm(
+            instance=package_repository, data={"arches": []}
+        )
+        self.assertTrue(form.is_valid(), form.errors)
+        request = HttpRequest()
+        request.user = factory.make_User()
+        endpoint = factory.pick_choice(ENDPOINT_CHOICES)
+        package_repository = form.save(endpoint, request)
+        self.assertItemsEqual(
+            package_repository.arches, PackageRepository.PORTS_ARCHES
+        )
+
     def test_arches_validation(self):
         package_repository = factory.make_PackageRepository()
         form = PackageRepositoryForm(