Use tempest.lib instead of tempest-lib
tempest-lib is marked as deprecated now. The library is not maintained and Tempest itself provides the stable interfaces under tempest.lib as [1] said. So this patch makes the project use tempest.lib for long-term maintenance. [1]: https://github.com/openstack/tempest-lib/blob/master/README.rst#tempest-lib Change-Id: Ic45028c2fd803fca5e82a0caa85914414f511022
This commit is contained in:
parent
addc6b0df8
commit
0bf62b9395
@ -15,7 +15,7 @@ limitations under the License.
|
||||
"""
|
||||
|
||||
from oslo_config import cfg
|
||||
from tempest_lib import exceptions
|
||||
from tempest.lib import exceptions
|
||||
|
||||
from functionaltests.api.v2.clients.quotas_client import QuotasClient
|
||||
from functionaltests.api.v2.clients.tld_client import TLDClient
|
||||
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
"""
|
||||
|
||||
from tempest_lib.exceptions import NotFound
|
||||
from tempest.lib.exceptions import NotFound
|
||||
|
||||
from functionaltests.api.v2.models.recordset_model import RecordsetModel
|
||||
from functionaltests.api.v2.models.recordset_model import RecordsetListModel
|
||||
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
"""
|
||||
|
||||
from tempest_lib.exceptions import NotFound
|
||||
from tempest.lib.exceptions import NotFound
|
||||
|
||||
from functionaltests.api.v2.models.zone_model import ZoneModel
|
||||
from functionaltests.api.v2.models.zone_model import ZoneListModel
|
||||
@ -70,7 +70,7 @@ class ZoneClient(ClientMixin):
|
||||
|
||||
def is_zone_404(self, zone_id):
|
||||
try:
|
||||
# tempest_lib rest client raises exceptions on bad status codes
|
||||
# tempest.lib rest client raises exceptions on bad status codes
|
||||
resp, model = self.get_zone(zone_id)
|
||||
except NotFound:
|
||||
return True
|
||||
|
@ -20,7 +20,7 @@ import sys
|
||||
import traceback
|
||||
|
||||
import fixtures
|
||||
from tempest_lib.exceptions import NotFound
|
||||
from tempest.lib.exceptions import NotFound
|
||||
from testtools.runtest import MultipleExceptions
|
||||
|
||||
from functionaltests.api.v2.clients.blacklist_client import BlacklistClient
|
||||
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
"""
|
||||
import dns.rdatatype
|
||||
from tempest_lib import exceptions
|
||||
from tempest.lib import exceptions
|
||||
|
||||
from functionaltests.common import datagen
|
||||
from functionaltests.common import dnsclient
|
||||
|
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
"""
|
||||
|
||||
from tempest_lib import exceptions
|
||||
from tempest.lib import exceptions
|
||||
|
||||
from functionaltests.common import datagen
|
||||
from functionaltests.common import utils
|
||||
|
@ -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 import exceptions
|
||||
from tempest.lib import exceptions
|
||||
|
||||
from functionaltests.common import datagen
|
||||
from functionaltests.common import utils
|
||||
|
@ -14,12 +14,12 @@ See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
"""
|
||||
|
||||
import tempest_lib.base
|
||||
import tempest.lib.base
|
||||
|
||||
from functionaltests.common.config import read_config
|
||||
|
||||
|
||||
class BaseDesignateTest(tempest_lib.base.BaseTestCase):
|
||||
class BaseDesignateTest(tempest.lib.base.BaseTestCase):
|
||||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(BaseDesignateTest, self).__init__(*args, **kwargs)
|
||||
|
@ -21,9 +21,9 @@ from config import cfg
|
||||
from noauth import NoAuthAuthProvider
|
||||
from six import string_types
|
||||
from six.moves.urllib.parse import quote_plus
|
||||
from tempest_lib.common.rest_client import RestClient
|
||||
from tempest_lib.auth import KeystoneV2Credentials
|
||||
from tempest_lib.auth import KeystoneV2AuthProvider
|
||||
from tempest.lib.common.rest_client import RestClient
|
||||
from tempest.lib.auth import KeystoneV2Credentials
|
||||
from tempest.lib.auth import KeystoneV2AuthProvider
|
||||
|
||||
from functionaltests.common.utils import memoized
|
||||
from functionaltests.common import hooks
|
||||
|
@ -18,7 +18,7 @@ import copy
|
||||
import re
|
||||
|
||||
from six.moves.urllib import parse
|
||||
from tempest_lib.auth import AuthProvider
|
||||
from tempest.lib.auth import AuthProvider
|
||||
|
||||
|
||||
class NoAuthAuthProvider(AuthProvider):
|
||||
|
@ -18,10 +18,10 @@ from functionaltests.api.v2.models.recordset_model import RecordsetModel
|
||||
from functionaltests.common.models import ZoneFile
|
||||
from functionaltests.common.models import ZoneFileRecord
|
||||
|
||||
import tempest_lib.base
|
||||
import tempest.lib.base
|
||||
|
||||
|
||||
class MetaTest(tempest_lib.base.BaseTestCase):
|
||||
class MetaTest(tempest.lib.base.BaseTestCase):
|
||||
|
||||
def test_zone_file_model_meta_test(self):
|
||||
zone_file = ZoneFile.from_text(
|
||||
|
@ -17,7 +17,7 @@ testtools>=1.4.0 # MIT
|
||||
testrepository>=0.0.18 # Apache-2.0/BSD
|
||||
testscenarios>=0.4 # Apache-2.0/BSD
|
||||
WebTest>=2.0 # MIT
|
||||
tempest-lib>=0.14.0 # Apache-2.0
|
||||
tempest>=12.1.0 # Apache-2.0
|
||||
reno>=1.8.0 # Apache2
|
||||
# Bandit security code scanner
|
||||
bandit>=1.0.1 # Apache-2.0
|
||||
|
Loading…
Reference in New Issue
Block a user