Merge lp:~bac/lpsetup/install-lxc-rename into lp:lpsetup

[Brad Crittenden]

Rename lxc-install to install-lxc.

Rename lxc-install to install-lxc.

[Gary Poster (gary)]

review: Approve

=== modified file 'lpsetup/cli.py'
--- lpsetup/cli.py	2012-07-06 19:18:58 +0000
+++ lpsetup/cli.py	2012-07-09 15:32:22 +0000
@@ -20,7 +20,7 @@
     inithost,
     initlxc,
     initrepo,
-    lxcinstall,
+    install_lxc,
     update,
     version,
     )
@@ -31,7 +31,7 @@
     ('init-host', inithost.SubCommand),
     ('init-lxc', initlxc.SubCommand),
     ('init-repo', initrepo.SubCommand),
-    ('lxc-install', lxcinstall.SubCommand),
+    ('install-lxc', install_lxc.SubCommand),
     ('update', update.SubCommand),
     ('version', version.SubCommand),
     ]

=== modified file 'lpsetup/subcommands/finish_inithost.py'
--- lpsetup/subcommands/finish_inithost.py	2012-07-06 14:59:07 +0000
+++ lpsetup/subcommands/finish_inithost.py	2012-07-09 15:32:22 +0000
@@ -99,10 +99,10 @@
     def steps(self):
         # Break import loop (and break it here because this subcommand is
         # going away soon).
-        import lxcinstall
+        import install_lxc
         return (
             inithost.SubCommand.initialize_step,
-            lxcinstall.SubCommand.fetch_step,
+            install_lxc.SubCommand.fetch_step,
             (setup_bzr_locations_as_root,
              'user', 'lpuser', 'repository'),
             inithost.SubCommand.setup_apt_step,

=== renamed file 'lpsetup/subcommands/lxcinstall.py' => 'lpsetup/subcommands/install_lxc.py'
=== modified file 'lpsetup/tests/subcommands/test_finish_inithost.py'
--- lpsetup/tests/subcommands/test_finish_inithost.py	2012-07-06 14:59:07 +0000
+++ lpsetup/tests/subcommands/test_finish_inithost.py	2012-07-09 15:32:22 +0000
@@ -44,10 +44,10 @@
 
     @property
     def expected_steps(self):
-        from lpsetup.tests.subcommands import test_lxcinstall
+        from lpsetup.tests.subcommands import test_install_lxc
         return (
             test_inithost.initialize_step,
-            test_lxcinstall.fetch_step,
+            test_install_lxc.fetch_step,
             setup_bzr_locations_step,
             test_inithost.setup_apt_step,
             setup_launchpad_step,

=== renamed file 'lpsetup/tests/subcommands/test_lxcinstall.py' => 'lpsetup/tests/subcommands/test_install_lxc.py'
--- lpsetup/tests/subcommands/test_lxcinstall.py	2012-07-05 18:38:51 +0000
+++ lpsetup/tests/subcommands/test_install_lxc.py	2012-07-09 15:32:22 +0000
@@ -2,12 +2,12 @@
 # Copyright 2012 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Tests for the lxcinstall sub command."""
+"""Tests for the install-lxc sub command."""
 
 import unittest
 
 from lpsetup import handlers
-from lpsetup.subcommands import lxcinstall
+from lpsetup.subcommands import install_lxc
 from lpsetup.tests.subcommands import (
     test_inithost,
     test_initlxc,
@@ -19,14 +19,14 @@
 
 
 fetch_step = (
-    lxcinstall.fetch, ['user', 'repository', 'dependencies_dir',
+    install_lxc.fetch, ['user', 'repository', 'dependencies_dir',
         'valid_ssh_keys'])
 create_scripts_step = (
-    lxcinstall.create_scripts, ['lxc_name', 'ssh_key_path', 'user'])
+    install_lxc.create_scripts, ['lxc_name', 'ssh_key_path', 'user'])
 create_lxc_callable, create_lxc_args = test_initlxc.create_lxc_step
 create_lxc_step = (create_lxc_callable, create_lxc_args + ['install_subunit'])
 setup_lxc_step = (
-    lxcinstall.setup_lxc, ['lxc_name', 'ssh_key_path', 'user',
+    install_lxc.setup_lxc, ['lxc_name', 'ssh_key_path', 'user',
     'dependencies_dir', 'repository'])
 
 
@@ -39,9 +39,9 @@
         )
 
 
-class LxcInstallTest(StepsBasedSubCommandTestMixin, unittest.TestCase):
+class InstallLxcTest(StepsBasedSubCommandTestMixin, unittest.TestCase):
 
-    sub_command_class = lxcinstall.SubCommand
+    sub_command_class = install_lxc.SubCommand
     expected_arguments = get_arguments()
     expected_handlers = (
         handlers.handle_user,