From: jose.lausuch <jose.lausuch@ericsson.com>
Date: Fri, 15 Jan 2016 15:04:39 +0000 (+0100)
Subject: Change novaclient usage
X-Git-Tag: brahmaputra.1.0~161
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=2e6a5fa9ca2133a20e51aa3fff250171888e1d36;p=functest.git

Change novaclient usage

Avoid having this warning:
UserWarning: 'novaclient.v2.client.Client' is not designed to be initialized directly.

Change-Id: I1a9154d97be14007bcb988a5ccd630eadf2e8a5f
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
(cherry picked from commit eb12e95f822c70566cb417e5b5d85a65df14b79c)
---

diff --git a/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py b/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py
index 866e3a822..96bd172b9 100644
--- a/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py
+++ b/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py
@@ -22,7 +22,7 @@ import sys
 import time
 import yaml
 
-import novaclient.v2.client as novaclient
+from novaclient import client as novaclient
 from neutronclient.v2_0 import client as neutronclient
 from keystoneclient.v2_0 import client as keystoneclient
 from cinderclient import client as cinderclient
@@ -355,7 +355,7 @@ def remove_tenants(keystone_client):
 
 def main():
     creds_nova = functest_utils.get_credentials("nova")
-    nova_client = novaclient.Client(**creds_nova)
+    nova_client = novaclient.Client('2',**creds_nova)
 
     creds_neutron = functest_utils.get_credentials("neutron")
     neutron_client = neutronclient.Client(**creds_neutron)
diff --git a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
index a52e7f08a..b5fcd7218 100755
--- a/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
+++ b/testcases/VIM/OpenStack/CI/libraries/run_rally-cert.py
@@ -22,7 +22,7 @@ import logging
 import yaml
 import requests
 import sys
-import novaclient.v2.client as novaclient
+from novaclient import client as novaclient
 from glanceclient import client as glanceclient
 from keystoneclient.v2_0 import client as keystoneclient
 from neutronclient.v2_0 import client as neutronclient
@@ -261,7 +261,7 @@ def main():
         exit(-1)
 
     creds_nova = functest_utils.get_credentials("nova")
-    nova_client = novaclient.Client(**creds_nova)
+    nova_client = novaclient.Client('2',**creds_nova)
     creds_neutron = functest_utils.get_credentials("neutron")
     neutron_client = neutronclient.Client(**creds_neutron)
     creds_keystone = functest_utils.get_credentials("keystone")
diff --git a/testcases/VIM/OpenStack/CI/libraries/run_rally.py b/testcases/VIM/OpenStack/CI/libraries/run_rally.py
index ba74a720d..d5796c1b4 100644
--- a/testcases/VIM/OpenStack/CI/libraries/run_rally.py
+++ b/testcases/VIM/OpenStack/CI/libraries/run_rally.py
@@ -22,7 +22,7 @@ import logging
 import yaml
 import requests
 import sys
-import novaclient.v2.client as novaclient
+from novaclient import client as novaclient
 from keystoneclient.v2_0 import client as keystoneclient
 from glanceclient import client as glanceclient
 
@@ -229,7 +229,7 @@ def main():
         exit(-1)
 
     creds_nova = functest_utils.get_credentials("nova")
-    nova_client = novaclient.Client(**creds_nova)
+    nova_client = novaclient.Client('2',**creds_nova)
     creds_keystone = functest_utils.get_credentials("keystone")
     keystone_client = keystoneclient.Client(**creds_keystone)
     glance_endpoint = keystone_client.service_catalog.url_for(service_type='image',
diff --git a/testcases/vPing/CI/libraries/vPing.py b/testcases/vPing/CI/libraries/vPing.py
index e8e01bf1a..be0d2341a 100644
--- a/testcases/vPing/CI/libraries/vPing.py
+++ b/testcases/vPing/CI/libraries/vPing.py
@@ -22,7 +22,7 @@ import sys
 import logging
 import yaml
 import datetime
-import novaclient.v2.client as novaclient
+from novaclient import client as novaclient
 from neutronclient.v2_0 import client as neutronclient
 from keystoneclient.v2_0 import client as keystoneclient
 from glanceclient import client as glanceclient
@@ -274,7 +274,7 @@ def cleanup(nova, neutron, image_id, network_dic, port_id1, port_id2):
 def main():
 
     creds_nova = functest_utils.get_credentials("nova")
-    nova_client = novaclient.Client(**creds_nova)
+    nova_client = novaclient.Client('2',**creds_nova)
     creds_neutron = functest_utils.get_credentials("neutron")
     neutron_client = neutronclient.Client(**creds_neutron)
     creds_keystone = functest_utils.get_credentials("keystone")