Merge lp:~fginther/juju-deployer/juju-2-minimal into lp:juju-deployer

[Francis Ginther]

Add basic support for juju 2 controllers.

Add basic support for juju 2 controllers.

Adds the ability to deploy to Juju 2 models. Does not support bootstrapping of a juju 2 cloud. Also, deploying to models other then the controller's admin model will run into lp:1560201 until it is resolved.

[Tim Van Steenburgh (tvansteenburgh)]

LGTM!

review: Approve

=== modified file 'deployer/cli.py'
--- deployer/cli.py	2015-09-23 15:32:46 +0000
+++ deployer/cli.py	2016-04-01 12:01:16 +0000
@@ -17,7 +17,8 @@
 from deployer.config import ConfigStack
 from deployer.env import select_runtime
 from deployer.action import diff, importer
-from deployer.utils import ErrorExit, setup_logging, get_env_name
+from deployer.utils import (
+    ErrorExit, setup_logging, get_env_name, get_juju_major_version)
 
 
 def setup_parser():
@@ -83,7 +84,9 @@
         dest="deploy_delay", default=0)
     parser.add_argument(
         '-e', '--environment', action='store', dest='juju_env',
-        help='Deploy to a specific Juju environment.',
+        help=('Deploy to a specific Juju environment or model. '
+              'For Juju 2 models, must be specified with the '
+              '<controller>:<model> notation.'),
         default=os.getenv('JUJU_ENV'))
     parser.add_argument(
         '-o', '--override', action='append', type=str,
@@ -165,6 +168,15 @@
         sys.exit(1)
     log.debug('Using runtime %s on %s', env.__class__.__name__, env_name)
 
+    if get_juju_major_version() == 2:
+        if len(env_name.split(':')) != 2:
+            log.error("Juju 2 environment names must be in "
+                      "<controller>:<model> format.")
+            sys.exit(1)
+        if options.bootstrap:
+            log.error("Bootstrap of a Juju 2 cloud is not supported.")
+            sys.exit(1)
+
     config = ConfigStack(options.configs or [], options.series)
 
     # Destroy services and exit

=== modified file 'deployer/env/base.py'
--- deployer/env/base.py	2015-09-23 15:32:46 +0000
+++ deployer/env/base.py	2016-04-01 12:01:16 +0000
@@ -2,7 +2,7 @@
 
 from ..utils import (
     _get_juju_home, path_join, yaml_load, ErrorExit,
-    yaml_dump, temp_file, _check_call)
+    yaml_dump, temp_file, _check_call, get_juju_major_version)
 
 
 class BaseEnvironment(object):
@@ -21,8 +21,12 @@
         return _check_call(*args, **kwargs)
 
     def _named_env(self, params):
+        if get_juju_major_version() == 1:
+            flag = "-e"
+        else:
+            flag = "-m"
         if self.name:
-            params.extend(["-e", self.name])
+            params.extend([flag, self.name])
         return params
 
     def _get_env_config(self):
@@ -51,16 +55,24 @@
 #        fh.write(yaml_dump(config))
 #        fh.flush()
 
+    def _get_agent_state(self, entity):
+        try:
+            return entity['agent-state']
+        except KeyError:
+            # 'agent-state' has been removed for new versions of Juju. Respond
+            # with the closest status parameter.
+            return entity['jujustatus']['Current']
+
     def _get_units_in_error(self, status=None):
         units = []
         if status is None:
             status = self.status()
         for s in status.get('services', {}).keys():
             for uid, u in status['services'][s].get('units', {}).items():
-                if 'error' in u['agent-state']:
+                if 'error' in self._get_agent_state(u):
                     units.append(uid)
                 for uid, u in u.get('subordinates', {}).items():
-                    if 'error' in u['agent-state']:
+                    if 'error' in self._get_agent_state(u):
                         units.append(uid)
         return units
 
@@ -124,7 +136,11 @@
            (mid.isdigit() and int(mid) == 0)):
             # Don't kill state server
             raise RuntimeError("Can't terminate machine 0")
-        params = self._named_env(["juju", "terminate-machine"])
+        if get_juju_major_version() == 1:
+            terminate_action = "terminate-machine"
+        else:
+            terminate_action = "remove-machine"
+        params = self._named_env(["juju", terminate_action])
         params.append(mid)
         if force:
             params.append('--force')

=== modified file 'deployer/env/go.py'
--- deployer/env/go.py	2015-09-23 15:32:46 +0000
+++ deployer/env/go.py	2016-04-01 12:01:16 +0000
@@ -3,6 +3,7 @@
 from .base import BaseEnvironment
 from ..utils import (
     ErrorExit,
+    get_juju_major_version,
     parse_constraints,
 )
 
@@ -26,6 +27,7 @@
         self.options = options
         self.api_endpoint = endpoint
         self.client = None
+        self.juju_version = get_juju_major_version()
 
     def add_machine(self, series="", constraints={}):
         """Add a top level machine to the Juju environment.
@@ -54,11 +56,16 @@
         if self.client:
             self.client.close()
 
+
     def connect(self):
         self.log.debug("Connecting to environment...")
+        if self.juju_version == 1:
+            cmd = ["juju", "api-endpoints"]
+        else:
+            cmd = ["juju", "get-model-config"]
         with open("/dev/null", 'w') as fh:
             self._check_call(
-                self._named_env(["juju", "api-endpoints"]),
+                self._named_env(cmd),
                 self.log, "Error getting env api endpoints, env bootstrapped?",
                 stderr=fh)
 

=== modified file 'deployer/env/watchers.py'
--- deployer/env/watchers.py	2014-02-18 12:16:46 +0000
+++ deployer/env/watchers.py	2016-04-01 12:01:16 +0000
@@ -2,7 +2,11 @@
 
 from jujuclient import WatchWrapper
 
-from ..utils import ErrorExit
+from ..utils import ErrorExit, get_juju_major_version
+
+# _status_map provides a translation of Juju 2 status codes to the closest
+# Juju 1 equivalent. Only defines codes that need translation.
+_status_map = {'idle': 'started'}
 
 
 class WaitForMachineTermination(WatchWrapper):
@@ -66,7 +70,15 @@
         on_errors = self.on_errors
         units_in_error = self.units_in_error
         for unit_name, data in self.units.items():
-            status = data['Status']
+            try:
+                status = data['Status']
+            except KeyError:
+                # 'Status' has been removed from newer versions of Juju.
+                # Respond with the closest status parameter, translating it
+                # through the _status_map. If the status value is not in
+                # _status_map, just use the original value.
+                status = data['JujuStatus']['Current']
+                status = _status_map.get(status, status)
             if status == 'error':
                 if unit_name not in units_in_error:
                     units_in_error.append(unit_name)

=== modified file 'deployer/tests/test_goenv.py'
--- deployer/tests/test_goenv.py	2015-09-23 15:32:46 +0000
+++ deployer/tests/test_goenv.py	2016-04-01 12:01:16 +0000
@@ -72,7 +72,12 @@
             services)
         for s in services:
             for k, u in status['services'][s]['units'].items():
-                self.assertIn(u['agent-state'], ("allocating", "started"))
+                try:
+                    self.assertIn(u['agent-state'],
+                                  ("allocating", "pending", "started"))
+                except KeyError:
+                    self.assertIn(u['jujustatus']['Current'],
+                                  ("allocating", "idle"))
 
     def test_add_machine(self):
         machine_name = self.env.add_machine()

=== modified file 'deployer/utils.py'
--- deployer/utils.py	2016-01-11 13:35:47 +0000
+++ deployer/utils.py	2016-04-01 12:01:16 +0000
@@ -244,6 +244,22 @@
         jhome = path_join(os.environ.get('HOME'), '.juju')
     return jhome
 
+_juju_major_version = None
+def get_juju_major_version():
+    global _juju_major_version
+    if _juju_major_version is None:
+        log = logging.getLogger("deployer.utils")
+        _juju_major_version = int(_check_call(
+            ["juju", "--version"], log).split('.')[0])
+    return _juju_major_version
+
+
+def get_juju_default_env():
+    if get_juju_major_version() == 1:
+        return os.environ.get("JUJU_ENV")
+    else:
+        return os.environ.get("JUJU_MODEL")
+
 
 def _check_call(params, log, *args, **kw):
     max_retry = kw.get('max_retry', None)
@@ -365,20 +381,25 @@
     """
     if param_env_name:
         return param_env_name
-    elif os.environ.get("JUJU_ENV"):
-        return os.environ['JUJU_ENV']
-
-    juju_home = _get_juju_home()
-    env_ptr = os.path.join(juju_home, "current-environment")
-    if os.path.exists(env_ptr):
-        with open(env_ptr) as fh:
-            return fh.read().strip()
-
-    with open(os.path.join(juju_home, 'environments.yaml')) as fh:
-        conf = yaml_load(fh.read())
-        if not 'default' in conf:
-            raise ValueError("No Environment specified")
-        return conf['default']
+    elif get_juju_default_env():
+        return get_juju_default_env()
+
+    if get_juju_major_version() == 1:
+        juju_home = _get_juju_home()
+        env_ptr = os.path.join(juju_home, "current-environment")
+        if os.path.exists(env_ptr):
+            with open(env_ptr) as fh:
+                return fh.read().strip()
+
+        with open(os.path.join(juju_home, 'environments.yaml')) as fh:
+            conf = yaml_load(fh.read())
+            if not 'default' in conf:
+                raise ValueError("No Environment specified")
+            return conf['default']
+    else:
+        # Return the juju2 controller:model combo
+        log = logging.getLogger("deployer.utils")
+        return _check_call(["juju", "switch"], log).strip()
 
 
 def x_in_y(x, y):