Merge lp:~timkuhlman/python-jujuclient/model-owner into lp:python-jujuclient

[Tim Kuhlman]

Use the model owner in the model name if it is available.

[Tim Van Steenburgh (tvansteenburgh)]

+1, thanks!

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2016-07-12 02:28:46 +0000
+++ .bzrignore	2016-09-21 20:07:41 +0000
@@ -15,3 +15,4 @@
 juju-backup-20150709-202028.tar.gz
 __pycache__
 .cache
+.idea

=== modified file 'jujuclient/juju2/connector.py'
--- jujuclient/juju2/connector.py	2016-08-30 21:54:13 +0000
+++ jujuclient/juju2/connector.py	2016-09-21 20:07:41 +0000
@@ -22,7 +22,8 @@
 
     def _parse_env_name(self, env_name):
         """Given an environment name such as is returned from `juju switch`,
-        return a tuple of (controller_name, model_name).
+        return a tuple of (controller_name, model_name, owner). In many cases
+        owner is set to None.
 
         Handles any of these formats::
 
@@ -30,17 +31,18 @@
             controller:user@local/model
 
         """
+        owner = None
         if ':' in env_name:
             controller_name, remainder = env_name.split(':')
         else:
             raise Exception('Invalid environment name: %s', env_name)
 
         if '/' in remainder:
-            _, model_name = remainder.split('/')
+            owner, model_name = remainder.split('/')
         else:
             model_name = remainder
 
-        return controller_name, model_name
+        return controller_name, model_name, owner
 
     def parse_env(self, env_name):
         """Provide API and access details for a juju2 model.
@@ -52,9 +54,9 @@
         jhome = os.path.expanduser(
             os.environ.get('JUJU_DATA', '~/.local/share/juju'))
 
-        controller_name, model_name = self._parse_env_name(env_name)
+        controller_name, model_name, owner = self._parse_env_name(env_name)
         controller = self.get_controller(controller_name)
-        model = self.get_model(controller_name, model_name)
+        model = self.get_model(controller_name, model_name, owner)
         account = self.get_account(jhome, controller_name)
 
         return jhome, {
@@ -81,11 +83,14 @@
                 "Controller '{}' not found in `juju list-controllers`".format(
                     controller_name))
 
-    def get_model(self, controller_name, model_name):
+    def get_model(self, controller_name, model_name, owner):
         """Return info for the specified or current model.
 
         """
-        model = '{}:{}'.format(controller_name, model_name)
+        if owner is None:
+            model = '{}:{}'.format(controller_name, model_name)
+        else:
+            model = '{}:{}/{}'.format(controller_name, owner, model_name)
         try:
             # post beta16 format
             output = utils.check_output(