diff options
| author |   Morgan Richomme <morgan.richomme@orange.com> | 2016-01-15 15:12:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-01-15 15:12:29 +0000 |
| commit | 0710fdc0ab44d20d193fa482cf6fbfca0c246b9d (patch) | |
| tree | 67672b33837df8a82a1ddedac032c2e015e21359 | |
| parent | 973c722f929eb3652d19a15911404f31a9f66216 (diff) | |
| parent | eb12e95f822c70566cb417e5b5d85a65df14b79c (diff) | |
Merge "Change novaclient usage"
4 files changed, 8 insertions, 8 deletions
diff --git a/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py b/testcases/VIM/OpenStack/CI/libraries/clean_openstack.py index 866e3a82..96bd172b 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 a52e7f08..b5fcd721 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 ba74a720..d5796c1b 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 e8e01bf1..be0d2341 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") |