Merge lp:~johnsca/juju-deployer/series-fix into lp:juju-deployer

[Cory Johns]

When a bundle contains charm URLs with the series embedded that don't match the bundle-level series, deployer didn't honor it and tried to use the bundle series instead.

[Kevin W Monroe (kwmonroe)]

LGTM, +1

review: Approve

[Konstantinos Tsakalozos (kos.tsakalozos)]

LGTM +1

review: Approve

=== modified file 'deployer/charm.py'
--- deployer/charm.py	2016-09-14 02:25:35 +0000
+++ deployer/charm.py	2016-10-24 16:54:17 +0000
@@ -71,6 +71,22 @@
         name = data.get('charm', name)
         if name.startswith('cs:'):
             store_url = name
+            if 'series' not in data:
+                series = deploy_series
+                if ':' in store_url and '/' in store_url:
+                    # attempt to extract series from charm URL
+                    url_parts = store_url.split(':', 1)[1].split('/')
+                    # remove namespace
+                    if url_parts[0].startswith('~'):
+                        url_parts = url_parts[1:]
+                    elif url_parts[0] == 'u':
+                        url_parts = url_parts[2:]
+                    # check for series in URL
+                    if len(url_parts) > 1:
+                        # URL includes series
+                        series = url_parts[0]
+                # update data dict with series
+                data = dict(data, series=series)
         elif name.startswith('local:'):
             # Support vcs charms specifying their
             parts = name[len('local:'):].split('/')
@@ -81,6 +97,7 @@
                 name = parts.pop()
             else:
                 series = deploy_series
+                data = dict(data, series=deploy_series)
             charm_path = path_join(repo_path, series, name)
         elif os.path.isabs(name):
             # charm points to an absolute local path
@@ -90,6 +107,7 @@
             charm_path = path_join(repo_path, series, name)
         else:
             charm_path = path_join(repo_path, deploy_series, name)
+            data = dict(data, series=deploy_series)
 
         if not store_url:
             store_url = data.get('charm_url', None)
@@ -185,7 +203,10 @@
     def series(self):
         if self.data.get('series'):
             return self.data.get('series')
-        metadata_series = self.metadata.get('series')
+        try:
+            metadata_series = self.metadata.get('series')
+        except RuntimeError:
+            metadata_series = None
         if metadata_series:
             return metadata_series[0]
         if self.series_path:

=== modified file 'deployer/tests/test_charm.py'
--- deployer/tests/test_charm.py	2016-05-13 14:16:48 +0000
+++ deployer/tests/test_charm.py	2016-10-24 16:54:17 +0000
@@ -21,6 +21,18 @@
     def test_repo_path(self):
         self.assertIsNone(self.charm.repo_path)
 
+    def test_series(self):
+        def _c(url, deploy_series, data_series):
+            return Charm.from_service(url, None, deploy_series, {
+                'series': data_series,
+            } if data_series else {}).series
+        self.assertEqual('trusty', _c('cs:trusty/ubuntu', None, None))
+        self.assertEqual('trusty', _c('cs:trusty/ubuntu', 'xenial', None))
+        self.assertEqual('xenial', _c('cs:trusty/ubuntu', 'trusty', 'xenial'))
+        self.assertEqual('xenial', _c('cs:ubuntu', 'trusty', 'xenial'))
+        self.assertEqual('trusty', _c('cs:ubuntu', 'trusty', None))
+        self.assertIsNone(_c('cs:ubuntu', None, None))
+
 
 class AbsolutePathCharmTest(Base):
     def setUp(self):