Merge "Use tempest instead of Tempest-lib"

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.cli import base
-from tempest_lib.exceptions import CommandFailed
+from tempest.lib.exceptions import CommandFailed
 
 from designateclient.functionaltests import client
 from designateclient.functionaltests import config

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

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):

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

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

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

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

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

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

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