summaryrefslogtreecommitdiff
path: root/tempest/api/network/base.py
diff options
context:
space:
mode:
authorAndrea Frittoli (andreaf) <andrea.frittoli@hpe.com>2016-02-23 14:07:24 -0500
committerAndrea Frittoli (andreaf) <andrea.frittoli@hpe.com>2016-02-24 10:43:59 -0500
commitdb9672e3473cd6046f269d63435e102a477d8cdd (patch)
treee8ef37bdcd618c991844a1733711a194f45de35d /tempest/api/network/base.py
parente284f8988f241e0d9864843dd6ecce5496ad409a (diff)
downloadtempest-db9672e3473cd6046f269d63435e102a477d8cdd.tar.gz
Use tempest.lib code in tempest
Now that tempest_lib code is copied back into tempest, stop using tempest_lib in tempest, and start using the copied code. Remove the dependency to tempest_lib from requirements, and drop the script to use tempest_lib in tempest. Add os-testr to the test-requirements. Partially implements bp tempest-lib-reintegration Change-Id: I21ab5fe6349f72c98ac9f960a29bf62e813f8b1b
Diffstat (limited to 'tempest/api/network/base.py')
-rw-r--r--tempest/api/network/base.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tempest/api/network/base.py b/tempest/api/network/base.py
index f209f8948..1e636f1ab 100644
--- a/tempest/api/network/base.py
+++ b/tempest/api/network/base.py
@@ -14,11 +14,11 @@
# under the License.
import netaddr
-from tempest_lib import exceptions as lib_exc
from tempest.common.utils import data_utils
from tempest import config
from tempest import exceptions
+from tempest.lib import exceptions as lib_exc
import tempest.test
CONF = config.CONF