Merge lp:~frankban/juju-quickstart/initial-vivid-support into lp:juju-quickstart

[Francesco Banconi]

Use charm store API to retrieve GUI revision.

This branch includes the following small fixes
in preparation for the 1.6 release:

- bump version up to 1.6.0;
- use the charm store API to retrieve the URL
  of the last revision of the juju-gui charm;
- add initial support for vivid: the new series can now
  be selected as default bootstrap node series when
  creating/editing environments.

  Tests: `make check`.

  QA:
  - just run `.venv/bin/python juju-quickstart` as
    usual, locally and on a ec2 environment
    (it would be nice if both precise and trusty
    are used as default series in this QA); check
    that vivid can be added as a default-series
    in the environment edit view; check that
    the last Juju GUI revision is correctly retrieved.

https://codereview.appspot.com/197740043/

[Francesco Banconi (frankban)]

Reviewers: mp+246199_code.launchpad.net,

Message:
Please take a look.

Description:
Use charm store API to retrieve GUI revision.

This branch includes the following small fixes
in preparation for the 1.6 release:

- bump version up to 1.6.0;
- use the charm store API to retrieve the URL
   of the last revision of the juju-gui charm;
- add initial support for vivid: the new series can now
   be selected as default bootstrap node series when
   creating/editing environments.

   Tests: `make check`.

   QA:
   - just run `.venv/bin/python juju-quickstart` as
     usual, locally and on a ec2 environment
     (it would be nice if both precise and trusty
     are used as default series in this QA); check
     that vivid can be added as a default-series
     in the environment edit view; check that
     the last Juju GUI revision is correctly retrieved.

https://code.launchpad.net/~frankban/juju-quickstart/initial-vivid-support/+merge/246199

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/197740043/

Affected files (+38, -28 lines):
   A [revision details]
   M quickstart/__init__.py
   M quickstart/app.py
   M quickstart/netutils.py
   M quickstart/settings.py
   M quickstart/tests/test_app.py
   M quickstart/tests/test_netutils.py

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision:
<email address hidden>
+New revision:
<email address hidden>

Index: quickstart/__init__.py
=== modified file 'quickstart/__init__.py'
--- quickstart/__init__.py 2014-11-10 11:27:04 +0000
+++ quickstart/__init__.py 2015-01-12 14:30:44 +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, 5, 0)
+VERSION = (1, 6, 0)

  def get_version():

Index: quickstart/app.py
=== modified file 'quickstart/app.py'
--- quickstart/app.py 2014-12-16 14:12:44 +0000
+++ quickstart/app.py 2015-01-12 15:00:52 +0000
@@ -386,8 +386,8 @@
            unit.

      If the charm URL is not provided, and the service is not already
deployed,
- the function tries to retrieve it from the charmworld API. In this
case a
- default charm URL is used if charmworld is not available.
+ the function tries to retrieve it from the charm store API. In this
case a
+ default charm URL is used if the charm store service is not available.

      Return a tuple including the following values:
          - charm_url: the charm URL that will be used to deploy the service;
@@ -418,7 +418,7 @@
              else:
                  series = settings.JUJU_GUI_SUPPORTED_SERIES[-1]
              try:
- # Try to get the charm URL from charmworld.
+ # Try to get the charm URL from the charm store API.
                  charm_url = netutils.get_charm_url(series)
              except (IOError, ValueError) as err:
                  # Fall back to the default URL for the current series.

Index:...

[Martin Hilton (martin-hilton)]

LGTM, No QA (yet)

https://codereview.appspot.com/197740043/

[Martin Hilton (martin-hilton)]

On 2015/01/12 18:02:13, martin.hilton wrote:
> LGTM, No QA (yet)

QA OK

https://codereview.appspot.com/197740043/

[Roger Peppe (rogpeppe)]

On 2015/01/12 19:46:50, martin.hilton wrote:
> On 2015/01/12 18:02:13, martin.hilton wrote:
> > LGTM, No QA (yet)

> QA OK

LGTM

https://codereview.appspot.com/197740043/

[Francesco Banconi (frankban)]

*** Submitted:

Use charm store API to retrieve GUI revision.

This branch includes the following small fixes
in preparation for the 1.6 release:

- bump version up to 1.6.0;
- use the charm store API to retrieve the URL
   of the last revision of the juju-gui charm;
- add initial support for vivid: the new series can now
   be selected as default bootstrap node series when
   creating/editing environments.

   Tests: `make check`.

   QA:
   - just run `.venv/bin/python juju-quickstart` as
     usual, locally and on a ec2 environment
     (it would be nice if both precise and trusty
     are used as default series in this QA); check
     that vivid can be added as a default-series
     in the environment edit view; check that
     the last Juju GUI revision is correctly retrieved.

R=martin.hilton, rog
CC=
https://codereview.appspot.com/197740043

https://codereview.appspot.com/197740043/

[Francesco Banconi (frankban)]

Thanks for the reviews!

https://codereview.appspot.com/197740043/

=== modified file 'quickstart/__init__.py'
--- quickstart/__init__.py	2014-11-10 11:27:04 +0000
+++ quickstart/__init__.py	2015-01-12 17:54:09 +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, 5, 0)
+VERSION = (1, 6, 0)
 
 
 def get_version():

=== modified file 'quickstart/app.py'
--- quickstart/app.py	2014-12-16 14:12:44 +0000
+++ quickstart/app.py	2015-01-12 17:54:09 +0000
@@ -386,8 +386,8 @@
           unit.
 
     If the charm URL is not provided, and the service is not already deployed,
-    the function tries to retrieve it from the charmworld API. In this case a
-    default charm URL is used if charmworld is not available.
+    the function tries to retrieve it from the charm store API. In this case a
+    default charm URL is used if the charm store service is not available.
 
     Return a tuple including the following values:
         - charm_url: the charm URL that will be used to deploy the service;
@@ -418,7 +418,7 @@
             else:
                 series = settings.JUJU_GUI_SUPPORTED_SERIES[-1]
             try:
-                # Try to get the charm URL from charmworld.
+                # Try to get the charm URL from the charm store API.
                 charm_url = netutils.get_charm_url(series)
             except (IOError, ValueError) as err:
                 # Fall back to the default URL for the current series.

=== modified file 'quickstart/netutils.py'
--- quickstart/netutils.py	2014-11-12 16:40:54 +0000
+++ quickstart/netutils.py	2015-01-12 17:54:09 +0000
@@ -69,10 +69,10 @@
     Raise an IOError if any problems occur connecting to the API endpoint.
     Raise a ValueError if the API returns invalid data.
     """
-    url = settings.CHARMWORLD_API.format(
+    url = settings.CHARMSTORE_API.format(
         series=series, charm=settings.JUJU_GUI_CHARM_NAME)
-    charm_info = json.loads(urlread(url))
-    charm_url = charm_info.get('charm', {}).get('url')
+    data = json.loads(urlread(url))
+    charm_url = data.get('Id')
     if charm_url is None:
         raise ValueError(b'unable to find the charm URL')
     return charm_url

=== modified file 'quickstart/settings.py'
--- quickstart/settings.py	2014-11-10 11:39:40 +0000
+++ quickstart/settings.py	2015-01-12 17:54:09 +0000
@@ -29,17 +29,19 @@
 UNKNOWN_PLATFORM = object()
 WINDOWS = object()
 
-# The base charmworld API URL containing information about charms.
+# The base charm store API URL containing information about charms.
 # This URL must be formatted with a series and a charm name.
-CHARMWORLD_API = 'http://manage.jujucharms.com/api/3/charm/{series}/{charm}'
+CHARMSTORE_API = (
+    'https://api.jujucharms.com'
+    '/charmstore/v4/{series}/{charm}/meta/id')
 
 # The default Juju GUI charm URLs for each supported series. Used when it is
-# not possible to retrieve the charm URL from the charmworld API, e.g. due to
-# temporary connection/charmworld errors.
+# not possible to retrieve the charm URL from the charm store API, e.g. due to
+# temporary connection/charm store errors.
 # Keep this list sorted by release date (older first).
 DEFAULT_CHARM_URLS = collections.OrderedDict((
-    ('precise', 'cs:precise/juju-gui-97'),
-    ('trusty', 'cs:trusty/juju-gui-9'),
+    ('precise', 'cs:precise/juju-gui-104'),
+    ('trusty', 'cs:trusty/juju-gui-16'),
 ))
 
 # The quickstart app short description.
@@ -62,7 +64,7 @@
 
 # The possible values for the environments.yaml default-series field.
 JUJU_DEFAULT_SERIES = (
-    'precise', 'quantal', 'raring', 'saucy', 'trusty', 'utopic')
+    'precise', 'quantal', 'raring', 'saucy', 'trusty', 'utopic', 'vivid')
 
 # Retrieve the current juju-core home.
 JUJU_HOME = os.getenv('JUJU_HOME', '~/.juju')

=== modified file 'quickstart/tests/test_app.py'
--- quickstart/tests/test_app.py	2014-12-16 14:12:44 +0000
+++ quickstart/tests/test_app.py	2015-01-12 17:54:09 +0000
@@ -922,8 +922,8 @@
                 check_preexisting)
         # There is no need to call status if the environment was just created.
         self.assertFalse(env.get_status.called)
-        # The charm URL has been retrieved from charmworld based on the current
-        # bootstrap node series.
+        # The charm URL has been retrieved from the charm store API based on
+        # the current bootstrap node series.
         self.assertEqual('cs:trusty/juju-gui-42', url)
         mock_get_charm_url.assert_called_once_with(bootstrap_node_series)
         # Since the bootstrap node series is supported by the GUI charm, the
@@ -957,8 +957,8 @@
                 check_preexisting)
         # The environment status has been retrieved.
         env.get_status.assert_called_once_with()
-        # The charm URL has been retrieved from charmworld based on the current
-        # bootstrap node series.
+        # The charm URL has been retrieved from the charm store API based on
+        # the current bootstrap node series.
         self.assertEqual('cs:precise/juju-gui-42', url)
         mock_get_charm_url.assert_called_once_with(bootstrap_node_series)
         # Since the bootstrap node series is supported by the GUI charm, the
@@ -1012,8 +1012,8 @@
             url, machine, service_data, unit_data = app.check_environment(
                 env, 'my-gui', charm_url, env_type, bootstrap_node_series,
                 check_preexisting)
-        # The charm URL has been retrieved from charmworld using the most
-        # recent supported series.
+        # The charm URL has been retrieved from the charm store API using the
+        # most recent supported series.
         self.assertEqual('cs:trusty/juju-gui-42', url)
         mock_get_charm_url.assert_called_once_with('trusty')
         # The Juju GUI unit cannot be deployed to saucy machine 0.
@@ -1037,7 +1037,7 @@
             url, machine, service_data, unit_data = app.check_environment(
                 env, 'my-gui', charm_url, env_type, bootstrap_node_series,
                 check_preexisting)
-        # The charm URL has been correctly retrieved from charmworld.
+        # The charm URL has been correctly retrieved from the charm store API.
         self.assertEqual('cs:trusty/juju-gui-42', url)
         # The Juju GUI unit cannot be deployed to localhost.
         self.assertIsNone(machine)
@@ -1058,7 +1058,7 @@
 
     def test_default_charm_url(self, mock_print):
         # A default charm URL suitable to be deployed in the bootstrap node is
-        # returned if the charmworld API is not reachable.
+        # returned if the charm store API is not reachable.
         env = self.make_env()
         charm_url = None
         env_type = 'ec2'
@@ -1074,7 +1074,7 @@
 
     def test_most_recent_default_charm_url(self, mock_print):
         # The default charm URL corresponding to the most recent series
-        # supported by the GUI is returned if the charmworld API is not
+        # supported by the GUI is returned if the charm store API is not
         # reachable and the bootstrap node cannot host the Juju GUI unit.
         env = self.make_env()
         charm_url = None

=== modified file 'quickstart/tests/test_netutils.py'
--- quickstart/tests/test_netutils.py	2014-11-12 16:40:54 +0000
+++ quickstart/tests/test_netutils.py	2015-01-12 17:54:09 +0000
@@ -107,12 +107,17 @@
 
     def test_charm_url(self):
         # The Juju GUI charm URL is correctly returned.
-        contents = json.dumps({'charm': {'url': 'cs:trusty/juju-gui-42'}})
+        contents = json.dumps({
+            'Id': 'cs:trusty/juju-gui-42',
+            'Series': 'trusty',
+            'Name': 'juju-gui',
+            'Revision': 42,
+        })
         with self.patch_urlread(contents=contents) as mock_urlread:
             charm_url = netutils.get_charm_url('trusty')
         self.assertEqual('cs:trusty/juju-gui-42', charm_url)
         mock_urlread.assert_called_once_with(
-            'http://manage.jujucharms.com/api/3/charm/trusty/juju-gui')
+            'https://api.jujucharms.com/charmstore/v4/trusty/juju-gui/meta/id')
 
     def test_io_error(self):
         # IOErrors are properly propagated.
@@ -120,17 +125,18 @@
             with self.assertRaises(IOError) as context_manager:
                 netutils.get_charm_url('precise')
         mock_urlread.assert_called_once_with(
-            'http://manage.jujucharms.com/api/3/charm/precise/juju-gui')
+            'https://api.jujucharms.com/charmstore/v4/precise/juju-gui/meta/id'
+        )
         self.assertEqual('bad wolf', bytes(context_manager.exception))
 
     def test_value_error(self):
         # A ValueError is raised if the API response is not valid.
-        contents = json.dumps({'charm': {}})
+        contents = json.dumps({'invalid': {}})
         with self.patch_urlread(contents=contents) as mock_urlread:
             with self.assertRaises(ValueError) as context_manager:
                 netutils.get_charm_url('trusty')
         mock_urlread.assert_called_once_with(
-            'http://manage.jujucharms.com/api/3/charm/trusty/juju-gui')
+            'https://api.jujucharms.com/charmstore/v4/trusty/juju-gui/meta/id')
         self.assertEqual(
             'unable to find the charm URL', bytes(context_manager.exception))