diff --git a/ec2api/tests/functional/api/test_images.py b/ec2api/tests/functional/api/test_images.py index 5bec093e..ae0eb798 100644 --- a/ec2api/tests/functional/api/test_images.py +++ b/ec2api/tests/functional/api/test_images.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils import testtools from ec2api.tests.functional import base diff --git a/ec2api/tests/functional/api/test_instance_attributes.py b/ec2api/tests/functional/api/test_instance_attributes.py index c9e1adf7..ad16df25 100644 --- a/ec2api/tests/functional/api/test_instance_attributes.py +++ b/ec2api/tests/functional/api/test_instance_attributes.py @@ -16,7 +16,7 @@ import time from oslo_log import log -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils import testtools from ec2api.tests.functional import base diff --git a/ec2api/tests/functional/api/test_instances.py b/ec2api/tests/functional/api/test_instances.py index b2880d63..0ff1b331 100644 --- a/ec2api/tests/functional/api/test_instances.py +++ b/ec2api/tests/functional/api/test_instances.py @@ -14,7 +14,7 @@ # under the License. from oslo_log import log -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils import testtools from ec2api.tests.functional import base diff --git a/ec2api/tests/functional/api/test_network_interfaces.py b/ec2api/tests/functional/api/test_network_interfaces.py index 1e95fbbb..fe33a4e9 100644 --- a/ec2api/tests/functional/api/test_network_interfaces.py +++ b/ec2api/tests/functional/api/test_network_interfaces.py @@ -17,7 +17,7 @@ import time import botocore.exceptions from oslo_log import log -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils import testtools from ec2api.tests.functional import base diff --git a/ec2api/tests/functional/api/test_security_groups.py b/ec2api/tests/functional/api/test_security_groups.py index 7525ff72..d2514489 100644 --- a/ec2api/tests/functional/api/test_security_groups.py +++ b/ec2api/tests/functional/api/test_security_groups.py @@ -16,7 +16,7 @@ import time from oslo_log import log -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils import testtools from ec2api.tests.functional import base diff --git a/ec2api/tests/functional/api/test_tags.py b/ec2api/tests/functional/api/test_tags.py index dadf25d0..8645fc1e 100644 --- a/ec2api/tests/functional/api/test_tags.py +++ b/ec2api/tests/functional/api/test_tags.py @@ -15,7 +15,7 @@ import time -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils import testtools from ec2api.tests.functional import base diff --git a/ec2api/tests/functional/base.py b/ec2api/tests/functional/base.py index d801a873..7afb7673 100644 --- a/ec2api/tests/functional/base.py +++ b/ec2api/tests/functional/base.py @@ -22,8 +22,8 @@ import traceback import botocore.exceptions from oslo_log import log import six -from tempest_lib import base -from tempest_lib import exceptions +from tempest.lib import base +from tempest.lib import exceptions import testtools from ec2api.tests.functional import botocoreclient diff --git a/ec2api/tests/functional/scenario/base.py b/ec2api/tests/functional/scenario/base.py index abfc2e75..b222c4c5 100644 --- a/ec2api/tests/functional/scenario/base.py +++ b/ec2api/tests/functional/scenario/base.py @@ -16,7 +16,7 @@ import time from oslo_log import log -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils from ec2api.tests.functional import base from ec2api.tests.functional import config diff --git a/ec2api/tests/functional/scenario/test_ebs_instances.py b/ec2api/tests/functional/scenario/test_ebs_instances.py index 60168a17..77cded8f 100644 --- a/ec2api/tests/functional/scenario/test_ebs_instances.py +++ b/ec2api/tests/functional/scenario/test_ebs_instances.py @@ -15,7 +15,7 @@ import math from oslo_log import log -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils import testtools from ec2api.tests.functional import base diff --git a/ec2api/tests/functional/scenario/test_instance_restart.py b/ec2api/tests/functional/scenario/test_instance_restart.py index e40e3f34..8e91b0be 100644 --- a/ec2api/tests/functional/scenario/test_instance_restart.py +++ b/ec2api/tests/functional/scenario/test_instance_restart.py @@ -14,8 +14,8 @@ # under the License. from oslo_log import log -from tempest_lib.common import ssh -from tempest_lib.common.utils import data_utils +from tempest.lib.common import ssh +from tempest.lib.common.utils import data_utils import testtools from ec2api.tests.functional import base diff --git a/ec2api/tests/functional/scenario/test_instances.py b/ec2api/tests/functional/scenario/test_instances.py index f6e96a83..be69a29d 100644 --- a/ec2api/tests/functional/scenario/test_instances.py +++ b/ec2api/tests/functional/scenario/test_instances.py @@ -18,8 +18,8 @@ import os from oslo_log import log import six -from tempest_lib.common import ssh -from tempest_lib.common.utils import data_utils +from tempest.lib.common import ssh +from tempest.lib.common.utils import data_utils import testtools from ec2api.tests.functional import base diff --git a/ec2api/tests/functional/scenario/test_instances_in_vpc.py b/ec2api/tests/functional/scenario/test_instances_in_vpc.py index 78532347..11399381 100644 --- a/ec2api/tests/functional/scenario/test_instances_in_vpc.py +++ b/ec2api/tests/functional/scenario/test_instances_in_vpc.py @@ -15,9 +15,9 @@ import netaddr from oslo_log import log -from tempest_lib.common import ssh -from tempest_lib.common.utils import data_utils -from tempest_lib import exceptions +from tempest.lib.common import ssh +from tempest.lib.common.utils import data_utils +from tempest.lib import exceptions import testtools from ec2api.tests.functional import base diff --git a/ec2api/tests/functional/scenario/test_paging.py b/ec2api/tests/functional/scenario/test_paging.py index c257e214..8d4b5948 100644 --- a/ec2api/tests/functional/scenario/test_paging.py +++ b/ec2api/tests/functional/scenario/test_paging.py @@ -17,7 +17,7 @@ import time import botocore.exceptions from oslo_log import log -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils from ec2api.tests.functional import base from ec2api.tests.functional import config diff --git a/ec2api/tests/functional/scenario/test_vpn.py b/ec2api/tests/functional/scenario/test_vpn.py index a9441abf..362daf6b 100644 --- a/ec2api/tests/functional/scenario/test_vpn.py +++ b/ec2api/tests/functional/scenario/test_vpn.py @@ -21,8 +21,8 @@ import urllib2 from lxml import etree from oslo_log import log import paramiko -from tempest_lib.common import ssh -from tempest_lib.common.utils import data_utils +from tempest.lib.common import ssh +from tempest.lib.common.utils import data_utils import testtools from ec2api.tests.functional import base diff --git a/test-requirements.txt b/test-requirements.txt index 2defcb36..0b86d6ed 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,6 +7,5 @@ oslotest>=1.10.0 # Apache-2.0 pylint==1.4.4 # GNU GPL v2 python-subunit>=0.0.18 sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -tempest-lib>=0.10.0 testrepository>=0.0.18 testtools>=1.4.0