Merge lp:~ajkavanagh/openstack-mojo-specs/mojo-openstack-specs-fix-novaclient into lp:openstack-mojo-specs

[Alex Kavanagh]

On a xenial test running, the xenial package for novaclient no longer includes the novaclient.v1_1 or .v2 modules - they've been deprecated for a while. This change changes the import and uses the newer client - this should be compatible with both trusty and xenial test runners, but may break precise test runners. This does NOT affect precise units under test as the code change only runs on the test runner.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #2262 mojo-openstack-specs for ajkavanagh mp291734
    LINT OK: passed

Build: http://10.245.162.36:8080/job/charm_lint_check/2262/

[Ryan Beisner (1chb1n)]

We will need to run this "live" in osci against some edges to make sure the updated client approach works with Precise --> Xenial test targets. Please wait to merge until I confirm here. Thank you.

review: Needs Information

[Ryan Beisner (1chb1n)]

Looks good in spot checks @ Precise (stable charms) and a few Trusty-* combos. Thanks for the mods!

review: Approve

=== modified file 'helper/utils/mojo_os_utils.py'
--- helper/utils/mojo_os_utils.py	2016-04-05 03:40:36 +0000
+++ helper/utils/mojo_os_utils.py	2016-04-13 11:01:03 +0000
@@ -7,8 +7,7 @@
 from keystoneclient.v3 import client as keystoneclient_v3
 from keystoneclient import session
 import mojo_utils
-from novaclient.v1_1 import client as novaclient
-from novaclient.v2 import client as novaclient_v2
+from novaclient import client as novaclient_client
 from neutronclient.v2_0 import client as neutronclient
 import logging
 import re
@@ -78,11 +77,12 @@
 def get_nova_client(novarc_creds, insecure=True):
     nova_creds = get_nova_creds(novarc_creds)
     nova_creds['insecure'] = insecure
-    return novaclient.Client(**nova_creds)
+    nova_creds['version'] = 2
+    return novaclient_client.Client(**nova_creds)
 
 
 def get_nova_session_client(session):
-    return novaclient_v2.Client(session=session)
+    return novaclient_client.Client(2, session=session)
 
 
 def get_neutron_client(novarc_creds, insecure=True):