From: Tomas Cechvala <tcechval@cisco.com>
Date: Thu, 9 Mar 2017 13:05:57 +0000 (+0100)
Subject: Initializing nova client by session API
X-Git-Tag: danube.1.0~6
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3ce8b6143a2eac2de4df17cab3e2c7ad9ea2acb6;p=fds.git

Initializing nova client by session API

Authentication problems solved by using the keystoneauth
session API.

Change-Id: I4e031f012278e19bb78c692c4c45891061f8b128
Signed-off-by: Tomas Cechvala <tcechval@cisco.com>
---

diff --git a/testing/robot/lib/FDSLibrary.py b/testing/robot/lib/FDSLibrary.py
index 3d19680..786cee6 100644
--- a/testing/robot/lib/FDSLibrary.py
+++ b/testing/robot/lib/FDSLibrary.py
@@ -22,23 +22,19 @@ import subprocess
 
 class FDSLibrary():
     def __init__(self):
+        auth_obj = loading.get_plugin_loader('password').load_from_options(auth_url=os.getenv('OS_AUTH_URL'),
+                                                                           username=os.getenv('OS_USERNAME'),
+                                                                           password=os.getenv('OS_PASSWORD'),
+                                                                           project_id=os.getenv('OS_PROJECT_ID'))
         logger.debug("Initializing glance client.")
-        self.glance_client = glance.Client('2', session=session.Session(
-            auth=loading.get_plugin_loader('password').load_from_options(auth_url=os.getenv('OS_AUTH_URL'),
-                                                                         username=os.getenv('OS_USERNAME'),
-                                                                         password=os.getenv('OS_PASSWORD'),
-                                                                         project_id=os.getenv('OS_PROJECT_ID'))))
+        self.glance_client = glance.Client('2', session=session.Session(auth=auth_obj))
         logger.debug("Initializing neutron client.")
         self.neutron_client = neutron.Client(username=os.getenv('OS_USERNAME'),
                                              password=os.getenv('OS_PASSWORD'),
                                              tenant_name=os.getenv('OS_TENANT_NAME'),
                                              auth_url=os.getenv('OS_AUTH_URL'))
         logger.debug("Initializing nova client.")
-        self.nova_client = nova.Client('2',
-                                       os.getenv('OS_USERNAME'),
-                                       os.getenv('OS_PASSWORD'),
-                                       os.getenv('OS_TENANT_NAME'),
-                                       os.getenv('OS_AUTH_URL'))
+        self.nova_client = nova.Client('2', session=session.Session(auth=auth_obj))
 
     def check_flavor_exists(self, flavor):
         flavor_list_names = [x.name for x in self.nova_client.flavors.list()]