Merge lp:~pguimaraes/python-jujuclient/python-jujuclient into lp:python-jujuclient

[Pedro Guimarães]

Juju version 2.5 returns controllers' UUIDs as 'controller-uuid' key
instead of 'uuid'. Set same value for both keys on controller dict if
Juju's minor version is equal or greater than 2.5; this allows
to integrate with newer Jujuversion while keeping backward compatibility.

[lp:~pguimaraes/python-jujuclient/python-jujuclient]

101. By Pedro Guimarães on 2018-08-06

Correcting get_juju_minor_version() to also work with format:
<MAJOR VERSION>.<MINOR VERSION>.<RELEASES>-<SYSTEM INFO>
of juju --version

[Ryan Beisner (1chb1n)]

rbeisner@rby:~/bzr/python-jujuclient$ flake8 jujuclient/
jujuclient/utils.py:9:1: E302 expected 2 blank lines, found 1
jujuclient/utils.py:16:1: E302 expected 2 blank lines, found 1
jujuclient/utils.py:23:1: E302 expected 2 blank lines, found 1
jujuclient/juju2/connector.py:1:1: E902 IndentationError: unindent does not match any outer indentation level
jujuclient/juju2/connector.py:43:1: E305 expected 2 blank lines after class or function definition, found 0
jujuclient/juju2/connector.py:44:8: E999 IndentationError: unexpected indent
jujuclient/juju2/connector.py:44:9: E113 unexpected indentation

review: Needs Fixing

[lp:~pguimaraes/python-jujuclient/python-jujuclient]

102. By Pedro Guimarães on 2018-08-09

Juju version 2.5 returns controllers' UUIDs as 'controller-uuid' flags
instead of 'uuid'. Set same value for both keys on controller dict to
allow it to work with newer version while keeping older format as well.

Revised test-related files. Added py36 testing scenario.

[David Ames (thedac)]

Please have the except catch a KeyError and we can do away with the changes to utils.py

review: Needs Fixing

[lp:~pguimaraes/python-jujuclient/python-jujuclient]

103. By Pedro Guimarães on 2018-08-10

Clean-up of unused methods on jujuclient/utils.py
Update to get KeyError exception on juju2/connector.py

[Ryan Beisner (1chb1n)]

https://bugs.launchpad.net/juju/+bug/1786061

The root cause of this bug was a backward-incompatible change in juju core master (2.5). That change has been reverted and this issue should no longer exist at the current jujuclient release.

Please confirm and report back on that juju bug.

Thank you.

review: Needs Information

Unmerged revisions

103. By Pedro Guimarães on 2018-08-10

Clean-up of unused methods on jujuclient/utils.py
Update to get KeyError exception on juju2/connector.py

102. By Pedro Guimarães on 2018-08-09

Juju version 2.5 returns controllers' UUIDs as 'controller-uuid' flags
instead of 'uuid'. Set same value for both keys on controller dict to
allow it to work with newer version while keeping older format as well.

Revised test-related files. Added py36 testing scenario.

101. By Pedro Guimarães on 2018-08-06

Correcting get_juju_minor_version() to also work with format:
<MAJOR VERSION>.<MINOR VERSION>.<RELEASES>-<SYSTEM INFO>
of juju --version

100. By Pedro Guimarães on 2018-08-06

Added Juju minor version retrieval on utils.py
If minor version is equal or greater than 2.5, then controller['uuid']
equals controller['controller-uuid'] on connector.py

99. By Pedro Guimarães on 2018-08-06

Juju version 2.5 returns controllers' UUIDs as 'controller-uuid' flags
instead of 'uuid'. Set same value for both keys on controller dict to
allow it to work with newer version while keeping older format as well.

=== modified file 'jujuclient/juju2/connector.py'
--- jujuclient/juju2/connector.py	2016-12-08 17:28:26 +0000
+++ jujuclient/juju2/connector.py	2018-08-10 11:55:45 +0000
@@ -40,7 +40,6 @@
             controller_name, remainder = env_name.split(':')
         else:
             raise Exception('Invalid environment name: %s', env_name)
-
         if '/' in remainder:
             owner, model_name = remainder.split('/')
         else:
@@ -62,14 +61,24 @@
         model = self.get_model(controller_name, model_name, owner)
         account = self.get_account(jhome, controller_name)
 
-        return jhome, {
-            'user': account['user'],
-            'password': account.get('password', ''),
-            'environ-uuid': model['model-uuid'],
-            'server-uuid': controller['uuid'],
-            'state-servers': controller['api-endpoints'],
-            'ca-cert': controller['ca-cert'],
-        }
+        # On juju 2.5, uuid value migrated to controller-uuid
+        # therefore, accessing controller[uuid] will raises exception
+        # This check makes sure it will work for both Juju <2.5 and
+        # versions >=2.5
+        try:
+            controller['uuid'] = controller['controller-uuid']
+        except KeyError:
+            # ignore case where controller-uuid does not exist
+            pass
+        finally:
+            return jhome, {
+                'user': account['user'],
+                'password': account.get('password', ''),
+                'environ-uuid': model['model-uuid'],
+                'server-uuid': controller['uuid'],
+                'state-servers': controller['api-endpoints'],
+                'ca-cert': controller['ca-cert'],
+            }
 
     def get_controller(self, controller_name):
         """Return info for the specified or current controller.

=== modified file 'test-requirements.txt'
--- test-requirements.txt	2015-07-09 20:08:51 +0000
+++ test-requirements.txt	2018-08-10 11:55:45 +0000
@@ -2,4 +2,3 @@
 pytest
 flake8
 pytest-cov
-pytest-capturelog

=== modified file 'tox.ini'
--- tox.ini	2016-03-23 03:02:53 +0000
+++ tox.ini	2018-08-10 11:55:45 +0000
@@ -1,6 +1,6 @@
 [tox]
 minversion = 1.8
-envlist = py27,py34,pep8
+envlist = py27,py34,py36,pep8
 
 [testenv]
 usedevelop=True
@@ -12,6 +12,27 @@
 commands=
   py.test -v {posargs}
 
+[testenv:py27]
+basepython = python2.7
+deps = -r{toxinidir}/test-requirements.txt
+setenv =
+        JUJU_TEST_ENV = {env:JUJU_TEST_ENV:"test"}
+        JUJU_DATA = {homedir}/.local/share/juju
+        HOME = {env:HOME}
+commands=
+  py.test -v {posargs}
+
+
+[testenv:py36]
+basepython = python3.6
+deps = -r{toxinidir}/test-requirements.txt
+setenv =
+        JUJU_TEST_ENV = {env:JUJU_TEST_ENV:"test"}
+        JUJU_DATA = {homedir}/.local/share/juju
+        HOME = {env:HOME}
+commands=
+  py.test -v {posargs}
+
 [testenv:docs]
 basepython=python
 changedir=docs/source