diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-10-20 19:57:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-10-20 19:57:36 +0000 |
| commit | 48e75c73ed4fbf49c09de63644ddfe404cd41155 (patch) | |
| tree | 0335b22da773065e45cfea0daac07e150f28ab64 | |
| parent | 69be668534bb84871c23bf1ec041b9e5afcd1596 (diff) | |
| parent | cbc1897b7d87946e5f9a84727310b59af4c7d624 (diff) | |
| download | python-openstackclient-48e75c73ed4fbf49c09de63644ddfe404cd41155.tar.gz | |
Merge "Move session and fixtures to keystoneauth1"
| -rw-r--r-- | openstackclient/tests/api/fakes.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/api/test_image_v1.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/api/test_image_v2.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/api/test_network_v2.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/api/test_object_store_v1.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/fakes.py | 2 | ||||
| -rw-r--r-- | openstackclient/tests/object/v1/fakes.py | 2 | ||||
| -rw-r--r-- | requirements.txt | 1 |
8 files changed, 8 insertions, 7 deletions
diff --git a/openstackclient/tests/api/fakes.py b/openstackclient/tests/api/fakes.py index 85617ab7..e285a61c 100644 --- a/openstackclient/tests/api/fakes.py +++ b/openstackclient/tests/api/fakes.py @@ -15,7 +15,7 @@ from requests_mock.contrib import fixture -from keystoneclient import session +from keystoneauth1 import session from openstackclient.tests import utils diff --git a/openstackclient/tests/api/test_image_v1.py b/openstackclient/tests/api/test_image_v1.py index 34fcfca4..f3479756 100644 --- a/openstackclient/tests/api/test_image_v1.py +++ b/openstackclient/tests/api/test_image_v1.py @@ -15,7 +15,7 @@ from requests_mock.contrib import fixture -from keystoneclient import session +from keystoneauth1 import session from openstackclient.api import image_v1 from openstackclient.tests import utils diff --git a/openstackclient/tests/api/test_image_v2.py b/openstackclient/tests/api/test_image_v2.py index ddb160ee..77063997 100644 --- a/openstackclient/tests/api/test_image_v2.py +++ b/openstackclient/tests/api/test_image_v2.py @@ -15,7 +15,7 @@ from requests_mock.contrib import fixture -from keystoneclient import session +from keystoneauth1 import session from openstackclient.api import image_v2 from openstackclient.tests import utils diff --git a/openstackclient/tests/api/test_network_v2.py b/openstackclient/tests/api/test_network_v2.py index 13c5d6ea..80f1d9de 100644 --- a/openstackclient/tests/api/test_network_v2.py +++ b/openstackclient/tests/api/test_network_v2.py @@ -15,7 +15,7 @@ from requests_mock.contrib import fixture -from keystoneclient import session +from keystoneauth1 import session from openstackclient.api import network_v2 as network from openstackclient.tests import utils diff --git a/openstackclient/tests/api/test_object_store_v1.py b/openstackclient/tests/api/test_object_store_v1.py index 0f7c4559..992bf261 100644 --- a/openstackclient/tests/api/test_object_store_v1.py +++ b/openstackclient/tests/api/test_object_store_v1.py @@ -17,7 +17,7 @@ import mock from requests_mock.contrib import fixture -from keystoneclient import session +from keystoneauth1 import session from openstackclient.api import object_store_v1 as object_store from openstackclient.tests import utils diff --git a/openstackclient/tests/fakes.py b/openstackclient/tests/fakes.py index 979f9481..357c470f 100644 --- a/openstackclient/tests/fakes.py +++ b/openstackclient/tests/fakes.py @@ -17,7 +17,7 @@ import json import six import sys -from keystoneclient import fixture +from keystoneauth1 import fixture import requests diff --git a/openstackclient/tests/object/v1/fakes.py b/openstackclient/tests/object/v1/fakes.py index 6aef05b1..986ab2f3 100644 --- a/openstackclient/tests/object/v1/fakes.py +++ b/openstackclient/tests/object/v1/fakes.py @@ -13,7 +13,7 @@ # under the License. # -from keystoneclient import session +from keystoneauth1 import session from openstackclient.api import object_store_v1 as object_store from openstackclient.tests import utils diff --git a/requirements.txt b/requirements.txt index ba7a9e3e..ca6a30c5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,7 @@ six>=1.9.0 Babel>=1.3 cliff>=1.14.0 # Apache-2.0 +keystoneauth1>=1.0.0 os-client-config!=1.6.2,>=1.4.0 oslo.config>=2.3.0 # Apache-2.0 oslo.i18n>=1.5.0 # Apache-2.0 |