From 2af31abb7f29f49a05fad3e04eb711afde6806cc Mon Sep 17 00:00:00 2001
From: hardik <hardik.parekh@nectechnologies.in>
Date: Thu, 10 Mar 2016 11:14:26 +0530
Subject: [PATCH] Use tempest.lib instead of tempest-lib

The switch to tempest.lib in tempest is done
in https://review.openstack.org/#/c/283755/
mistral should use tempest.lib instead of tempest-lib because
tempest-lib will be deprecated.

Change-Id: I202d82be0b276886433b0ceeb9c17e1707232f68
Depends-on: I4da5e807914ce8a11b201aad765d827cb9bf9d9a
---
 mistral_tempest_tests/services/base.py                     | 7 +++----
 .../tests/api/v2/test_mistral_basic_v2.py                  | 6 +++---
 .../tests/scenario/engine/actions/v2/test_ssh_actions.py   | 2 +-
 requirements.txt                                           | 1 -
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/mistral_tempest_tests/services/base.py b/mistral_tempest_tests/services/base.py
index 121c563c5..14fbf3f58 100644
--- a/mistral_tempest_tests/services/base.py
+++ b/mistral_tempest_tests/services/base.py
@@ -22,11 +22,10 @@ import six
 from oslo_utils import uuidutils
 from tempest import clients
 from tempest import config
+from tempest.lib import auth
+from tempest.lib.common import rest_client
+from tempest.lib import exceptions
 from tempest import test as test
-from tempest_lib import auth
-from tempest_lib.common import rest_client
-from tempest_lib import exceptions
-
 
 CONF = config.CONF
 
diff --git a/mistral_tempest_tests/tests/api/v2/test_mistral_basic_v2.py b/mistral_tempest_tests/tests/api/v2/test_mistral_basic_v2.py
index cc212a647..f98927b2a 100644
--- a/mistral_tempest_tests/tests/api/v2/test_mistral_basic_v2.py
+++ b/mistral_tempest_tests/tests/api/v2/test_mistral_basic_v2.py
@@ -13,13 +13,13 @@
 # under the License.
 
 import json
+import six
 
 from oslo_concurrency.fixture import lockutils
 from oslo_log import log as logging
-import six
+from tempest.lib import decorators
+from tempest.lib import exceptions
 from tempest import test
-from tempest_lib import decorators
-from tempest_lib import exceptions
 
 from mistral import utils
 from mistral_tempest_tests.services import base
diff --git a/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_ssh_actions.py b/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_ssh_actions.py
index ca0ee3690..7697cf9c0 100644
--- a/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_ssh_actions.py
+++ b/mistral_tempest_tests/tests/scenario/engine/actions/v2/test_ssh_actions.py
@@ -20,8 +20,8 @@ import time
 from oslo_log import log as logging
 from paramiko import ssh_exception
 from tempest import config
+from tempest.lib import exceptions
 from tempest import test
-from tempest_lib import exceptions
 
 from mistral import utils
 from mistral.utils import ssh_utils
diff --git a/requirements.txt b/requirements.txt
index 7013620e9..4f68e7bf4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -42,7 +42,6 @@ retrying!=1.3.0,>=1.2.3 # Apache-2.0
 six>=1.9.0 # MIT
 SQLAlchemy<1.1.0,>=1.0.10 # MIT
 stevedore>=1.5.0 # Apache-2.0
-tempest-lib>=0.14.0 # Apache-2.0
 WSME>=0.8 # MIT
 yaql>=1.1.0 # Apache 2.0 License
 tooz>=1.28.0 # Apache-2.0