Merge lp:~rvb/maas-test/only-one-arch into lp:maas-test

[Raphaël Badin]

Remove workaround for bug 1181334: do not always download i386 images.

I decided to keep passing to maasfixture.compose_import_config a list of architectures: all the code to support that is in place so it would be a waste to change that to support only one architecture. Although one architecture is all we need right now, we might need to download images for more than one architecture in the future (maybe just in order to get a dry-run to cache images).

[Julian Edwards (julian-edwards)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 review: approve
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iEYEARECAAYFAlNdo2cACgkQWhGlTF8G/Hdu3wCfeZLK/ONYXCZb7LdY+9jMgxj0
f8wAnRDB9k//YfnnJopWjyZ8J64gHJxq
=JxRH
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'maastest/maasfixture.py'
--- maastest/maasfixture.py	2014-04-10 10:20:23 +0000
+++ maastest/maasfixture.py	2014-04-25 15:47:50 +0000
@@ -276,7 +276,7 @@
             imported, e.g. 'amd64', 'arm/hightbank'.  If the
             subarchitecture isn't specified, 'generic' is assumed.
         """
-        arch_list = utils.mipf_arch_list(architecture)
+        arch_list = [utils.mipf_arch(architecture)]
         logging.info(
             "Importing boot images series=%s, architectures=%s..." % (
                 series, ', '.join(arch_list)))

=== modified file 'maastest/tests/test_maasfixture.py'
--- maastest/tests/test_maasfixture.py	2014-04-10 10:39:09 +0000
+++ maastest/tests/test_maasfixture.py	2014-04-25 15:47:50 +0000
@@ -756,30 +756,6 @@
                 maas_fixture.configure_cluster.mock_calls,
             ])
 
-    def test_import_maas_images_imports_pxe_images(self):
-        kvm_fixture = self.make_kvm_fixture()
-        proxy_url = self.getUniqueString()
-        maas_fixture = self.make_maas_fixture(kvm_fixture, proxy_url)
-        series = self.getUniqueString()
-        arch = self.getUniqueString()
-        filter = self.getUniqueString()
-        returned_arches = ['amd64/generic', 'i386/generic']
-        mock_mipf_arch_list = mock.MagicMock(return_value=returned_arches)
-        self.patch(
-            utils, 'mipf_arch_list', mock_mipf_arch_list)
-
-        maas_fixture.import_maas_images(series, arch, filter)
-
-        self.assertEqual(
-            mock.call([
-                'sudo',
-                'http_proxy=%s' % proxy_url,
-                'https_proxy=%s' % proxy_url,
-                'maas-import-pxe-files',
-            ], check_call=True),
-            kvm_fixture.run_command.mock_calls[-1])
-        self.assertEqual([mock.call(arch)], mock_mipf_arch_list.mock_calls)
-
     def test_dump_data_calls_dumpdata(self):
         maas_fixture = self.make_maas_fixture()
         maas_fixture._maas_admin = 'maas-region-admin'

=== modified file 'maastest/tests/test_utils.py'
--- maastest/tests/test_utils.py	2014-04-25 15:47:50 +0000
+++ maastest/tests/test_utils.py	2014-04-25 15:47:50 +0000
@@ -334,15 +334,17 @@
         self.assertEqual({}, utils.extract_mac_ip_mapping(NMAP_XML_OUTPUT))
 
 
-class TestMipfArchList(testtools.TestCase):
+class TestMipfArch(testtools.TestCase):
 
     def test_defaults_to_generic(self):
-        self.assertItemsEqual(['i386/generic'], utils.mipf_arch_list('i386'))
+        arch = self.getUniqueString()
+        self.assertItemsEqual('%s/generic' % arch, utils.mipf_arch(arch))
 
-    def test_adds_i386_if_missing(self):
-        self.assertEqual(
-            (['amd64/generic', 'i386/generic'], ['i386/generic']),
-            (utils.mipf_arch_list('amd64'), utils.mipf_arch_list('i386')))
+    def test_keeps_subarch_if_provided(self):
+        arch = self.getUniqueString()
+        subarch = self.getUniqueString()
+        full_arch = "%s/%s" % (arch, subarch)
+        self.assertEqual(full_arch, (utils.mipf_arch(full_arch)))
 
 
 class TestVirtualizationType(testtools.TestCase):

=== modified file 'maastest/utils.py'
--- maastest/utils.py	2014-04-09 10:41:45 +0000
+++ maastest/utils.py	2014-04-25 15:47:50 +0000
@@ -19,7 +19,7 @@
     "determine_vm_architecture",
     "determine_vm_series",
     "get_uri",
-    "mipf_arch_list",
+    "mipf_arch",
     "read_file",
     "retries",
     "run_command",
@@ -238,26 +238,14 @@
     return mapping
 
 
-def mipf_arch_list(architecture):
-    """Return the architectures that must be downloaded by m-i-p-f.
+def mipf_arch(architecture):
+    """Return the name of the architecture that must be downloaded by m-i-p-f.
 
-    This converts an architecture name (e.g. 'amd64' or 'armhf/generic') into
-    the list of architectures that m-i-p-f must download in a format that
-    this script understands.
-    More precisely, this means doing two things:
-    - default the subarchitecture 'generic' if not specified.
-    - work around bug 1181334 by including 'i386/generic' in the list of
-      architectures to be downloaded if it's not explicitely specified.
+    If subarch is not provided, default to 'generic'.
     """
-    # If subarchitecture is not provided, assume 'generic'.
     if '/' not in architecture:
         architecture = '%s/generic' % architecture
-    arch_list = [architecture]
-    # Include i386, see
-    # https://bugs.launchpad.net/ubuntu/+source/maas/+bug/1181334
-    if architecture != "i386/generic":
-        arch_list.append("i386/generic")
-    return arch_list
+    return architecture
 
 
 def check_kvm_ok():