Merge lp:~tvansteenburgh/juju-deployer/abspath-charms into lp:juju-deployer

[Tim Van Steenburgh]

Allow charms to be specified using an absolute local path.

For example:

    services:
        mycharm:
            charm: /tmp/trusty/mycharm

Primary rationale for this is to allow rapid iteration on a charm's amulet
tests, without needing to commit the changes, or even have them under
revision control. For the charm under test, amulet will give deployer an
absolute path, ensuring that the version of the charm that is deployed and
tested is whatever is on disk at the time.

[Marco Ceppi (marcoceppi)]

+1 this will simplify a lot of tools and workloads for people!

review: Approve

=== modified file 'deployer/action/importer.py'
--- deployer/action/importer.py	2015-05-28 13:04:30 +0000
+++ deployer/action/importer.py	2015-07-29 21:29:11 +0000
@@ -3,7 +3,6 @@
 
 from .base import BaseAction
 from ..env import watchers
-from ..errors import UnitErrors
 from ..utils import ErrorExit
 
 
@@ -180,7 +179,9 @@
 
             charm = self.deployment.get_charm_for(svc.name)
             self.log.info(
-                " Deploying service %s using %s", svc.name, charm.charm_url)
+                " Deploying service %s using %s", svc.name,
+                charm.charm_url if not charm.is_absolute() else charm.path
+            )
 
             if svc.unit_placement:
                 # We sorted all the non placed services first, so we only
@@ -217,7 +218,7 @@
             self.env.deploy(
                 svc.name,
                 charm.charm_url,
-                self.deployment.repo_path,
+                charm.repo_path or self.deployment.repo_path,
                 svc.config,
                 svc.constraints,
                 num_units,

=== modified file 'deployer/charm.py'
--- deployer/charm.py	2015-07-21 07:51:43 +0000
+++ deployer/charm.py	2015-07-29 21:29:11 +0000
@@ -70,6 +70,9 @@
             else:
                 series = deploy_series
             charm_path = path_join(repo_path, series, name)
+        elif os.path.isabs(name):
+            # charm points to an absolute local path
+            charm_path = name.rstrip(os.path.sep)
         elif 'series' in data:
             series = data['series']
             charm_path = path_join(repo_path, series, name)
@@ -83,7 +86,7 @@
             cls.log.error(
                 "Service: %s has both charm url: %s and branch: %s specified",
                 name, store_url, branch)
-        if not store_url and not branch:
+        if not store_url and not branch and not os.path.isabs(name):
             cls.log.error(
                 "Service: %s has neither charm url or branch specified",
                 name)
@@ -92,6 +95,31 @@
 
         return cls(name, charm_path, branch, rev, build, store_url)
 
+    def is_absolute(self):
+        """Charm config points to an absolute path on disk.
+
+        """
+        return os.path.isabs(self.name)
+
+    @property
+    def repo_path(self):
+        """The Juju repository path in which this charm resides.
+
+        For most charms this returns None, leaving the repo path to be
+        determined by the Deployment that deploys the charm.
+
+        For charms at an absolute path, however, the repo path is by
+        definition the directory two levels up from the charm. (And the
+        series directory is one level up.) This allows us to deploy
+        charms from anywhere on the filesystem without first gathering them
+        under one repository path.
+
+        """
+        if self.is_absolute():
+            d = os.path.dirname
+            return d(d(self.path))
+        return None
+
     def is_local(self):
         if self._charm_url:
             if self._charm_url.startswith('cs:'):
@@ -124,6 +152,8 @@
         if self._charm_url:
             self._fetch_store_charm()
             return
+        elif self.is_absolute():
+            return
         elif not self.branch:
             self.log.warning("Invalid charm specification %s", self.name)
             return
@@ -141,7 +171,7 @@
 
     @property
     def series_path(self):
-        if not self.is_local():
+        if self.is_absolute() or not self.is_local():
             return None
         return os.path.dirname(self.path)
 

=== modified file 'deployer/env/base.py'
--- deployer/env/base.py	2015-06-18 08:34:12 +0000
+++ deployer/env/base.py	2015-07-29 21:29:11 +0000
@@ -86,6 +86,12 @@
                 fh.flush()
                 params.extend(["--config", fh.name])
             if constraints:
+                if isinstance(constraints, list):
+                    constraints = ' '.join(constraints)
+                if isinstance(constraints, dict):
+                    constraints = ' '.join([
+                        '{}={}'.format(k, v) for k, v in constraints.items()
+                    ])
                 params.extend(['--constraints', constraints])
             if num_units not in (1, None):
                 params.extend(["--num-units", str(num_units)])

=== modified file 'deployer/tests/test_charm.py'
--- deployer/tests/test_charm.py	2014-09-29 14:36:34 +0000
+++ deployer/tests/test_charm.py	2015-07-29 21:29:11 +0000
@@ -9,6 +9,30 @@
 from .base import Base
 
 
+class StoreCharmTest(Base):
+    def setUp(self):
+        self.charm = Charm(
+            'cs:trusty/ubuntu', None, None, None, None)
+
+    def test_is_absolute(self):
+        self.assertFalse(self.charm.is_absolute())
+
+    def test_repo_path(self):
+        self.assertIsNone(self.charm.repo_path)
+
+
+class AbsolutePathCharmTest(Base):
+    def setUp(self):
+        self.charm = Charm(
+            '/tmp/trusty/ubuntu', '/tmp/trusty/ubuntu', None, None, None)
+
+    def test_is_absolute(self):
+        self.assertTrue(self.charm.is_absolute())
+
+    def test_repo_path(self):
+        self.assertEqual('/tmp', self.charm.repo_path)
+
+
 class Bzr(BaseBzr):
 
     def __init__(self, path):