openstack/manila
Code Issues Proposed changes

Fix tempest compatibility for cli tests

Browse Source 
Commit https://github.com/openstack/tempest/commit/2474f41f made changes to
tempest project that are inconsistent with our plugin.
Make our plugin use latest changes to keep compatibility.

Change-Id: I08d28b40fdd9ad54a0bcce30647d796943332116
This commit is contained in:
Your Name 2014-11-20 22:01:42 +02:00
parent 59cdc70452
commit 3f75086576
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
contrib/tempest/tempest/cli/manilaclient.py
View File

@ -13,15 +13,10 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest_lib.cli import base # noqa from tempest import cli
from tempest import config_share as config
from tempest import test
CONF = config.CONF
class ClientTestBase(base.ClientTestBase, test.BaseTestCase): class ClientTestBase(cli.ClientTestBase):
def manila(self, action, flags='', params='', fail_ok=False, def manila(self, action, flags='', params='', fail_ok=False,
endpoint_type='publicURL', merge_stderr=False): endpoint_type='publicURL', merge_stderr=False):
@ -29,13 +24,3 @@ class ClientTestBase(base.ClientTestBase, test.BaseTestCase):
flags += ' --endpoint-type %s' % endpoint_type flags += ' --endpoint-type %s' % endpoint_type
return self.clients.cmd_with_auth( return self.clients.cmd_with_auth(
'manila', action, flags, params, fail_ok, merge_stderr) 'manila', action, flags, params, fail_ok, merge_stderr)
def _get_clients(self):
clients = base.CLIClient(
CONF.identity.admin_username,
CONF.identity.admin_password,
CONF.identity.admin_tenant_name,
CONF.identity.uri,
CONF.cli.cli_dir,
)
return clients