Merge "Use tempest instead of Tempest-lib"

10 files changed, 11 insertions, 11 deletions

diff --git a/designateclient/functionaltests/base.py b/designateclient/functionaltests/base.py
index faa0fcb..d3e0552 100644
--- a/designateclient/functionaltests/base.py
+++ b/designateclient/functionaltests/base.py
@@ -13,8 +13,8 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from tempest_lib.cli import base
-from tempest_lib.exceptions import CommandFailed
+from tempest.lib.cli import base
+from tempest.lib.exceptions import CommandFailed
 
 from designateclient.functionaltests import client
 from designateclient.functionaltests import config
diff --git a/designateclient/functionaltests/client.py b/designateclient/functionaltests/client.py
index 538da37..001894b 100644
--- a/designateclient/functionaltests/client.py
+++ b/designateclient/functionaltests/client.py
@@ -16,7 +16,7 @@ limitations under the License.
 import logging
 import os
 
-from tempest_lib.cli import base
+from tempest.lib.cli import base
 
 from designateclient.functionaltests.config import cfg
 from designateclient.functionaltests.models import FieldValueModel
diff --git a/designateclient/functionaltests/models.py b/designateclient/functionaltests/models.py
index a6a307c..22a5ae0 100644
--- a/designateclient/functionaltests/models.py
+++ b/designateclient/functionaltests/models.py
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 import six
-from tempest_lib.cli import output_parser
+from tempest.lib.cli import output_parser
 
 
 class Model(object):
diff --git a/designateclient/functionaltests/v2/fixtures.py b/designateclient/functionaltests/v2/fixtures.py
index 75f4406..67ca404 100644
--- a/designateclient/functionaltests/v2/fixtures.py
+++ b/designateclient/functionaltests/v2/fixtures.py
@@ -20,7 +20,7 @@ import tempfile
 import traceback
 
 import fixtures
-from tempest_lib.exceptions import CommandFailed
+from tempest.lib.exceptions import CommandFailed
 from testtools.runtest import MultipleExceptions
 
 from designateclient.functionaltests.client import DesignateCLI
diff --git a/designateclient/functionaltests/v2/test_blacklist.py b/designateclient/functionaltests/v2/test_blacklist.py
index b945cb0..db8c756 100644
--- a/designateclient/functionaltests/v2/test_blacklist.py
+++ b/designateclient/functionaltests/v2/test_blacklist.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from tempest_lib.exceptions import CommandFailed
+from tempest.lib.exceptions import CommandFailed
 
 from designateclient.functionaltests.base import BaseDesignateTest
 from designateclient.functionaltests.datagen import random_blacklist
diff --git a/designateclient/functionaltests/v2/test_recordsets.py b/designateclient/functionaltests/v2/test_recordsets.py
index d8bc2af..c9ab529 100644
--- a/designateclient/functionaltests/v2/test_recordsets.py
+++ b/designateclient/functionaltests/v2/test_recordsets.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from tempest_lib.exceptions import CommandFailed
+from tempest.lib.exceptions import CommandFailed
 
 from designateclient.functionaltests.base import BaseDesignateTest
 from designateclient.functionaltests.datagen import random_a_recordset_name
diff --git a/designateclient/functionaltests/v2/test_tlds.py b/designateclient/functionaltests/v2/test_tlds.py
index 6a79be7..402dffc 100644
--- a/designateclient/functionaltests/v2/test_tlds.py
+++ b/designateclient/functionaltests/v2/test_tlds.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from tempest_lib.exceptions import CommandFailed
+from tempest.lib.exceptions import CommandFailed
 
 from designateclient.functionaltests.base import BaseDesignateTest
 from designateclient.functionaltests.datagen import random_tld
diff --git a/designateclient/functionaltests/v2/test_zone.py b/designateclient/functionaltests/v2/test_zone.py
index 2873948..4f1b803 100644
--- a/designateclient/functionaltests/v2/test_zone.py
+++ b/designateclient/functionaltests/v2/test_zone.py
@@ -13,7 +13,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 """
-from tempest_lib.exceptions import CommandFailed
+from tempest.lib.exceptions import CommandFailed
 
 from designateclient.functionaltests.base import BaseDesignateTest
 from designateclient.functionaltests.datagen import random_zone_name
diff --git a/designateclient/functionaltests/v2/test_zone_transfer.py b/designateclient/functionaltests/v2/test_zone_transfer.py
index eeead24..33cbbc0 100644
--- a/designateclient/functionaltests/v2/test_zone_transfer.py
+++ b/designateclient/functionaltests/v2/test_zone_transfer.py
@@ -15,7 +15,7 @@ limitations under the License.
 """
 import unittest
 
-from tempest_lib.exceptions import CommandFailed
+from tempest.lib.exceptions import CommandFailed
 
 from designateclient.functionaltests.base import BaseDesignateTest
 from designateclient.functionaltests.client import DesignateCLI
diff --git a/test-requirements.txt b/test-requirements.txt
index 5e64ed3..d67f4e4 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,4 +13,4 @@ sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
 testrepository>=0.0.18 # Apache-2.0/BSD
 oslosphinx>=4.7.0 # Apache-2.0
 reno>=1.8.0 # Apache-2.0
-tempest-lib>=0.14.0 # Apache-2.0
+tempest>=12.1.0  # Apache-2.0