Switch to using in-tree tempest lib
As a result of change db9672e3473cd, tempest_lib is no
longer a thing we should be using.
Change-Id: I47f368fdce477d7419cc8fc23eb17264df42932d
diff --git a/neutron/tests/tempest/README.rst b/neutron/tests/tempest/README.rst
index 5b3600a..05ea998 100644
--- a/neutron/tests/tempest/README.rst
+++ b/neutron/tests/tempest/README.rst
@@ -2,9 +2,9 @@
=======
The files under this path were copied from tempest as part of the move
-of the api tests, and they will be removed as the required
-functionality is transitioned from tempest to tempest-lib. While it
-exists, only neutron.tests.api and neutron.tests.retargetable should
+of the api tests, and they will be removed as required over time to
+minimize the depedency on the tempest testing framework.
+While it exists, only neutron.tests.api and neutron.tests.retargetable should
be importing files from this path. neutron.tests.tempest.config uses
the global cfg.CONF instance and importing it outside of the api tests
has the potential to break Neutron's use of cfg.CONF.
diff --git a/neutron/tests/tempest/exceptions.py b/neutron/tests/tempest/exceptions.py
index bdc3b8d..c9264ca 100644
--- a/neutron/tests/tempest/exceptions.py
+++ b/neutron/tests/tempest/exceptions.py
@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
-from tempest_lib import exceptions
+from tempest.lib import exceptions
TempestException = exceptions.TempestException
diff --git a/neutron/tests/tempest/services/network/json/network_client.py b/neutron/tests/tempest/services/network/json/network_client.py
index 01429ab..9f6ad7a 100644
--- a/neutron/tests/tempest/services/network/json/network_client.py
+++ b/neutron/tests/tempest/services/network/json/network_client.py
@@ -15,7 +15,7 @@
from oslo_serialization import jsonutils as json
from six.moves.urllib import parse as urlparse
from tempest.common import service_client
-from tempest_lib import exceptions as lib_exc
+from tempest.lib import exceptions as lib_exc
from neutron.tests.tempest import exceptions