MAAS

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

  1. ppc64el-to-powerkvm-1.5
  2. Merge into 1.5
Proposed by Blake Rouse
Status: Merged
Approved by: Blake Rouse
Approved revision: no longer in the source branch.
Merged at revision: 2277
Proposed branch: lp:~blake-rouse/maas/ppc64el-to-powerkvm-1.5
Merge into: lp:maas/1.5
Diff against target: 140 lines (+21/-21)
3 files modified
src/provisioningserver/boot/__init__.py (+2/-2)
src/provisioningserver/boot/powerkvm.py (+6/-6)
src/provisioningserver/boot/tests/test_powerkvm.py (+13/-13)
To merge this branch: bzr merge lp:~blake-rouse/maas/ppc64el-to-powerkvm-1.5
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+220828@code.launchpad.net

Commit message

Rename ppc64el boot loader to PowerKVM.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/boot/__init__.py'
2--- src/provisioningserver/boot/__init__.py 2014-05-15 17:39:27 +0000
3+++ src/provisioningserver/boot/__init__.py 2014-05-23 16:33:41 +0000
4@@ -202,13 +202,13 @@
5 # Import the supported boot methods after defining BootMethod.
6 from provisioningserver.boot.pxe import PXEBootMethod
7 from provisioningserver.boot.uefi import UEFIBootMethod
8-from provisioningserver.boot.ppc64el import PPC64ELBootMethod
9+from provisioningserver.boot.powerkvm import PowerKVMBootMethod
10
11
12 builtin_boot_methods = [
13 PXEBootMethod(),
14 UEFIBootMethod(),
15- PPC64ELBootMethod(),
16+ PowerKVMBootMethod(),
17 ]
18 for method in builtin_boot_methods:
19 BootMethodRegistry.register_item(method.name, method)
20
21=== renamed file 'src/provisioningserver/boot/ppc64el.py' => 'src/provisioningserver/boot/powerkvm.py'
22--- src/provisioningserver/boot/ppc64el.py 2014-05-15 17:39:27 +0000
23+++ src/provisioningserver/boot/powerkvm.py 2014-05-23 16:33:41 +0000
24@@ -1,7 +1,7 @@
25 # Copyright 2014 Canonical Ltd. This software is licensed under the
26 # GNU Affero General Public License version 3 (see the file LICENSE).
27
28-"""PPC64EL Boot Method"""
29+"""PowerKVM Boot Method"""
30
31 from __future__ import (
32 absolute_import,
33@@ -13,7 +13,7 @@
34
35 __metaclass__ = type
36 __all__ = [
37- 'PPC64ELBootMethod',
38+ 'PowerKVMBootMethod',
39 ]
40
41 import glob
42@@ -38,10 +38,10 @@
43 """)
44
45
46-class PPC64ELBootMethod(BootMethod):
47+class PowerKVMBootMethod(BootMethod):
48
49- name = "ppc64el"
50- template_subdir = "ppc64el"
51+ name = "powerkvm"
52+ template_subdir = None
53 bootloader_path = "bootppc64.bin"
54 arch_octet = "00:0C"
55
56@@ -58,7 +58,7 @@
57 return ""
58
59 def install_bootloader(self, destination):
60- """Installs the required files for PPC64EL booting into the
61+ """Installs the required files for PowerKVM booting into the
62 tftproot.
63 """
64 with tempdir() as tmp:
65
66=== renamed file 'src/provisioningserver/boot/tests/test_ppc64el.py' => 'src/provisioningserver/boot/tests/test_powerkvm.py'
67--- src/provisioningserver/boot/tests/test_ppc64el.py 2014-05-15 17:39:27 +0000
68+++ src/provisioningserver/boot/tests/test_powerkvm.py 2014-05-23 16:33:41 +0000
69@@ -1,7 +1,7 @@
70 # Copyright 2014 Canonical Ltd. This software is licensed under the
71 # GNU Affero General Public License version 3 (see the file LICENSE).
72
73-"""Tests for `provisioningserver.boot.ppc64el`."""
74+"""Tests for `provisioningserver.boot.powerkvm`."""
75
76 from __future__ import (
77 absolute_import,
78@@ -22,39 +22,39 @@
79 from maastesting.testcase import MAASTestCase
80 from provisioningserver.boot import (
81 BootMethodInstallError,
82- ppc64el as ppc64el_module,
83+ powerkvm as powerkvm_module,
84 utils,
85 )
86-from provisioningserver.boot.ppc64el import (
87+from provisioningserver.boot.powerkvm import (
88 GRUB_CONFIG,
89- PPC64ELBootMethod,
90+ PowerKVMBootMethod,
91 )
92 from provisioningserver.tests.test_kernel_opts import make_kernel_parameters
93
94
95-class TestPPC64ELBootMethod(MAASTestCase):
96- """Tests `provisioningserver.boot.ppc64el.PPC64ELBootMethod`."""
97+class TestPowerKVMBootMethod(MAASTestCase):
98+ """Tests `provisioningserver.boot.powerkvm.PowerKVMBootMethod`."""
99
100 def test_match_config_path_returns_none(self):
101- method = PPC64ELBootMethod()
102+ method = PowerKVMBootMethod()
103 paths = [factory.getRandomString() for _ in range(3)]
104 for path in paths:
105 self.assertEqual(None, method.match_config_path(path))
106
107 def test_render_config_returns_empty_string(self):
108- method = PPC64ELBootMethod()
109+ method = PowerKVMBootMethod()
110 params = [make_kernel_parameters() for _ in range(3)]
111 for param in params:
112 self.assertEqual("", method.render_config(params))
113
114 def test_install_bootloader_get_package_raises_error(self):
115- method = PPC64ELBootMethod()
116+ method = PowerKVMBootMethod()
117 self.patch(utils, 'get_updates_package').return_value = (None, None)
118 self.assertRaises(
119 BootMethodInstallError, method.install_bootloader, None)
120
121 def test_install_bootloader(self):
122- method = PPC64ELBootMethod()
123+ method = PowerKVMBootMethod()
124 filename = factory.make_name('dpkg')
125 data = factory.getRandomString()
126 tmp = self.make_dir()
127@@ -69,11 +69,11 @@
128
129 mock_get_updates_package = self.patch(utils, 'get_updates_package')
130 mock_get_updates_package.return_value = (data, filename)
131- self.patch(ppc64el_module, 'call_and_check')
132- self.patch(ppc64el_module, 'tempdir').side_effect = tempdir
133+ self.patch(powerkvm_module, 'call_and_check')
134+ self.patch(powerkvm_module, 'tempdir').side_effect = tempdir
135
136 mock_install_bootloader = self.patch(
137- ppc64el_module, 'install_bootloader')
138+ powerkvm_module, 'install_bootloader')
139
140 method.install_bootloader(dest)
141

Subscribers

People subscribed via source and target branches

to all changes: