launchpad-reviewers team mailing list archive

[Daniel Manrique <daniel.manrique@xxxxxxxxxxxxx>]

Daniel Manrique has proposed merging lp:~roadmr/canonical-mojo-specs/lp-snap-proxy-novaclient-v2 into lp:~canonical-launchpad-branches/canonical-mojo-specs/trunk.

Commit message:
Try novaclient v2 and fall back to v1_1 if not present.

Should solve CI problems when the Mojo host uses Xenial where novaclient.v1_1 has been superseded by v2 e.g. https://jenkins.canonical.com/is-mojo-ci-xenial/job/live-lp-snap-proxy/159/console

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~roadmr/canonical-mojo-specs/lp-snap-proxy-novaclient-v2/+merge/318412

Try novaclient v2 and fall back to v1_1 if not present.

Should solve CI problems when the Mojo host uses Xenial where novaclient.v1_1 has been superseded by v2 e.g. https://jenkins.canonical.com/is-mojo-ci-xenial/job/live-lp-snap-proxy/159/console
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~roadmr/canonical-mojo-specs/lp-snap-proxy-novaclient-v2 into lp:~canonical-launchpad-branches/canonical-mojo-specs/trunk.

=== modified file 'scripts/utils/mojo_os_utils.py'
--- scripts/utils/mojo_os_utils.py	2016-07-11 21:10:17 +0000
+++ scripts/utils/mojo_os_utils.py	2017-02-27 21:47:43 +0000
@@ -3,7 +3,10 @@
 import swiftclient
 from keystoneclient.v2_0 import client as keystoneclient
 import mojo_utils
-from novaclient.v1_1 import client as novaclient
+try:
+    from novaclient import client as novaclient
+except ImportError:
+    from novaclient.v1_1 import client as novaclient
 from neutronclient.v2_0 import client as neutronclient
 import logging
 import re