openstack
/
sahara-tests
Code Issues Proposed changes

Migrated auth system from keystoneclient to keystoneauth 

Changes:

 * added keystoneauth to requirements
 * changed imports in clients.py module
 * changed mock.patch decorators in test_init_clients in test_base.py

bp migrate-to-keystoneauth
Change-Id: Ie731dc87fc1306a4aafcfdcd7d73b1723a95092a
This commit is contained in:
Mikhail Lelyakin 2016-04-11 19:17:03 +03:00
parent af89d1b886
commit f80a795569
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
releasenotes/notes/migrate-to-keystoneauth-c65c162d74b5d7b9.yaml Normal file
View File

@ -0,0 +1,3 @@
---
prelude: >
Migrate auth system from keystoneclient to keystoneauth

2
requirements.txt
View File

@ -7,13 +7,13 @@ pbr>=1.6 # Apache-2.0
Mako>=0.4.0 # MIT
fixtures<2.0,>=1.3.1 # Apache-2.0/BSD
jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT
keystoneauth1>=2.1.0 # Apache-2.0
oslo.concurrency>=3.5.0 # Apache-2.0
oslo.serialization>=1.10.0 # Apache-2.0
oslo.utils>=3.5.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0
os-testr>=0.4.1 # Apache-2.0
paramiko>=1.16.0 # LGPL
python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0
python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
python-saharaclient>=0.13.0 # Apache-2.0
python-swiftclient>=2.2.0 # Apache-2.0

4
sahara_tests/scenario/clients.py
View File

@ -17,8 +17,8 @@ from __future__ import print_function
import time
import fixtures
from keystoneclient.auth.identity import v3 as identity_v3
from keystoneclient import session
from keystoneauth1.identity import v3 as identity_v3
from keystoneauth1 import session
from neutronclient.neutron import client as neutron_client
from novaclient import client as nova_client
from novaclient import exceptions as nova_exc

10
sahara_tests/unit/scenario/test_base.py
View File

@ -160,8 +160,8 @@ class TestBase(testtools.TestCase):
self.base_scenario.setUpClass()
timeouts.Defaults.init_defaults(self.base_scenario.testcase)
@mock.patch('keystoneclient.auth.identity.v3.Password')
@mock.patch('keystoneclient.session.Session')
@mock.patch('keystoneauth1.identity.v3.Password')
@mock.patch('keystoneauth1.session.Session')
@mock.patch('saharaclient.client.Client', return_value=None)
@mock.patch('novaclient.client.Client', return_value=None)
@mock.patch('neutronclient.neutron.client.Client', return_value=None)
@ -473,7 +473,7 @@ class TestBase(testtools.TestCase):
self.assertEqual(
[], self.base_scenario._get_nodes_with_process('test'))
@mock.patch('keystoneclient.session.Session')
@mock.patch('keystoneauth1.session.Session')
def test_get_node_list_with_volumes(self, mock_keystone):
self.base_scenario._init_clients()
with mock.patch(
@ -516,7 +516,7 @@ class TestBase(testtools.TestCase):
@mock.patch('sahara_tests.scenario.base.BaseTestCase.addCleanup')
@mock.patch('novaclient.v2.flavors.FlavorManager.create',
return_value=FakeResponse(set_id='flavor_id'))
@mock.patch('keystoneclient.session.Session')
@mock.patch('keystoneauth1.session.Session')
def test_get_flavor_id(self, mock_keystone, mock_create_flavor, mock_base):
self.base_scenario._init_clients()
self.assertEqual('flavor_id',
@ -531,7 +531,7 @@ class TestBase(testtools.TestCase):
}))
@mock.patch('sahara_tests.scenario.base.BaseTestCase._run_command_on_node')
@mock.patch('keystoneclient.session.Session')
@mock.patch('keystoneauth1.session.Session')
def test_create_hdfs_data(self, mock_session, mock_ssh):
self.base_scenario._init_clients()
output_path = '/user/test/data/output'