Merge lp:~jtv/maas/drop-install-pxe-bootloader into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Drop the install-pxe-bootloader provisioning command. It's been there, essentially unchanged, since 2012 and we no longer use it anywhere.

This is a lot less exciting than I thought. The actual code underlying the command is still used, although the provisioning command as such isn't. And so all that goes away is the scaffolding that makes it a provisioning command.

Also unused and unmentioned are provisioning commands customize-config and install-uefi-config. Of these, the former is a utility that may still come in handy at some point in the future (though hopefully not — we don't want more shell code). The latter is new, and so there may be a plan for it. I'm leaving these two items untouched.

Jeroen

[Raphaël Badin (rvb)]

review: Approve

=== modified file 'src/provisioningserver/__main__.py'
--- src/provisioningserver/__main__.py	2014-03-28 04:43:57 +0000
+++ src/provisioningserver/__main__.py	2014-03-31 10:35:56 +0000
@@ -30,7 +30,6 @@
     'atomic-write': AtomicWriteScript,
     'customize-config': provisioningserver.customize_config,
     'generate-dhcp-config': provisioningserver.dhcp.writer,
-    'install-pxe-bootloader': provisioningserver.boot.install_bootloader,
     'install-uefi-config': provisioningserver.boot.install_grub,
     'start-cluster-controller': provisioningserver.start_cluster_controller,
     'upgrade-cluster': provisioningserver.upgrade_cluster,

=== modified file 'src/provisioningserver/boot/install_bootloader.py'
--- src/provisioningserver/boot/install_bootloader.py	2014-03-28 06:51:59 +0000
+++ src/provisioningserver/boot/install_bootloader.py	2014-03-31 10:35:56 +0000
@@ -13,8 +13,8 @@
 
 __metaclass__ = type
 __all__ = [
-    "add_arguments",
-    "run",
+    "install_bootloader",
+    "make_destination",
     ]
 
 import filecmp
@@ -22,7 +22,6 @@
 from shutil import copyfile
 
 from provisioningserver.boot.tftppath import locate_tftp_path
-from provisioningserver.config import Config
 
 
 def make_destination(tftproot):
@@ -78,21 +77,3 @@
         os.remove(temp_file)
     copyfile(loader, temp_file)
     os.rename(temp_file, destination)
-
-
-def add_arguments(parser):
-    parser.add_argument(
-        '--loader', dest='loader', default=None,
-        help="Pre-boot loader to install.")
-
-
-def run(args):
-    """Install a pre-boot loader into the TFTP directory structure.
-
-    This won't overwrite an existing loader if its contents are unchanged.
-    """
-    config = Config.load(args.config_file)
-    tftproot = config["tftp"]["resource_root"]
-    destination_path = make_destination(tftproot)
-    destination = os.path.join(destination_path, os.path.basename(args.loader))
-    install_bootloader(args.loader, destination)

=== modified file 'src/provisioningserver/boot/tests/test_install_bootloader.py'
--- src/provisioningserver/boot/tests/test_install_bootloader.py	2014-03-28 04:31:32 +0000
+++ src/provisioningserver/boot/tests/test_install_bootloader.py	2014-03-31 10:35:56 +0000
@@ -22,41 +22,24 @@
     age_file,
     get_write_time,
     )
-import provisioningserver.boot.install_bootloader
 from provisioningserver.boot.install_bootloader import (
     install_bootloader,
     make_destination,
     )
-from provisioningserver.boot.tftppath import locate_tftp_path
-from provisioningserver.testing.config import set_tftp_root
-from provisioningserver.utils import MainScript
 from testtools.matchers import (
     DirExists,
     FileContains,
-    FileExists,
     )
 
 
 class TestInstallBootloader(MAASTestCase):
 
     def test_integration(self):
-        tftproot = self.make_dir()
-        config_fixture = self.useFixture(set_tftp_root(tftproot))
-
-        loader = self.make_file()
-
-        action = factory.make_name("action")
-        script = MainScript(action)
-        script.register(action, provisioningserver.boot.install_bootloader)
-        script.execute(
-            ("--config-file", config_fixture.filename, action,
-             "--loader", loader))
-
-        bootloader_filename = os.path.basename(loader)
-        self.assertThat(
-            locate_tftp_path(
-                bootloader_filename, tftproot=tftproot),
-            FileExists())
+        loader_contents = factory.getRandomString()
+        loader = self.make_file(contents=loader_contents)
+        destination = self.make_file()
+        install_bootloader(loader, destination)
+        self.assertThat(destination, FileContains(loader_contents))
 
     def test_make_destination_creates_directory_if_not_present(self):
         tftproot = self.make_dir()