From a5d3d53b03e11242e5dfcd6b40dc65f58c4a2719 Mon Sep 17 00:00:00 2001 From: Andrey Pavlov Date: Fri, 26 Feb 2016 15:46:06 +0300 Subject: [PATCH] switch from deprecated tempest_lib to tempest.lib Change-Id: I6fa4a27519d8514fda01e71951fdaddc2cda4106 --- api/test_images.py | 2 +- api/test_instance_attributes.py | 2 +- api/test_instances.py | 2 +- api/test_network_interfaces.py | 2 +- api/test_security_groups.py | 2 +- api/test_tags.py | 2 +- base.py | 4 ++-- scenario/base.py | 2 +- scenario/test_ebs_instances.py | 2 +- scenario/test_instance_restart.py | 4 ++-- scenario/test_instances.py | 4 ++-- scenario/test_instances_in_vpc.py | 6 +++--- scenario/test_paging.py | 2 +- scenario/test_vpn.py | 4 ++-- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/api/test_images.py b/api/test_images.py index 5bec093..ae0eb79 100644 --- a/api/test_images.py +++ b/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/api/test_instance_attributes.py b/api/test_instance_attributes.py index c9e1adf..ad16df2 100644 --- a/api/test_instance_attributes.py +++ b/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/api/test_instances.py b/api/test_instances.py index b2880d6..0ff1b33 100644 --- a/api/test_instances.py +++ b/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/api/test_network_interfaces.py b/api/test_network_interfaces.py index 1e95fbb..fe33a4e 100644 --- a/api/test_network_interfaces.py +++ b/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/api/test_security_groups.py b/api/test_security_groups.py index 7525ff7..d251448 100644 --- a/api/test_security_groups.py +++ b/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/api/test_tags.py b/api/test_tags.py index dadf25d..8645fc1 100644 --- a/api/test_tags.py +++ b/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/base.py b/base.py index d801a87..7afb767 100644 --- a/base.py +++ b/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/scenario/base.py b/scenario/base.py index abfc2e7..b222c4c 100644 --- a/scenario/base.py +++ b/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/scenario/test_ebs_instances.py b/scenario/test_ebs_instances.py index 60168a1..77cded8 100644 --- a/scenario/test_ebs_instances.py +++ b/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/scenario/test_instance_restart.py b/scenario/test_instance_restart.py index e40e3f3..8e91b0b 100644 --- a/scenario/test_instance_restart.py +++ b/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/scenario/test_instances.py b/scenario/test_instances.py index f6e96a8..be69a29 100644 --- a/scenario/test_instances.py +++ b/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/scenario/test_instances_in_vpc.py b/scenario/test_instances_in_vpc.py index 7853234..1139938 100644 --- a/scenario/test_instances_in_vpc.py +++ b/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/scenario/test_paging.py b/scenario/test_paging.py index c257e21..8d4b594 100644 --- a/scenario/test_paging.py +++ b/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/scenario/test_vpn.py b/scenario/test_vpn.py index a9441ab..362daf6 100644 --- a/scenario/test_vpn.py +++ b/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