openstack/tempest
Code Issues Proposed changes

Move to the python-saharaclient

Browse Source 
Now we can call sahara cli command instead savanna old one.

Change-Id: I063c02eb2dac300140eed4f1ccff7eb58621bcaa
This commit is contained in:
Sergey Lukjanov
2014-03-17 23:44:56 +04:00
committed by Gerrit Code Review
parent 6d27cd633d
commit a5cfe3b3b0
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@@ -13,7 +13,7 @@ python-novaclient>=2.17.0
python-neutronclient>=2.3.4,<3 python-neutronclient>=2.3.4,<3
python-cinderclient>=1.0.6 python-cinderclient>=1.0.6
python-heatclient>=0.2.3 python-heatclient>=0.2.3
python-savannaclient>=0.5.0 python-saharaclient>=0.6.0
python-swiftclient>=1.6 python-swiftclient>=1.6
testresources>=0.2.4 testresources>=0.2.4
keyring>=1.6.1,<2.0,>=2.1 keyring>=1.6.1,<2.0,>=2.1

3
tempest/cli/__init__.py
View File

@@ -93,8 +93,7 @@ class ClientTestBase(tempest.test.BaseTestCase):
"""Executes sahara command for the given action.""" """Executes sahara command for the given action."""
flags += ' --endpoint-type %s' % CONF.data_processing.endpoint_type flags += ' --endpoint-type %s' % CONF.data_processing.endpoint_type
return self.cmd_with_auth( return self.cmd_with_auth(
# TODO (slukjanov): replace with sahara when new client released 'sahara', action, flags, params, admin, fail_ok)
'savanna', action, flags, params, admin, fail_ok)
def cmd_with_auth(self, cmd, action, flags='', params='', def cmd_with_auth(self, cmd, action, flags='', params='',
admin=True, fail_ok=False): admin=True, fail_ok=False):