Merge "Move session and fixtures to keystoneauth1"

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
 
 

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
 

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
 

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
 

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
 

openstackclient/tests/fakes.py

@@ -17,7 +17,7 @@ import json
 import six
 import sys
 
-from keystoneclient import fixture
+from keystoneauth1 import fixture
 import requests
 
 

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
 

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