From 8bd32858704e9e9e29dae1aa401fd63798c6182e Mon Sep 17 00:00:00 2001 From: Kobi Samoray Date: Tue, 3 May 2016 19:22:49 +0300 Subject: [PATCH] Fix tempest breakage The following change broke some tempest test: https://review.openstack.org/#/c/311221/ Change-Id: Ic62cd7535f9c7de327e46ad4452c78566353f9f6 --- vmware_nsx_tempest/tests/nsxv/scenario/net_resources.py | 2 +- vmware_nsx_tempest/tests/nsxv/scenario/test_dvr_basic_ops.py | 2 +- .../tests/nsxv/scenario/test_v1_lbaas_basic_ops.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/net_resources.py b/vmware_nsx_tempest/tests/nsxv/scenario/net_resources.py index 07f0fa275d..1355e653f3 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/net_resources.py +++ b/vmware_nsx_tempest/tests/nsxv/scenario/net_resources.py @@ -15,7 +15,7 @@ # This module inherents from resources module and enhances router functions # and block subnet's add_to/delete_from_router so it is more similar to CLI. -from tempest.services.network import resources as n_resources +from tempest.scenario import network_resources as n_resources DELETABLE_CLASS_DEF = """class %(cls_name)s(n_resources.%(cls_name)s): 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 f9e8dfd6a6..3badfc8495 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 @@ -24,7 +24,7 @@ import testtools from tempest import config from tempest import exceptions from tempest.scenario import manager -from tempest.services.network import resources as net_resources +from tempest.scenario import network_resources as net_resources from tempest import test CONF = config.CONF 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 b0e27b2111..138dbef4cd 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 @@ -25,7 +25,7 @@ from tempest.lib.common.utils import data_utils from tempest import config from tempest import exceptions from tempest.scenario import manager -from tempest.services.network import resources as net_resources +from tempest.scenario import network_resources as net_resources from tempest import test from vmware_nsx_tempest.services import load_balancer_v1_client as LBV1C