Merge lp:~blake-rouse/maas/ppc64el-to-powerkvm into lp:~maas-committers/maas/trunk

[Blake Rouse]

Rename ppc64el boot loader to PowerKVM.

Renames the ppc64el boot loader to PowerKVM, as it is only used for booting PowerKVM nodes. Have incoming support for PowerNV, that uses the same architecture, renaming makes it easy to distinguish.

[Raphaël Badin (rvb)]

Looks good. Mechanical refactoring.

review: Approve

=== modified file 'src/provisioningserver/boot/__init__.py'
--- src/provisioningserver/boot/__init__.py	2014-05-15 17:27:53 +0000
+++ src/provisioningserver/boot/__init__.py	2014-05-23 15:04:04 +0000
@@ -202,13 +202,13 @@
 # Import the supported boot methods after defining BootMethod.
 from provisioningserver.boot.pxe import PXEBootMethod
 from provisioningserver.boot.uefi import UEFIBootMethod
-from provisioningserver.boot.ppc64el import PPC64ELBootMethod
+from provisioningserver.boot.powerkvm import PowerKVMBootMethod
 
 
 builtin_boot_methods = [
     PXEBootMethod(),
     UEFIBootMethod(),
-    PPC64ELBootMethod(),
+    PowerKVMBootMethod(),
 ]
 for method in builtin_boot_methods:
     BootMethodRegistry.register_item(method.name, method)

=== renamed file 'src/provisioningserver/boot/ppc64el.py' => 'src/provisioningserver/boot/powerkvm.py'
--- src/provisioningserver/boot/ppc64el.py	2014-05-15 17:18:18 +0000
+++ src/provisioningserver/boot/powerkvm.py	2014-05-23 15:04:04 +0000
@@ -1,7 +1,7 @@
 # Copyright 2014 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""PPC64EL Boot Method"""
+"""PowerKVM Boot Method"""
 
 from __future__ import (
     absolute_import,
@@ -13,7 +13,7 @@
 
 __metaclass__ = type
 __all__ = [
-    'PPC64ELBootMethod',
+    'PowerKVMBootMethod',
     ]
 
 import glob
@@ -38,10 +38,10 @@
     """)
 
 
-class PPC64ELBootMethod(BootMethod):
+class PowerKVMBootMethod(BootMethod):
 
-    name = "ppc64el"
-    template_subdir = "ppc64el"
+    name = "powerkvm"
+    template_subdir = None
     bootloader_path = "bootppc64.bin"
     arch_octet = "00:0C"
 
@@ -58,7 +58,7 @@
         return ""
 
     def install_bootloader(self, destination):
-        """Installs the required files for PPC64EL booting into the
+        """Installs the required files for PowerKVM booting into the
         tftproot.
         """
         with tempdir() as tmp:

=== renamed file 'src/provisioningserver/boot/tests/test_ppc64el.py' => 'src/provisioningserver/boot/tests/test_powerkvm.py'
--- src/provisioningserver/boot/tests/test_ppc64el.py	2014-05-15 17:18:18 +0000
+++ src/provisioningserver/boot/tests/test_powerkvm.py	2014-05-23 15:04:04 +0000
@@ -1,7 +1,7 @@
 # Copyright 2014 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Tests for `provisioningserver.boot.ppc64el`."""
+"""Tests for `provisioningserver.boot.powerkvm`."""
 
 from __future__ import (
     absolute_import,
@@ -22,39 +22,39 @@
 from maastesting.testcase import MAASTestCase
 from provisioningserver.boot import (
     BootMethodInstallError,
-    ppc64el as ppc64el_module,
+    powerkvm as powerkvm_module,
     utils,
     )
-from provisioningserver.boot.ppc64el import (
+from provisioningserver.boot.powerkvm import (
     GRUB_CONFIG,
-    PPC64ELBootMethod,
+    PowerKVMBootMethod,
     )
 from provisioningserver.tests.test_kernel_opts import make_kernel_parameters
 
 
-class TestPPC64ELBootMethod(MAASTestCase):
-    """Tests `provisioningserver.boot.ppc64el.PPC64ELBootMethod`."""
+class TestPowerKVMBootMethod(MAASTestCase):
+    """Tests `provisioningserver.boot.powerkvm.PowerKVMBootMethod`."""
 
     def test_match_config_path_returns_none(self):
-        method = PPC64ELBootMethod()
+        method = PowerKVMBootMethod()
         paths = [factory.getRandomString() for _ in range(3)]
         for path in paths:
             self.assertEqual(None, method.match_config_path(path))
 
     def test_render_config_returns_empty_string(self):
-        method = PPC64ELBootMethod()
+        method = PowerKVMBootMethod()
         params = [make_kernel_parameters() for _ in range(3)]
         for param in params:
             self.assertEqual("", method.render_config(params))
 
     def test_install_bootloader_get_package_raises_error(self):
-        method = PPC64ELBootMethod()
+        method = PowerKVMBootMethod()
         self.patch(utils, 'get_updates_package').return_value = (None, None)
         self.assertRaises(
             BootMethodInstallError, method.install_bootloader, None)
 
     def test_install_bootloader(self):
-        method = PPC64ELBootMethod()
+        method = PowerKVMBootMethod()
         filename = factory.make_name('dpkg')
         data = factory.getRandomString()
         tmp = self.make_dir()
@@ -69,11 +69,11 @@
 
         mock_get_updates_package = self.patch(utils, 'get_updates_package')
         mock_get_updates_package.return_value = (data, filename)
-        self.patch(ppc64el_module, 'call_and_check')
-        self.patch(ppc64el_module, 'tempdir').side_effect = tempdir
+        self.patch(powerkvm_module, 'call_and_check')
+        self.patch(powerkvm_module, 'tempdir').side_effect = tempdir
 
         mock_install_bootloader = self.patch(
-            ppc64el_module, 'install_bootloader')
+            powerkvm_module, 'install_bootloader')
 
         method.install_bootloader(dest)