Merge "Replace depricated tempest-lib with tempest.lib"
This commit is contained in:
commit
9d67c8bb0f
@ -15,8 +15,8 @@
|
|||||||
|
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from tempest_lib.common.utils import misc as misc_utils
|
from tempest.lib.common.utils import misc as misc_utils
|
||||||
from tempest_lib import exceptions as lib_exc
|
from tempest.lib import exceptions as lib_exc
|
||||||
|
|
||||||
|
|
||||||
def wait_for_bm_node_status(client, node_id, attr, status):
|
def wait_for_bm_node_status(client, node_id, attr, status):
|
||||||
|
@ -15,7 +15,7 @@ import functools
|
|||||||
from oslo_serialization import jsonutils as json
|
from oslo_serialization import jsonutils as json
|
||||||
import six
|
import six
|
||||||
from six.moves.urllib import parse as urllib
|
from six.moves.urllib import parse as urllib
|
||||||
from tempest_lib.common import rest_client
|
from tempest.lib.common import rest_client
|
||||||
|
|
||||||
|
|
||||||
def handle_errors(f):
|
def handle_errors(f):
|
||||||
|
@ -13,9 +13,9 @@
|
|||||||
import functools
|
import functools
|
||||||
|
|
||||||
from tempest import config
|
from tempest import config
|
||||||
|
from tempest.lib.common.utils import data_utils
|
||||||
|
from tempest.lib import exceptions as lib_exc
|
||||||
from tempest import test
|
from tempest import test
|
||||||
from tempest_lib.common.utils import data_utils
|
|
||||||
from tempest_lib import exceptions as lib_exc
|
|
||||||
|
|
||||||
from ironic_tempest_plugin import clients
|
from ironic_tempest_plugin import clients
|
||||||
|
|
||||||
|
@ -12,9 +12,9 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import six
|
import six
|
||||||
|
from tempest.lib.common.utils import data_utils
|
||||||
|
from tempest.lib import exceptions as lib_exc
|
||||||
from tempest import test
|
from tempest import test
|
||||||
from tempest_lib.common.utils import data_utils
|
|
||||||
from tempest_lib import exceptions as lib_exc
|
|
||||||
|
|
||||||
from ironic_tempest_plugin.tests.api.admin import base
|
from ironic_tempest_plugin.tests.api.admin import base
|
||||||
|
|
||||||
|
@ -11,9 +11,9 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import six
|
import six
|
||||||
|
from tempest.lib.common.utils import data_utils
|
||||||
|
from tempest.lib import exceptions as lib_exc
|
||||||
from tempest import test
|
from tempest import test
|
||||||
from tempest_lib.common.utils import data_utils
|
|
||||||
from tempest_lib import exceptions as lib_exc
|
|
||||||
|
|
||||||
from ironic_tempest_plugin.common import waiters
|
from ironic_tempest_plugin.common import waiters
|
||||||
from ironic_tempest_plugin.tests.api.admin import base
|
from ironic_tempest_plugin.tests.api.admin import base
|
||||||
|
@ -13,8 +13,8 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from oslo_utils import timeutils
|
from oslo_utils import timeutils
|
||||||
|
from tempest.lib import exceptions
|
||||||
from tempest import test
|
from tempest import test
|
||||||
from tempest_lib import exceptions
|
|
||||||
|
|
||||||
from ironic_tempest_plugin.tests.api.admin import base
|
from ironic_tempest_plugin.tests.api.admin import base
|
||||||
|
|
||||||
|
@ -11,9 +11,9 @@
|
|||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import six
|
import six
|
||||||
|
from tempest.lib.common.utils import data_utils
|
||||||
|
from tempest.lib import exceptions as lib_exc
|
||||||
from tempest import test
|
from tempest import test
|
||||||
from tempest_lib.common.utils import data_utils
|
|
||||||
from tempest_lib import exceptions as lib_exc
|
|
||||||
|
|
||||||
from ironic_tempest_plugin.tests.api.admin import base
|
from ironic_tempest_plugin.tests.api.admin import base
|
||||||
|
|
||||||
|
@ -10,9 +10,9 @@
|
|||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
from tempest.lib.common.utils import data_utils
|
||||||
|
from tempest.lib import exceptions as lib_exc
|
||||||
from tempest import test
|
from tempest import test
|
||||||
from tempest_lib.common.utils import data_utils
|
|
||||||
from tempest_lib import exceptions as lib_exc
|
|
||||||
|
|
||||||
from ironic_tempest_plugin.tests.api.admin import base
|
from ironic_tempest_plugin.tests.api.admin import base
|
||||||
|
|
||||||
|
@ -16,9 +16,9 @@
|
|||||||
|
|
||||||
from tempest.common import waiters
|
from tempest.common import waiters
|
||||||
from tempest import config
|
from tempest import config
|
||||||
|
from tempest.lib import exceptions as lib_exc
|
||||||
from tempest.scenario import manager # noqa
|
from tempest.scenario import manager # noqa
|
||||||
import tempest.test
|
import tempest.test
|
||||||
from tempest_lib import exceptions as lib_exc
|
|
||||||
|
|
||||||
from ironic_tempest_plugin import clients
|
from ironic_tempest_plugin import clients
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user