Merge lp:~andreserl/maas/lp1664248_webui into lp:~maas-committers/maas/trunk

[Andres Rodriguez]

=== modified file 'src/maasserver/api/packagerepositories.py'
--- src/maasserver/api/packagerepositories.py	2017-02-17 14:23:04 +0000
+++ src/maasserver/api/packagerepositories.py	2017-03-16 22:02:44 +0000
@@ -22,6 +22,7 @@
     'url',
     'distributions',
     'disabled_pockets',
+    'disabled_components',
     'components',
     'arches',
     'key',
@@ -70,7 +71,11 @@
 
         :param disabled_pockets: The list of pockets to disable.
 
-        :param components: The list of components to enable.
+        :param disabled_components: The list of components to disable. Only
+            applicable to the default Ubuntu repositories.
+
+        :param components: The list of components to enable. Only applicable
+            to custom repositories.
 
         :param arches: The list of supported architectures.
 
@@ -129,7 +134,11 @@
 
         :param disabled_pockets: The list of pockets to disable.
 
-        :param components: The list of components to enable.
+        :param disabled_components: The list of components to disable. Only
+            applicable to the default Ubuntu repositories.
+
+        :param components: The list of components to enable. Only applicable
+            to custom repositories.
 
         :param arches: The list of supported architectures.
 
 
=== modified file 'src/maasserver/api/tests/test_packagerepositories.py'
--- src/maasserver/api/tests/test_packagerepositories.py	2017-01-28 00:51:47 +0000
+++ src/maasserver/api/tests/test_packagerepositories.py	2017-03-16 22:02:44 +0000
@@ -72,27 +72,142 @@
         self.assertEqual(
             http.client.NOT_FOUND, response.status_code, response.content)
 
-    def test_update(self):
-        self.become_admin()
-        package_repository = factory.make_PackageRepository()
-        new_values = {
-            'url': factory.make_url(scheme='http'),
-            'distributions': [
-                factory.make_name("distribution%d" % i) for i in range(3)],
-            'disabled_pockets': [
-                factory.make_name("disabled_pocket%d" % i) for i in range(1)],
-            'components': [factory.make_name("comp%d" % i) for i in range(4)],
-            'arches': [
-                random.choice(PackageRepository.KNOWN_ARCHES),
-                random.choice(PackageRepository.KNOWN_ARCHES),
-            ]
-        }
-        response = self.client.put(
-            self.get_package_repository_uri(package_repository), new_values)
-        self.assertEqual(
-            http.client.OK, response.status_code, response.content)
-        package_repository = reload_object(package_repository)
-        self.assertAttributes(package_repository, new_values)
+    def test_update_custom_repository(self):
+        """Updates a custom repository"""
+        self.become_admin()
+        # Creates a repository which is not 'default'.
+        package_repository = factory.make_PackageRepository()
+        new_values = {
+            'url': factory.make_url(scheme='http'),
+            'distributions': [
+                factory.make_name("distribution%d" % i) for i in range(3)],
+            'components': [factory.make_name("comp%d" % i) for i in range(4)],
+            'arches': [
+                random.choice(PackageRepository.KNOWN_ARCHES),
+                random.choice(PackageRepository.KNOWN_ARCHES),
+            ]
+        }
+        response = self.client.put(
+            self.get_package_repository_uri(package_repository), new_values)
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        package_repository = reload_object(package_repository)
+        self.assertAttributes(package_repository, new_values)
+
+    def test_update_custom_repository_fails_if_disabled_components(self):
+        """Test that updating a custom repository fails if specifying
+           'disabled_components'. This is only needed when the repository
+           is an Ubuntu repository"""
+        self.become_admin()
+        # Creates a repository which is not 'default'.
+        package_repository = factory.make_PackageRepository()
+        new_values = {
+            'url': factory.make_url(scheme='http'),
+            'distributions': [
+                factory.make_name("distribution%d" % i) for i in range(3)],
+            'components': [factory.make_name("comp%d" % i) for i in range(4)],
+            'disabled_components': [
+                factory.make_name("comp%d" % i) for i in range(4)],
+            'arches': [
+                random.choice(PackageRepository.KNOWN_ARCHES),
+                random.choice(PackageRepository.KNOWN_ARCHES),
+            ]
+        }
+        response = self.client.put(
+            self.get_package_repository_uri(package_repository), new_values)
+        self.assertEqual(
+            http.client.BAD_REQUEST, response.status_code, response.content)
+
+    def test_update_ubuntu_mirror(self):
+        """Updates a Ubuntu mirror"""
+        self.become_admin()
+        # Create an Ubuntu mirror without components
+        package_repository = factory.make_PackageRepository(
+            default=True, components=[])
+        new_values = {
+            'url': factory.make_url(scheme='http'),
+            'distributions': [
+                factory.make_name("distribution%d" % i) for i in range(3)],
+            'disabled_pockets': ["updates", "security"],
+            'disabled_components': ["universe", "multiverse"],
+            'arches': [
+                random.choice(PackageRepository.KNOWN_ARCHES),
+                random.choice(PackageRepository.KNOWN_ARCHES),
+            ]
+        }
+        response = self.client.put(
+            self.get_package_repository_uri(package_repository), new_values)
+        self.assertEqual(
+            http.client.OK, response.status_code, response.content)
+        package_repository = reload_object(package_repository)
+        self.assertAttributes(package_repository, new_values)
+
+    def test_update_ubuntu_mirror_fail_with_invalid_disabled_pockets(self):
+        """Test that updating an Ubuntu mirror with invalid pockets fails"""
+        self.become_admin()
+        # Create an Ubuntu mirror without components
+        package_repository = factory.make_PackageRepository(
+            default=True, components=[])
+        new_values = {
+            'url': factory.make_url(scheme='http'),
+            'distributions': [
+                factory.make_name("distribution%d" % i) for i in range(3)],
+            'disabled_pockets': ["updateses"],
+            'arches': [
+                random.choice(PackageRepository.KNOWN_ARCHES),
+                random.choice(PackageRepository.KNOWN_ARCHES),
+            ]
+        }
+        response = self.client.put(
+            self.get_package_repository_uri(package_repository), new_values)
+        self.assertEqual(
+            http.client.BAD_REQUEST, response.status_code, response.content)
+
+    def test_update_ubuntu_mirror_fail_with_invalid_disabled_components(self):
+        """Test that updating an Ubuntu mirror with invalid components fails"""
+        self.become_admin()
+        # Create an Ubuntu mirror without components
+        package_repository = factory.make_PackageRepository(
+            default=True, components=[])
+        new_values = {
+            'url': factory.make_url(scheme='http'),
+            'distributions': [
+                factory.make_name("distribution%d" % i) for i in range(3)],
+            'disabled_components': ['universes'],
+            'arches': [
+                random.choice(PackageRepository.KNOWN_ARCHES),
+                random.choice(PackageRepository.KNOWN_ARCHES),
+            ]
+        }
+        response = self.client.put(
+            self.get_package_repository_uri(package_repository), new_values)
+        self.assertEqual(
+            http.client.BAD_REQUEST, response.status_code, response.content)
+
+    def test_update_ubuntu_mirror_fails_if_components_are_passed(self):
+        """Test that updating a Ubuntu mirror fails if specifying
+           'components'. This is only needed when the repository is not
+           an Ubuntu repository"""
+        self.become_admin()
+        # Create an Ubuntu mirror without components
+        package_repository = factory.make_PackageRepository(
+            default=True, components=[])
+        new_values = {
+            'url': factory.make_url(scheme='http'),
+            'distributions': [
+                factory.make_name("distribution%d" % i) for i in range(3)],
+            'components': [factory.make_name("comp%d" % i) for i in range(4)],
+            'disabled_components': [
+                factory.make_name("comp%d" % i) for i in range(4)],
+            'arches': [
+                random.choice(PackageRepository.KNOWN_ARCHES),
+                random.choice(PackageRepository.KNOWN_ARCHES),
+            ]
+        }
+        response = self.client.put(
+            self.get_package_repository_uri(package_repository), new_values)
+        self.assertEqual(
+            http.client.BAD_REQUEST, response.status_code, response.content)
 
     def test_update_admin_only(self):
         package_repository = factory.make_PackageRepository()
 
=== modified file 'src/maasserver/compose_preseed.py'
--- src/maasserver/compose_preseed.py	2017-02-17 14:23:04 +0000
+++ src/maasserver/compose_preseed.py	2017-03-16 22:02:44 +0000
@@ -61,25 +61,41 @@
     apt_proxy = get_apt_proxy_for_node(node)
 
     # Process the default Ubuntu Archives or Mirror.
-    archives = {
-        'apt': {
-            'preserve_sources_list': preserve_sources,
-            'primary': [
-                {
-                    'arches': ['default'],
-                    'uri': archive.url
-                },
-            ],
-            'security': [
-                {
-                    'arches': ['default'],
-                    'uri': archive.url
-                },
-            ],
-        },
-    }
-    if archive.disabled_pockets:
-        archives['apt']['disable_suites'] = archive.disabled_pockets
+    archives = {}
+    archives['apt'] = {}
+    archives['apt']['preserve_sources_list'] = preserve_sources
+    # If disabled_components exist, build a custom list of repositories
+    if archive.disabled_components:
+        urls = ''
+        components = archive.KNOWN_COMPONENTS[:]
+
+        for comp in archive.COMPONENTS_TO_DISABLE:
+            if comp in archive.disabled_components:
+                components.remove(comp)
+        urls += 'deb %s $RELEASE %s\n' % (
+            archive.url, ' '.join(components))
+
+        for pocket in archive.POCKETS_TO_DISABLE:
+            if pocket not in archive.disabled_pockets:
+                urls += 'deb %s $RELEASE-%s %s\n' % (
+                    archive.url, pocket, ' '.join(components))
+
+        archives['apt']['sources_list'] = urls
+    else:
+        archives['apt']['primary'] = [
+            {
+                'arches': ['default'],
+                'uri': archive.url
+            }
+        ]
+        archives['apt']['security'] = [
+            {
+                'arches': ['default'],
+                'uri': archive.url
+            }
+        ]
+        if archive.disabled_pockets:
+            archives['apt']['disable_suites'] = archive.disabled_pockets
     if apt_proxy:
         archives['apt']['proxy'] = apt_proxy
     if archive.key:
@@ -94,7 +110,7 @@
         if repo.url.startswith('ppa:'):
             url = repo.url
         elif 'ppa.launchpad.net' in repo.url:
-            url = 'deb %s %s main' % (repo.url, node.distro_series)
+            url = 'deb %s $RELEASE main' % (repo.url)
         else:
             components = ''
             if not repo.components:
@@ -105,8 +121,8 @@
             components = components.strip()
 
             if not repo.distributions:
-                url = 'deb %s %s %s' % (
-                    repo.url, node.distro_series, components)
+                url = 'deb %s $RELEASE %s' % (
+                    repo.url, components)
             else:
                 url = ''
                 for dist in repo.distributions:
@@ -120,11 +136,11 @@
         if repo.key:
             archives['apt']['sources'][repo_name] = {
                 'key': repo.key,
-                'source': url
+                'source': url.strip()
             }
         else:
             archives['apt']['sources'][repo_name] = {
-                'source': url
+                'source': url.strip()
             }
 
     return archives
 
=== modified file 'src/maasserver/forms/packagerepository.py'
--- src/maasserver/forms/packagerepository.py	2017-02-17 14:23:04 +0000
+++ src/maasserver/forms/packagerepository.py	2017-03-16 22:02:44 +0000
@@ -27,6 +27,7 @@
             'url',
             'distributions',
             'disabled_pockets',
+            'disabled_components',
             'components',
             'arches',
             'key',
@@ -50,6 +51,9 @@
     disabled_pockets = UnconstrainedMultipleChoiceField(
         label="Disabled Pocket list")
 
+    disabled_components = UnconstrainedMultipleChoiceField(
+        label="Disabled Component list")
+
     components = UnconstrainedMultipleChoiceField(label="Component list")
 
     arches = UnconstrainedMultipleChoiceField(label="Architecture list")
@@ -99,10 +103,54 @@
         values = []
         for value in self.cleaned_data.get('disabled_pockets', []):
             values.extend([s.strip() for s in value.split(',')])
+        # This allows to reset the values of disabled_pockets if one of the
+        # following is passed over the API:
+        #   disabled_pockets=
+        #   disabled_pockets=''
+        #   disabled_pockets=None
+        #   disabled_pockets=[]
+        if values == [''] or values == ['None'] or values == ['[]']:
+            return []
+        # Check that a valid pocket is being disable.
+        for pocket in values:
+            if pocket not in PackageRepository.POCKETS_TO_DISABLE:
+                raise ValidationError(
+                    "'%s' is not a valid Ubuntu archive pocket. You "
+                    "can only disable %s." % (
+                        pocket, PackageRepository.POCKETS_TO_DISABLE))
+        return values
+
+    def clean_disabled_components(self):
+        values = []
+        for value in self.cleaned_data.get('disabled_components', []):
+            values.extend([s.strip() for s in value.split(',')])
+        # This allows to reset the values of disabled_components if one of the
+        # following is passed over the API:
+        #   disabled_components=
+        #   disabled_components=''
+        #   disabled_components=None
+        #   disabled_components=[]
+        if values == [''] or values == ['None'] or values == ['[]']:
+            return []
+        if self.instance is not None and not self.instance.default and values:
+            raise ValidationError(
+                "This is a custom repository. Please update 'components' "
+                "instead.")
+        # Check that a valid component is being passed.
+        for component in values:
+            if component not in PackageRepository.COMPONENTS_TO_DISABLE:
+                raise ValidationError(
+                    "'%s' is not a valid Ubuntu archive component. You "
+                    "can only disable %s." % (
+                        component, PackageRepository.COMPONENTS_TO_DISABLE))
         return values
 
     def clean_components(self):
         values = []
         for value in self.cleaned_data.get('components', []):
             values.extend([s.strip() for s in value.split(',')])
+        if self.instance is not None and self.instance.default and values:
+            raise ValidationError(
+                "This is a default Ubuntu repository. Please update "
+                "'disabled_components' instead.")
         return values
 
=== modified file 'src/maasserver/forms/tests/test_packagerepository.py'
--- src/maasserver/forms/tests/test_packagerepository.py	2017-02-17 14:23:04 +0000
+++ src/maasserver/forms/tests/test_packagerepository.py	2017-03-16 22:02:44 +0000
@@ -27,10 +27,10 @@
         arch2 = random.choice(PackageRepository.KNOWN_ARCHES)
         dist1 = factory.make_name('dist')
         dist2 = factory.make_name('dist')
-        pock1 = factory.make_name('pock')
-        pock2 = factory.make_name('pock')
-        comp1 = factory.make_name('comp')
-        comp2 = factory.make_name('comp')
+        pock1 = 'updates'
+        pock2 = 'backports'
+        comp1 = 'universe'
+        comp2 = 'multiverse'
         enabled = factory.pick_bool()
         params = {
             'name': name,
@@ -195,18 +195,40 @@
         package_repository = factory.make_PackageRepository()
         form = PackageRepositoryForm(
             instance=package_repository,
-            data={'disabled_pockets': ['val1,val2']})
-        repo = form.save()
-        self.assertItemsEqual(['val1', 'val2'], repo.disabled_pockets)
-        form = PackageRepositoryForm(
-            instance=package_repository,
-            data={'disabled_pockets': ['val1, val2']})
-        repo = form.save()
-        self.assertItemsEqual(['val1', 'val2'], repo.disabled_pockets)
-        form = PackageRepositoryForm(
-            instance=package_repository, data={'disabled_pockets': ['val1']})
-        repo = form.save()
-        self.assertItemsEqual(['val1'], repo.disabled_pockets)
+            data={'disabled_pockets': ['updates,backports']})
+        repo = form.save()
+        self.assertItemsEqual(['updates', 'backports'], repo.disabled_pockets)
+        form = PackageRepositoryForm(
+            instance=package_repository,
+            data={'disabled_pockets': ['updates, backports']})
+        repo = form.save()
+        self.assertItemsEqual(['updates', 'backports'], repo.disabled_pockets)
+        form = PackageRepositoryForm(
+            instance=package_repository,
+            data={'disabled_pockets': ['updates']})
+        repo = form.save()
+        self.assertItemsEqual(['updates'], repo.disabled_pockets)
+
+    def test__disabled_component_comma_cleaning(self):
+        package_repository = factory.make_PackageRepository(
+            default=True, components=[])
+        form = PackageRepositoryForm(
+            instance=package_repository,
+            data={'disabled_components': ['universe,multiverse']})
+        repo = form.save()
+        self.assertItemsEqual(
+            ['universe', 'multiverse'], repo.disabled_components)
+        form = PackageRepositoryForm(
+            instance=package_repository,
+            data={'disabled_components': ['universe, multiverse']})
+        repo = form.save()
+        self.assertItemsEqual(
+            ['universe', 'multiverse'], repo.disabled_components)
+        form = PackageRepositoryForm(
+            instance=package_repository,
+            data={'disabled_components': ['universe']})
+        repo = form.save()
+        self.assertItemsEqual(['universe'], repo.disabled_components)
 
     def test__component_comma_cleaning(self):
         package_repository = factory.make_PackageRepository()
 
=== added file 'src/maasserver/migrations/builtin/maasserver/0116_add_disabled_components_for_mirrors.py'
--- src/maasserver/migrations/builtin/maasserver/0116_add_disabled_components_for_mirrors.py	1970-01-01 00:00:00 +0000
+++ src/maasserver/migrations/builtin/maasserver/0116_add_disabled_components_for_mirrors.py	2017-03-16 22:02:44 +0000
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.contrib.postgres.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('maasserver', '0115_additional_boot_resource_filetypes'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='packagerepository',
+            name='disabled_components',
+            field=django.contrib.postgres.fields.ArrayField(base_field=models.TextField(), size=None, default=list, blank=True, null=True),
+        ),
+    ]
 
=== modified file 'src/maasserver/models/packagerepository.py'
--- src/maasserver/models/packagerepository.py	2016-09-01 13:12:15 +0000
+++ src/maasserver/models/packagerepository.py	2017-03-16 22:02:44 +0000
@@ -74,6 +74,9 @@
     def get_pockets_to_disable(self):
         return PackageRepository.POCKETS_TO_DISABLE
 
+    def get_components_to_disable(self):
+        return PackageRepository.COMPONENTS_TO_DISABLE
+
     def get_default_archive(self, arch):
         return PackageRepository.objects.filter(
             arches__contains=[arch],
@@ -94,6 +97,8 @@
     PORTS_ARCHES = ['armhf', 'arm64', 'ppc64el']
     KNOWN_ARCHES = MAIN_ARCHES + PORTS_ARCHES
     POCKETS_TO_DISABLE = ['updates', 'security', 'backports']
+    COMPONENTS_TO_DISABLE = ['restricted', 'universe', 'multiverse']
+    KNOWN_COMPONENTS = ['main', 'restricted', 'universe', 'multiverse']
 
     class Meta(DefaultMeta):
         """Needed for South to recognize this model."""
@@ -111,6 +116,9 @@
     disabled_pockets = ArrayField(
         TextField(), blank=True, null=True, default=list)
 
+    disabled_components = ArrayField(
+        TextField(), blank=True, null=True, default=list)
+
     components = ArrayField(TextField(), blank=True, null=True, default=list)
 
     arches = ArrayField(TextField(), blank=True, null=True, default=list)
 
=== modified file 'src/maasserver/models/tests/test_packagerepository.py'
--- src/maasserver/models/tests/test_packagerepository.py	2016-08-25 19:31:20 +0000
+++ src/maasserver/models/tests/test_packagerepository.py	2017-03-16 22:02:44 +0000
@@ -61,3 +61,8 @@
         self.assertEqual(
             PackageRepository.objects.get_pockets_to_disable(),
             PackageRepository.POCKETS_TO_DISABLE)
+
+    def test_get_components_to_disable(self):
+        self.assertEqual(
+            PackageRepository.objects.get_components_to_disable(),
+            PackageRepository.COMPONENTS_TO_DISABLE)
 
=== modified file 'src/maasserver/static/js/angular/controllers/settings.js'
--- src/maasserver/static/js/angular/controllers/settings.js	2016-09-21 14:49:23 +0000
+++ src/maasserver/static/js/angular/controllers/settings.js	2017-03-16 22:02:44 +0000
@@ -30,6 +30,8 @@
             GeneralManager.getData("known_architectures");
         $scope.pockets_to_disable =
             GeneralManager.getData("pockets_to_disable");
+        $scope.components_to_disable =
+            GeneralManager.getData("components_to_disable");
         $scope.packageRepositoriesManager = PackageRepositoriesManager;
         $scope.repositories =
             PackageRepositoriesManager.getItems();
 
=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_settings.js'
--- src/maasserver/static/js/angular/controllers/tests/test_settings.js	2016-09-22 15:05:38 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_settings.js	2017-03-16 22:02:44 +0000
@@ -116,6 +116,8 @@
             GeneralManager.getData("known_architectures"));
         expect($scope.pockets_to_disable).toBe(
             GeneralManager.getData("pockets_to_disable"));
+        expect($scope.components_to_disable).toBe(
+            GeneralManager.getData("components_to_disable"));
         expect($scope.packageRepositoriesManager).toBe(
             PackageRepositoriesManager);
         expect($scope.repositories).toBe(
 
=== modified file 'src/maasserver/static/js/angular/factories/general.js'
--- src/maasserver/static/js/angular/factories/general.js	2016-09-22 15:05:38 +0000
+++ src/maasserver/static/js/angular/factories/general.js	2017-03-16 22:02:44 +0000
@@ -77,6 +77,13 @@
                     polling: false,
                     nextPromise: null
                 },
+                components_to_disable: {
+                    method: "general.components_to_disable",
+                    data: [],
+                    loaded: false,
+                    polling: false,
+                    nextPromise: null
+                },
                 hwe_kernels: {
                     method: "general.hwe_kernels",
                     data: [],
 
=== modified file 'src/maasserver/static/js/angular/factories/tests/test_general.js'
--- src/maasserver/static/js/angular/factories/tests/test_general.js	2016-08-22 04:10:43 +0000
+++ src/maasserver/static/js/angular/factories/tests/test_general.js	2017-03-16 22:02:44 +0000
@@ -53,9 +53,9 @@
             ["machine_actions", "device_actions", "region_controller_actions",
             "rack_controller_actions", "region_and_rack_controller_actions",
             "architectures", "known_architectures", "pockets_to_disable",
-            "hwe_kernels", "min_hwe_kernels", "default_min_hwe_kernel",
-            "osinfo", "bond_options", "version", "power_types",
-            "release_options"]);
+            "components_to_disable", "hwe_kernels", "min_hwe_kernels",
+            "default_min_hwe_kernel", "osinfo", "bond_options",
+            "version", "power_types", "release_options"]);
     });
 
     it("_data.machine_actions has correct data", function() {
@@ -136,6 +136,15 @@
         expect(ptd.nextPromise).toBeNull();
     });
 
+    it("_data.components_to_disable has correct data", function() {
+        var ptd = GeneralManager._data.components_to_disable;
+        expect(ptd.method).toBe("general.components_to_disable");
+        expect(ptd.data).toEqual([]);
+        expect(ptd.loaded).toBe(false);
+        expect(ptd.polling).toBe(false);
+        expect(ptd.nextPromise).toBeNull();
+    });
+
     it("_data.hwe_kernels has correct data", function() {
         var hwe_kernels = GeneralManager._data.hwe_kernels;
         expect(hwe_kernels.method).toBe("general.hwe_kernels");
@@ -302,6 +311,7 @@
             GeneralManager._data.architectures.loaded = true;
             GeneralManager._data.known_architectures.loaded = true;
             GeneralManager._data.pockets_to_disable.loaded = true;
+            GeneralManager._data.components_to_disable.loaded = true;
             GeneralManager._data.hwe_kernels.loaded = true;
             GeneralManager._data.osinfo.loaded = true;
             GeneralManager._data.bond_options.loaded = true;
@@ -321,6 +331,7 @@
             GeneralManager._data.architectures.loaded = true;
             GeneralManager._data.known_architectures.loaded = true;
             GeneralManager._data.pockets_to_disable.loaded = true;
+            GeneralManager._data.components_to_disable.loaded = true;
             GeneralManager._data.hwe_kernels.loaded = true;
             GeneralManager._data.min_hwe_kernels.loaded = true;
             GeneralManager._data.default_min_hwe_kernel.loaded = true;
@@ -353,6 +364,7 @@
             GeneralManager._data.architectures.polling = false;
             GeneralManager._data.known_architectures.polling = false;
             GeneralManager._data.pockets_to_disable.polling = false;
+            GeneralManager._data.components_to_disable.polling = false;
             GeneralManager._data.hwe_kernels.polling = false;
             GeneralManager._data.osinfo.polling = false;
             expect(GeneralManager.isPolling()).toBe(true);
@@ -363,6 +375,7 @@
             GeneralManager._data.architectures.polling = true;
             GeneralManager._data.known_architectures.polling = true;
             GeneralManager._data.pockets_to_disable.polling = true;
+            GeneralManager._data.components_to_disable.polling = true;
             GeneralManager._data.hwe_kernels.polling = true;
             GeneralManager._data.osinfo.polling = true;
             expect(GeneralManager.isPolling()).toBe(true);
 
=== modified file 'src/maasserver/static/partials/settings.html'
--- src/maasserver/static/partials/settings.html	2017-02-17 14:23:04 +0000
+++ src/maasserver/static/partials/settings.html	2017-03-16 22:02:44 +0000
@@ -488,6 +488,11 @@
                                                         <maas-obj-field type="checkboxes" key="disabled_pockets" label="Disabled Pockets"
                                                             label-width="two" input-width="three" values="pockets_to_disable"></maas-obj-field>
                                                     </div>
+                                                    <div class="form__group u-align--left-mobile"
+                                                        data-ng-if="isMirror(editRepository) && !isPPA(editRepository)">
+                                                        <maas-obj-field type="checkboxes" key="disabled_components" label="Disabled Components"
+                                                            label-width="two" input-width="three" values="components_to_disable"></maas-obj-field>
+                                                    </div>
                                                 </div>
                                             </div>
                                             <div class="table__row is-active">
 
=== modified file 'src/maasserver/testing/factory.py'
--- src/maasserver/testing/factory.py	2017-03-15 16:40:59 +0000
+++ src/maasserver/testing/factory.py	2017-03-16 22:02:44 +0000
@@ -2037,7 +2037,8 @@
 
     def make_PackageRepository(
             self, name=None, url=None, arches=None, default=False, key=None,
-            distributions=None, components=None, disabled_pockets=None):
+            distributions=None, components=None, disabled_pockets=None,
+            disabled_components=None):
         if name is None:
             name = self.make_name("name")
         if url is None:
@@ -2051,7 +2052,8 @@
         return PackageRepository.objects.create(
             name=name, url=url,
             distributions=distributions, disabled_pockets=disabled_pockets,
-            components=components, arches=arches, key=key, default=default)
+            components=components, arches=arches, key=key, default=default,
+            disabled_components=disabled_components)
 
     def make_Notification(
             self, message=None, *, ident=None, user=None, users=False,
 
=== modified file 'src/maasserver/tests/test_preseed.py'
--- src/maasserver/tests/test_preseed.py	2017-03-09 08:55:12 +0000
+++ src/maasserver/tests/test_preseed.py	2017-03-16 22:02:44 +0000
@@ -1230,6 +1230,31 @@
             preseed['apt']['disable_suites'],
             archive.disabled_pockets)
 
+    def test_compose_curtin_archive_config_with_disabled_pockets(self):
+        """Test that main archive has a configuration that includes
+           disabled_pockets. If so, MAAS will create its own sources_list
+           instead of letting curtin/cloud-init create it based on its own
+           template"""
+        PackageRepository.objects.all().delete()
+        node = self.make_fastpath_node('amd64')
+        node.osystem = 'ubuntu'
+        node.distro_series = 'xenial'
+        main_url = 'http://us.archive.ubuntu.com/ubuntu'
+        factory.make_PackageRepository(
+            url=main_url, default=True, arches=['i386', 'amd64'],
+            disabled_pockets=['updates', 'backports'],
+            disabled_components=['universe', 'multiverse'])
+        self.configure_get_boot_images_for_node(node, 'xinstall')
+        # compose_curtin_archive_config returns a list.
+        userdata = compose_curtin_archive_config(node)
+        preseed = yaml.safe_load(userdata[0])
+        self.assertThat(
+            preseed['apt']['sources_list'],
+            Contains('$RELEASE main restricted'))
+        self.assertThat(
+            preseed['apt']['sources_list'],
+            Contains('$RELEASE-security main restricted'))
+
     def test_compose_curtin_archive_config_has_ppa(self):
         node = self.make_fastpath_node('i386')
         node.osystem = 'ubuntu'
@@ -1283,7 +1308,7 @@
             )
         self.assertThat(
             preseed['apt']['sources'][ppa_name]['source'],
-            ContainsAll("deb %s %s main" % (ppa_first.url, node.distro_series))
+            ContainsAll("deb %s $RELEASE main" % ppa_first.url)
             )
         # Clean up PPA name
         ppa_name = make_clean_repo_name(ppa_second)
@@ -1293,8 +1318,7 @@
             )
         self.assertThat(
             preseed['apt']['sources'][ppa_name]['source'],
-            ContainsAll("deb %s %s main" % (
-                ppa_second.url, node.distro_series)))
+            ContainsAll("deb %s $RELEASE main" % ppa_second.url))
 
     def test_compose_curtin_archive_config_has_custom_repository(self):
         node = self.make_fastpath_node('i386')
@@ -1318,8 +1342,7 @@
             )
         self.assertThat(
             preseed['apt']['sources'][repo_name]['source'],
-            ContainsAll("deb %s %s main" % (
-                repository.url, node.distro_series)))
+            ContainsAll("deb %s $RELEASE main" % repository.url))
 
     def test_compose_curtin_archive_config_custom_repo_with_components(self):
         node = self.make_fastpath_node('i386')
@@ -1348,8 +1371,8 @@
             )
         self.assertThat(
             preseed['apt']['sources'][repo_name]['source'],
-            ContainsAll("deb %s %s %s" % (
-                repository.url, node.distro_series, components)))
+            ContainsAll("deb %s $RELEASE %s" % (
+                repository.url, components)))
 
     def test_compose_curtin_archive_config_custom_repo_components_dists(self):
         node = self.make_fastpath_node('i386')
 
=== modified file 'src/maasserver/websockets/handlers/general.py'
--- src/maasserver/websockets/handlers/general.py	2017-01-28 00:51:47 +0000
+++ src/maasserver/websockets/handlers/general.py	2017-03-16 22:02:44 +0000
@@ -46,6 +46,7 @@
             'architectures',
             'known_architectures',
             'pockets_to_disable',
+            'components_to_disable',
             'hwe_kernels',
             'min_hwe_kernels',
             'default_min_hwe_kernel',
@@ -74,6 +75,10 @@
         """Return pockets that can be disabled."""
         return PackageRepository.objects.get_pockets_to_disable()
 
+    def components_to_disable(self, params):
+        "Return compoennts that can be disable for default Ubuntu archives"
+        return PackageRepository.objects.get_components_to_disable()
+
     def hwe_kernels(self, params):
         """Return all supported hwe_kernels."""
         return list_hwe_kernel_choices(
 
=== modified file 'src/maasserver/websockets/handlers/tests/test_general.py'
--- src/maasserver/websockets/handlers/tests/test_general.py	2017-03-02 09:41:37 +0000
+++ src/maasserver/websockets/handlers/tests/test_general.py	2017-03-16 22:02:44 +0000
@@ -103,6 +103,12 @@
             PackageRepository.objects.get_pockets_to_disable(),
             handler.pockets_to_disable({}))
 
+    def test_components_to_disable(self):
+        handler = GeneralHandler(factory.make_User(), {})
+        self.assertEqual(
+            PackageRepository.objects.get_components_to_disable(),
+            handler.components_to_disable({}))
+
     def test_hwe_kernels(self):
         expected_output = self.make_boot_sources()
         handler = GeneralHandler(factory.make_User(), {})
 
=== modified file 'src/maasserver/websockets/handlers/tests/test_packagerepository.py'
--- src/maasserver/websockets/handlers/tests/test_packagerepository.py	2017-02-17 14:23:04 +0000
+++ src/maasserver/websockets/handlers/tests/test_packagerepository.py	2017-03-16 22:02:44 +0000
@@ -34,6 +34,7 @@
             'url': package_repository.url,
             'distributions': package_repository.distributions,
             'disabled_pockets': package_repository.disabled_pockets,
+            'disabled_components': package_repository.disabled_components,
             'components': package_repository.components,
             'arches': package_repository.arches,
             'key': package_repository.key,