From b3ab84fd0947908c329a7b224cb8b59e7b16d7cb Mon Sep 17 00:00:00 2001 From: Lenny Verkhovsky Date: Tue, 8 Mar 2016 17:44:00 +0200 Subject: [PATCH] Replace depricated tempest-lib with tempest.lib Change-Id: Ia674f69f5e5b2a94f3aac5ed497a39e6b71816c0 --- ironic_tempest_plugin/common/waiters.py | 4 ++-- ironic_tempest_plugin/services/baremetal/base.py | 2 +- ironic_tempest_plugin/tests/api/admin/base.py | 4 ++-- ironic_tempest_plugin/tests/api/admin/test_chassis.py | 4 ++-- ironic_tempest_plugin/tests/api/admin/test_nodes.py | 4 ++-- ironic_tempest_plugin/tests/api/admin/test_nodestates.py | 2 +- ironic_tempest_plugin/tests/api/admin/test_ports.py | 4 ++-- ironic_tempest_plugin/tests/api/admin/test_ports_negative.py | 4 ++-- ironic_tempest_plugin/tests/scenario/baremetal_manager.py | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/ironic_tempest_plugin/common/waiters.py b/ironic_tempest_plugin/common/waiters.py index 1a79150652..a32cd61b3f 100644 --- a/ironic_tempest_plugin/common/waiters.py +++ b/ironic_tempest_plugin/common/waiters.py @@ -15,8 +15,8 @@ import time -from tempest_lib.common.utils import misc as misc_utils -from tempest_lib import exceptions as lib_exc +from tempest.lib.common.utils import misc as misc_utils +from tempest.lib import exceptions as lib_exc def wait_for_bm_node_status(client, node_id, attr, status): diff --git a/ironic_tempest_plugin/services/baremetal/base.py b/ironic_tempest_plugin/services/baremetal/base.py index c2546d9349..5b6dea8fb9 100644 --- a/ironic_tempest_plugin/services/baremetal/base.py +++ b/ironic_tempest_plugin/services/baremetal/base.py @@ -15,7 +15,7 @@ import functools from oslo_serialization import jsonutils as json import six 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): diff --git a/ironic_tempest_plugin/tests/api/admin/base.py b/ironic_tempest_plugin/tests/api/admin/base.py index 4b7792f888..61270c7395 100644 --- a/ironic_tempest_plugin/tests/api/admin/base.py +++ b/ironic_tempest_plugin/tests/api/admin/base.py @@ -13,9 +13,9 @@ import functools 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_lib.common.utils import data_utils -from tempest_lib import exceptions as lib_exc from ironic_tempest_plugin import clients diff --git a/ironic_tempest_plugin/tests/api/admin/test_chassis.py b/ironic_tempest_plugin/tests/api/admin/test_chassis.py index edc872fde5..7c19a55fe3 100644 --- a/ironic_tempest_plugin/tests/api/admin/test_chassis.py +++ b/ironic_tempest_plugin/tests/api/admin/test_chassis.py @@ -12,9 +12,9 @@ # under the License. import six +from tempest.lib.common.utils import data_utils +from tempest.lib import exceptions as lib_exc 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 diff --git a/ironic_tempest_plugin/tests/api/admin/test_nodes.py b/ironic_tempest_plugin/tests/api/admin/test_nodes.py index 7f896ad440..79eca55730 100644 --- a/ironic_tempest_plugin/tests/api/admin/test_nodes.py +++ b/ironic_tempest_plugin/tests/api/admin/test_nodes.py @@ -11,9 +11,9 @@ # under the License. import six +from tempest.lib.common.utils import data_utils +from tempest.lib import exceptions as lib_exc 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.tests.api.admin import base diff --git a/ironic_tempest_plugin/tests/api/admin/test_nodestates.py b/ironic_tempest_plugin/tests/api/admin/test_nodestates.py index 7cd03f016d..f418fcc72a 100644 --- a/ironic_tempest_plugin/tests/api/admin/test_nodestates.py +++ b/ironic_tempest_plugin/tests/api/admin/test_nodestates.py @@ -13,8 +13,8 @@ # under the License. from oslo_utils import timeutils +from tempest.lib import exceptions from tempest import test -from tempest_lib import exceptions from ironic_tempest_plugin.tests.api.admin import base diff --git a/ironic_tempest_plugin/tests/api/admin/test_ports.py b/ironic_tempest_plugin/tests/api/admin/test_ports.py index 6ec7966489..04a64213aa 100644 --- a/ironic_tempest_plugin/tests/api/admin/test_ports.py +++ b/ironic_tempest_plugin/tests/api/admin/test_ports.py @@ -11,9 +11,9 @@ # under the License. import six +from tempest.lib.common.utils import data_utils +from tempest.lib import exceptions as lib_exc 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 diff --git a/ironic_tempest_plugin/tests/api/admin/test_ports_negative.py b/ironic_tempest_plugin/tests/api/admin/test_ports_negative.py index 850deae11c..ffac7d3a0f 100644 --- a/ironic_tempest_plugin/tests/api/admin/test_ports_negative.py +++ b/ironic_tempest_plugin/tests/api/admin/test_ports_negative.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # 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_lib.common.utils import data_utils -from tempest_lib import exceptions as lib_exc from ironic_tempest_plugin.tests.api.admin import base diff --git a/ironic_tempest_plugin/tests/scenario/baremetal_manager.py b/ironic_tempest_plugin/tests/scenario/baremetal_manager.py index 3a91c4b765..1f4d78f513 100644 --- a/ironic_tempest_plugin/tests/scenario/baremetal_manager.py +++ b/ironic_tempest_plugin/tests/scenario/baremetal_manager.py @@ -16,9 +16,9 @@ from tempest.common import waiters from tempest import config +from tempest.lib import exceptions as lib_exc from tempest.scenario import manager # noqa import tempest.test -from tempest_lib import exceptions as lib_exc from ironic_tempest_plugin import clients