From cf38354175702a7a95e0e0a1e3702e6eb843009b Mon Sep 17 00:00:00 2001 From: Tong Liu Date: Wed, 2 Mar 2016 23:10:59 +0000 Subject: [PATCH] Tempest: change tempest_lib to tempest.lib Due to a recent upstream change, tempest project switched to using in-tree tempest lib instead of tempest_lib. We need to change our NSX tempest plugin test to use in-tree tempest lib too. Upstream change: https://review.openstack.org/#/c/284911 Fixes-Bug: #1552453 Change-Id: I522d234d948f5b7a6f70dec69c98c44eb5d7582f --- vmware_nsx_tempest/services/load_balancer_v1_client.py | 6 +++--- vmware_nsx_tempest/tests/nsxv/api/base_provider.py | 4 ++-- vmware_nsx_tempest/tests/nsxv/api/test_dns_search_domain.py | 2 +- vmware_nsx_tempest/tests/nsxv/api/test_flat_network.py | 2 +- vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway.py | 4 ++-- .../tests/nsxv/api/test_l2_gateway_connection.py | 4 ++-- .../tests/nsxv/api/test_multiple_transport_zones.py | 4 ++-- .../nsxv/api/test_multiple_transport_zones_negative.py | 4 ++-- vmware_nsx_tempest/tests/nsxv/api/test_router_types.py | 2 +- vmware_nsx_tempest/tests/nsxv/api/test_subnets.py | 6 +++--- vmware_nsx_tempest/tests/nsxv/api/test_v1_lbaas.py | 4 ++-- vmware_nsx_tempest/tests/nsxv/api/test_vlan_network.py | 2 +- .../tests/nsxv/scenario/manager_topo_deployment.py | 4 ++-- vmware_nsx_tempest/tests/nsxv/scenario/test_deployments.py | 2 +- .../tests/nsxv/scenario/test_dvr_basic_ops.py | 2 +- .../scenario/test_multiple_transport_zones_basic_ops.py | 2 +- .../tests/nsxv/scenario/test_v1_lbaas_basic_ops.py | 2 +- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/vmware_nsx_tempest/services/load_balancer_v1_client.py b/vmware_nsx_tempest/services/load_balancer_v1_client.py index 984a89e0db..87a32aa749 100644 --- a/vmware_nsx_tempest/services/load_balancer_v1_client.py +++ b/vmware_nsx_tempest/services/load_balancer_v1_client.py @@ -12,8 +12,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 from tempest import exceptions from vmware_nsx_tempest.services import network_client_base as base @@ -212,7 +212,7 @@ class LoadBalancerV1Client(base.BaseNetworkClient): return self._update_lb(VIP_RID, vip_id, **body) # Following 3 methods are specifically to load-balancer V1 client. - # They are being implemented by the pareant tempest_lib.common.rest_client + # They are being implemented by the pareant tempest.lib.common.rest_client # with different calling signatures, only id, no resoure_type. Because, # starting in Liberty release, each resource should have its own client. # Since V1 is deprecated, we are not going to change it, and diff --git a/vmware_nsx_tempest/tests/nsxv/api/base_provider.py b/vmware_nsx_tempest/tests/nsxv/api/base_provider.py index dead01ec59..c543000c3d 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/base_provider.py +++ b/vmware_nsx_tempest/tests/nsxv/api/base_provider.py @@ -14,8 +14,8 @@ # under the License. import netaddr -from tempest_lib.common.utils import data_utils -from tempest_lib import exceptions +from tempest.lib.common.utils import data_utils +from tempest.lib import exceptions from tempest.api.network import base from tempest import config diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_dns_search_domain.py b/vmware_nsx_tempest/tests/nsxv/api/test_dns_search_domain.py index d553b06050..71f132e419 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_dns_search_domain.py +++ b/vmware_nsx_tempest/tests/nsxv/api/test_dns_search_domain.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 from tempest import config from tempest import test diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_flat_network.py b/vmware_nsx_tempest/tests/nsxv/api/test_flat_network.py index f780a4387f..deb1ba9124 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_flat_network.py +++ b/vmware_nsx_tempest/tests/nsxv/api/test_flat_network.py @@ -16,7 +16,7 @@ from tempest import test from oslo_log import log as logging -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils import test_subnets as SNET LOG = logging.getLogger(__name__) diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway.py b/vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway.py index 8db136394d..ee9f3a4222 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway.py +++ b/vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway.py @@ -16,9 +16,9 @@ from tempest.api.network import base from tempest import config +from tempest.lib.common.utils import data_utils +from tempest.lib import decorators from tempest import test -from tempest_lib.common.utils import data_utils -from tempest_lib import decorators from vmware_nsx_tempest.services import base_l2gw from vmware_nsx_tempest.services import l2_gateway_client as L2GW diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway_connection.py b/vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway_connection.py index 0c10fad9e3..7c167d426c 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway_connection.py +++ b/vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway_connection.py @@ -20,8 +20,8 @@ from tempest.api.network import base from tempest import config from tempest import test -from tempest_lib.common.utils import data_utils -from tempest_lib import decorators +from tempest.lib.common.utils import data_utils +from tempest.lib import decorators from vmware_nsx_tempest.services import base_l2gw from vmware_nsx_tempest.services import l2_gateway_client as L2GW diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones.py b/vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones.py index e2aa198d0d..79fd0b640c 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones.py +++ b/vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones.py @@ -16,8 +16,8 @@ import re import six -from tempest_lib.common.utils import data_utils -from tempest_lib import decorators +from tempest.lib.common.utils import data_utils +from tempest.lib import decorators import base_provider as base from tempest import config diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones_negative.py b/vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones_negative.py index 287f2f85fe..d1ed197adf 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones_negative.py +++ b/vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones_negative.py @@ -14,8 +14,8 @@ # 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.lib.common.utils import data_utils +from tempest.lib import exceptions as lib_exc from tempest.api.network import base from tempest import config diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_router_types.py b/vmware_nsx_tempest/tests/nsxv/api/test_router_types.py index 652a7fdcfb..f5d5f357c7 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_router_types.py +++ b/vmware_nsx_tempest/tests/nsxv/api/test_router_types.py @@ -16,7 +16,7 @@ import re import time -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils from tempest.api.network import base_routers as base from tempest import config diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_subnets.py b/vmware_nsx_tempest/tests/nsxv/api/test_subnets.py index a16715355e..0f5c9b821a 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_subnets.py +++ b/vmware_nsx_tempest/tests/nsxv/api/test_subnets.py @@ -21,9 +21,9 @@ from tempest import test import netaddr from oslo_log import log as logging import six -from tempest_lib.common.utils import data_utils -from tempest_lib import decorators -from tempest_lib import exceptions +from tempest.lib.common.utils import data_utils +from tempest.lib import decorators +from tempest.lib import exceptions CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_v1_lbaas.py b/vmware_nsx_tempest/tests/nsxv/api/test_v1_lbaas.py index 1e0bcb18e1..9fd4ce121d 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_v1_lbaas.py +++ b/vmware_nsx_tempest/tests/nsxv/api/test_v1_lbaas.py @@ -16,8 +16,8 @@ import six -from tempest_lib.common.utils import data_utils -from tempest_lib import decorators +from tempest.lib.common.utils import data_utils +from tempest.lib import decorators from tempest.api.network import base from tempest import config diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_vlan_network.py b/vmware_nsx_tempest/tests/nsxv/api/test_vlan_network.py index 3780501442..82b3a8a17f 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_vlan_network.py +++ b/vmware_nsx_tempest/tests/nsxv/api/test_vlan_network.py @@ -19,7 +19,7 @@ from tempest import config from tempest import test from oslo_log import log as logging -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils import test_subnets as SNET CONF = config.CONF diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/manager_topo_deployment.py b/vmware_nsx_tempest/tests/nsxv/scenario/manager_topo_deployment.py index 4e835620d8..67e958eed0 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/manager_topo_deployment.py +++ b/vmware_nsx_tempest/tests/nsxv/scenario/manager_topo_deployment.py @@ -29,8 +29,8 @@ from tempest.scenario import manager from tempest import test import netaddr -from tempest_lib.common.utils import data_utils -from tempest_lib import exceptions +from tempest.lib.common.utils import data_utils +from tempest.lib import exceptions CONF = config.CONF LOG = manager.log.getLogger(__name__) diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/test_deployments.py b/vmware_nsx_tempest/tests/nsxv/scenario/test_deployments.py index 896bbd8c04..abdac79bfb 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/test_deployments.py +++ b/vmware_nsx_tempest/tests/nsxv/scenario/test_deployments.py @@ -19,7 +19,7 @@ from tempest import config from tempest import test import manager_topo_deployment as dmgr -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils CONF = config.CONF LOG = dmgr.manager.log.getLogger(__name__) diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/test_dvr_basic_ops.py b/vmware_nsx_tempest/tests/nsxv/scenario/test_dvr_basic_ops.py index f76b5aa800..7e95a82679 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/test_dvr_basic_ops.py +++ b/vmware_nsx_tempest/tests/nsxv/scenario/test_dvr_basic_ops.py @@ -18,7 +18,7 @@ import re import time from oslo_log import log as logging -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils import testtools from tempest import config diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/test_multiple_transport_zones_basic_ops.py b/vmware_nsx_tempest/tests/nsxv/scenario/test_multiple_transport_zones_basic_ops.py index 75a5f886d1..36a058b305 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/test_multiple_transport_zones_basic_ops.py +++ b/vmware_nsx_tempest/tests/nsxv/scenario/test_multiple_transport_zones_basic_ops.py @@ -16,7 +16,7 @@ import re import six -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils from tempest.common import waiters from tempest import config diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/test_v1_lbaas_basic_ops.py b/vmware_nsx_tempest/tests/nsxv/scenario/test_v1_lbaas_basic_ops.py index fa05ce304a..dd824ddc71 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/test_v1_lbaas_basic_ops.py +++ b/vmware_nsx_tempest/tests/nsxv/scenario/test_v1_lbaas_basic_ops.py @@ -20,7 +20,7 @@ import tempfile import time import urllib2 -from tempest_lib.common.utils import data_utils +from tempest.lib.common.utils import data_utils from tempest import config from tempest import exceptions