From b8603c8d1db01e54faa9bbe9e4d12f8d9d494e3c Mon Sep 17 00:00:00 2001
From: Andrey Kurilin <andr.kurilin@gmail.com>
Date: Tue, 21 Jun 2016 21:47:31 +0300
Subject: [PATCH] Fix wrong usage of novaclient

novaclient.client.Client is a documented way to initialize novaclient.
Also, it provides a backward compatible layer.

Change-Id: Ibeefe215ff1405d1e6bc478fee415b530813d86c
Closes-Bug: #1493576
---
 os_cloud_config/cmd/utils/tests/test_clients.py |  4 ++--
 os_cloud_config/utils/clients.py                | 10 +++-------
 os_cloud_config/utils/tests/test_clients.py     |  4 ++--
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/os_cloud_config/cmd/utils/tests/test_clients.py b/os_cloud_config/cmd/utils/tests/test_clients.py
index 0eaec64..beeea36 100644
--- a/os_cloud_config/cmd/utils/tests/test_clients.py
+++ b/os_cloud_config/cmd/utils/tests/test_clients.py
@@ -43,10 +43,10 @@ class CMDClientsTest(base.TestCase):
             ca_file=environ.get("OS_CACERT"))
 
     @mock.patch('os.environ')
-    @mock.patch('novaclient.v2.client.Client')
+    @mock.patch('novaclient.client.Client')
     def test_get_nova_bm_client(self, client_mock, environ):
         clients.get_nova_bm_client()
-        client_mock.assert_called_once_with(environ["OS_USERNAME"],
+        client_mock.assert_called_once_with("2", environ["OS_USERNAME"],
                                             environ["OS_PASSWORD"],
                                             environ["OS_AUTH_URL"],
                                             environ["OS_TENANT_NAME"],
diff --git a/os_cloud_config/utils/clients.py b/os_cloud_config/utils/clients.py
index d7e592c..6517a79 100644
--- a/os_cloud_config/utils/clients.py
+++ b/os_cloud_config/utils/clients.py
@@ -22,8 +22,8 @@ from keystoneclient import session
 from keystoneclient.v2_0 import client as ksclient
 from keystoneclient.v3 import client as ks3client
 from neutronclient.neutron import client as neutronclient
+from novaclient import client as nova_client
 from novaclient.extension import Extension
-from novaclient.v2 import client as novav11client
 from novaclient.v2.contrib import baremetal
 
 LOG = logging.getLogger(__name__)
@@ -32,12 +32,8 @@ LOG = logging.getLogger(__name__)
 def get_nova_bm_client(username, password, tenant_name, auth_url, cacert=None):
     LOG.debug('Creating nova client.')
     baremetal_extension = Extension('baremetal', baremetal)
-    return novav11client.Client(username,
-                                password,
-                                tenant_name,
-                                auth_url,
-                                extensions=[baremetal_extension],
-                                cacert=cacert)
+    return nova_client.Client("2", username, password, tenant_name, auth_url,
+                              extensions=[baremetal_extension], cacert=cacert)
 
 
 def get_ironic_client(username, password, tenant_name, auth_url, cacert=None):
diff --git a/os_cloud_config/utils/tests/test_clients.py b/os_cloud_config/utils/tests/test_clients.py
index 296b884..5b14397 100644
--- a/os_cloud_config/utils/tests/test_clients.py
+++ b/os_cloud_config/utils/tests/test_clients.py
@@ -32,11 +32,11 @@ class ClientsTest(base.TestCase):
             os_tenant_name='tenant_name',
             ca_file=None)
 
-    @mock.patch('novaclient.v2.client.Client')
+    @mock.patch('novaclient.client.Client')
     def test_get_nova_bm_client(self, client_mock):
         clients.get_nova_bm_client('username', 'password', 'tenant_name',
                                    'auth_url')
-        client_mock.assert_called_once_with('username',
+        client_mock.assert_called_once_with('2', 'username',
                                             'password',
                                             'tenant_name',
                                             'auth_url',