Merge lp:~frankban/juju-quickstart/distro-only-flag into lp:juju-quickstart

[Francesco Banconi]

Add the distro-only flag.

This can be used (e.g. in trusty) to
prevent quickstart from installing
the Juju stable PPA.

Tests: `make check`.

No QA required, I already tested this on
a trusty VM.

https://codereview.appspot.com/81400043/

[Richard Harding (rharding)]

LGTM thanks for the quick update.

https://codereview.appspot.com/81400043/

[Francesco Banconi (frankban)]

*** Submitted:

Add the distro-only flag.

This can be used (e.g. in trusty) to
prevent quickstart from installing
the Juju stable PPA.

Tests: `make check`.

No QA required, I already tested this on
a trusty VM.

R=rharding
CC=
https://codereview.appspot.com/81400043

https://codereview.appspot.com/81400043/

[Francesco Banconi (frankban)]

Hi Rick, thanks for the review!

https://codereview.appspot.com/81400043/

=== modified file 'quickstart/__init__.py'
--- quickstart/__init__.py	2014-03-14 16:50:22 +0000
+++ quickstart/__init__.py	2014-03-27 11:09:37 +0000
@@ -45,7 +45,7 @@
 Once Juju has been installed, the command can also be run as a juju plugin,
 without the hyphen ("juju quickstart").
 """
-VERSION = (1, 2, 0)
+VERSION = (1, 3, 0)
 
 
 def get_version():

=== modified file 'quickstart/app.py'
--- quickstart/app.py	2014-03-11 12:47:44 +0000
+++ quickstart/app.py	2014-03-27 11:09:37 +0000
@@ -57,11 +57,16 @@
         return b'juju-quickstart: error: {}'.format(self.message)
 
 
-def ensure_dependencies():
+def ensure_dependencies(distro_only):
     """Ensure that Juju and LXC are installed.
 
-    If juju is not found in the PATH, then add the juju stable PPA and install
-    both juju and lxc.
+    If the "juju" command is not found in the PATH, then install and setup
+    Juju, including the packages required to bootstrap local environments.
+    This is usually done by adding the Juju stable PPA and installing the
+    juju-core and juju-local packages.
+
+    If distro_only is True, the above PPA is not added to the apt sources, and
+    we assume Juju packages are already available in the distro repository.
 
     Return the Juju version tuple when Juju is available.
 
@@ -87,10 +92,11 @@
             # All those packages are installed as juju-local dependencies.
             required_packages.append('juju-local')
     if required_packages:
-        try:
-            utils.add_apt_repository('ppa:juju/stable')
-        except OSError as err:
-            raise ProgramExit(bytes(err))
+        if not distro_only:
+            try:
+                utils.add_apt_repository('ppa:juju/stable')
+            except OSError as err:
+                raise ProgramExit(bytes(err))
         print('sudo privileges will be used for the installation of \n'
               'the following packages: {}\n'
               'this can take a while...'.format(', '.join(required_packages)))

=== modified file 'quickstart/manage.py'
--- quickstart/manage.py	2014-03-14 16:50:22 +0000
+++ quickstart/manage.py	2014-03-27 11:09:37 +0000
@@ -299,6 +299,7 @@
         - bundle: the optional bundle (path or URL) to be deployed;
         - charm_url: the Juju GUI charm URL or None if not specified;
         - debug: whether debug mode is activated;
+        - distro_only: install Juju only using the distribution packages;
         - env_file: the absolute path of the Juju environments.yaml file;
         - env_name: the name of the Juju environment to use;
         - env_type: the provider type of the selected Juju environment;
@@ -375,6 +376,9 @@
         '--no-browser', action='store_false', dest='open_browser',
         help='Avoid opening the browser to the GUI at the end of the\nprocess')
     parser.add_argument(
+        '--distro-only', action='store_true', dest='distro_only',
+        help='Do not use external sources when installing and setting up Juju')
+    parser.add_argument(
         '--version', action='version', version='%(prog)s {}'.format(version))
     parser.add_argument(
         '--debug', action='store_true',
@@ -408,7 +412,7 @@
             options.bundle_name, len(options.bundle_services)))
 
     logging.debug('ensuring juju and lxc are installed')
-    juju_version = app.ensure_dependencies()
+    juju_version = app.ensure_dependencies(options.distro_only)
 
     logging.debug('ensuring SSH keys are available')
     app.ensure_ssh_keys()

=== modified file 'quickstart/tests/test_app.py'
--- quickstart/tests/test_app.py	2014-03-11 12:47:44 +0000
+++ quickstart/tests/test_app.py	2014-03-27 11:09:37 +0000
@@ -67,7 +67,7 @@
     add_repository = '/usr/bin/add-apt-repository'
     apt_get = '/usr/bin/apt-get'
 
-    def call_ensure_dependencies(self, call_effects):
+    def call_ensure_dependencies(self, call_effects, distro_only=False):
         """Execute the quickstart.app.ensure_dependencies call.
 
         The call_effects argument is used to customize the values returned by
@@ -76,7 +76,7 @@
         Return the mock call object and the ensure_dependencies return value.
         """
         with self.patch_multiple_calls(call_effects) as mock_call:
-            juju_version = app.ensure_dependencies()
+            juju_version = app.ensure_dependencies(distro_only)
         return mock_call, juju_version
 
     def test_success_install(self, mock_print):
@@ -112,6 +112,28 @@
         ])
         self.assertEqual((1, 18, 0), juju_version)
 
+    def test_distro_only_install(self, mock_print):
+        # All the missing packages are installed from the distro repository.
+        side_effects = (
+            (127, '', 'no juju'),  # Retrieve the Juju version.
+            (0, 'install', ''),  # Install missing packages.
+            (0, '1.17.42', ''),  # Retrieve the version again.
+        )
+        mock_call, juju_version = self.call_ensure_dependencies(
+            side_effects, distro_only=True)
+        self.assertEqual(len(side_effects), mock_call.call_count)
+        mock_call.assert_has_calls([
+            mock.call(settings.JUJU_CMD, 'version'),
+            mock.call('sudo', self.apt_get, 'install', '-y',
+                      'juju-core', 'juju-local'),
+            mock.call(settings.JUJU_CMD, 'version'),
+        ])
+        mock_print.assert_called_once_with(
+            'sudo privileges will be used for the installation of \n'
+            'the following packages: juju-core, juju-local\n'
+            'this can take a while...')
+        self.assertEqual((1, 17, 42), juju_version)
+
     def test_success_no_install(self, mock_print):
         # There is no need to install packages/PPAs if everything is already
         # set up.
@@ -158,6 +180,28 @@
         ])
         self.assertEqual((1, 16, 42), juju_version)
 
+    def test_distro_only_partial_install(self, mock_print):
+        # One missing installation is correctly handled when using distro only
+        # packages.
+        side_effects = (
+            (0, '1.16.42', ''),  # Check the juju command.
+            (127, '', 'no lxc'),  # Check the lxc-ls command.
+            (0, 'install', ''),  # Install missing packages.
+        )
+        mock_call, juju_version = self.call_ensure_dependencies(
+            side_effects, distro_only=True)
+        self.assertEqual(len(side_effects), mock_call.call_count)
+        mock_call.assert_has_calls([
+            mock.call(settings.JUJU_CMD, 'version'),
+            mock.call('/usr/bin/lxc-ls'),
+            mock.call('sudo', self.apt_get, 'install', '-y', 'juju-local'),
+        ])
+        mock_print.assert_called_once_with(
+            'sudo privileges will be used for the installation of \n'
+            'the following packages: juju-local\n'
+            'this can take a while...')
+        self.assertEqual((1, 16, 42), juju_version)
+
     def test_add_repository_failure(self, mock_print):
         # A ProgramExit is raised if the PPA is not successfully installed.
         side_effects = (
@@ -696,7 +740,7 @@
         # Set up the add_unit return value.
         if unit_name is not None:
             env.add_unit.return_value = {'Units': [unit_name]}
-        #Set up the get_status return value.
+        # Set up the get_status return value.
         status = []
         if service_data is not None:
             status.append(self.make_service_change(data=service_data))