x/vmware-nsx
Code Issues Proposed changes

Tempest: change tempest_lib to tempest.lib

Browse Source 
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
This commit is contained in:
Tong Liu
2016-03-02 23:10:59 +00:00
parent e5a97461cc
commit cf38354175
17 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vmware_nsx_tempest/services/load_balancer_v1_client.py
View File

@@ -12,8 +12,8 @@
import time import time
from tempest_lib.common.utils import misc as misc_utils from tempest.lib.common.utils import misc as misc_utils
from tempest_lib import exceptions as lib_exc from tempest.lib import exceptions as lib_exc
from tempest import exceptions from tempest import exceptions
from vmware_nsx_tempest.services import network_client_base as base 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) return self._update_lb(VIP_RID, vip_id, **body)
# Following 3 methods are specifically to load-balancer V1 client. # 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, # with different calling signatures, only id, no resoure_type. Because,
# starting in Liberty release, each resource should have its own client. # starting in Liberty release, each resource should have its own client.
# Since V1 is deprecated, we are not going to change it, and # Since V1 is deprecated, we are not going to change it, and

4
vmware_nsx_tempest/tests/nsxv/api/base_provider.py
View File

@@ -14,8 +14,8 @@
# under the License. # under the License.
import netaddr import netaddr
from tempest_lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
from tempest_lib import exceptions from tempest.lib import exceptions
from tempest.api.network import base from tempest.api.network import base
from tempest import config from tempest import config

2
vmware_nsx_tempest/tests/nsxv/api/test_dns_search_domain.py
View File

@@ -13,7 +13,7 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # 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 config
from tempest import test from tempest import test

2
vmware_nsx_tempest/tests/nsxv/api/test_flat_network.py
View File

@@ -16,7 +16,7 @@
from tempest import test from tempest import test
from oslo_log import log as logging 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 import test_subnets as SNET
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

4
vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway.py
View File

@@ -16,9 +16,9 @@
from tempest.api.network import base from tempest.api.network import base
from tempest import config from tempest import config
from tempest.lib.common.utils import data_utils
from tempest.lib import decorators
from tempest import test 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 base_l2gw
from vmware_nsx_tempest.services import l2_gateway_client as L2GW from vmware_nsx_tempest.services import l2_gateway_client as L2GW

4
vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway_connection.py
View File

@@ -20,8 +20,8 @@ from tempest.api.network import base
from tempest import config from tempest import config
from tempest import test from tempest import test
from tempest_lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
from tempest_lib import decorators from tempest.lib import decorators
from vmware_nsx_tempest.services import base_l2gw from vmware_nsx_tempest.services import base_l2gw
from vmware_nsx_tempest.services import l2_gateway_client as L2GW from vmware_nsx_tempest.services import l2_gateway_client as L2GW

4
vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones.py
View File

@@ -16,8 +16,8 @@
import re import re
import six import six
from tempest_lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
from tempest_lib import decorators from tempest.lib import decorators
import base_provider as base import base_provider as base
from tempest import config from tempest import config

4
vmware_nsx_tempest/tests/nsxv/api/test_multiple_transport_zones_negative.py
View File

@@ -14,8 +14,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from tempest_lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
from tempest_lib import exceptions as lib_exc from tempest.lib import exceptions as lib_exc
from tempest.api.network import base from tempest.api.network import base
from tempest import config from tempest import config

2
vmware_nsx_tempest/tests/nsxv/api/test_router_types.py
View File

@@ -16,7 +16,7 @@
import re import re
import time 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.api.network import base_routers as base
from tempest import config from tempest import config

6
vmware_nsx_tempest/tests/nsxv/api/test_subnets.py
View File

@@ -21,9 +21,9 @@ from tempest import test
import netaddr import netaddr
from oslo_log import log as logging from oslo_log import log as logging
import six import six
from tempest_lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
from tempest_lib import decorators from tempest.lib import decorators
from tempest_lib import exceptions from tempest.lib import exceptions
CONF = config.CONF CONF = config.CONF

4
vmware_nsx_tempest/tests/nsxv/api/test_v1_lbaas.py
View File

@@ -16,8 +16,8 @@
import six import six
from tempest_lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
from tempest_lib import decorators from tempest.lib import decorators
from tempest.api.network import base from tempest.api.network import base
from tempest import config from tempest import config

2
vmware_nsx_tempest/tests/nsxv/api/test_vlan_network.py
View File

@@ -19,7 +19,7 @@ from tempest import config
from tempest import test from tempest import test
from oslo_log import log as logging 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 import test_subnets as SNET
CONF = config.CONF CONF = config.CONF

4
vmware_nsx_tempest/tests/nsxv/scenario/manager_topo_deployment.py
View File

@@ -29,8 +29,8 @@ from tempest.scenario import manager
from tempest import test from tempest import test
import netaddr import netaddr
from tempest_lib.common.utils import data_utils from tempest.lib.common.utils import data_utils
from tempest_lib import exceptions from tempest.lib import exceptions
CONF = config.CONF CONF = config.CONF
LOG = manager.log.getLogger(__name__) LOG = manager.log.getLogger(__name__)

2
vmware_nsx_tempest/tests/nsxv/scenario/test_deployments.py
View File

@@ -19,7 +19,7 @@ from tempest import config
from tempest import test from tempest import test
import manager_topo_deployment as dmgr 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 CONF = config.CONF
LOG = dmgr.manager.log.getLogger(__name__) LOG = dmgr.manager.log.getLogger(__name__)

2
vmware_nsx_tempest/tests/nsxv/scenario/test_dvr_basic_ops.py
View File

@@ -18,7 +18,7 @@ import re
import time import time
from oslo_log import log as logging 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 import testtools
from tempest import config from tempest import config

2
vmware_nsx_tempest/tests/nsxv/scenario/test_multiple_transport_zones_basic_ops.py
View File

@@ -16,7 +16,7 @@
import re import re
import six 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.common import waiters
from tempest import config from tempest import config

2
vmware_nsx_tempest/tests/nsxv/scenario/test_v1_lbaas_basic_ops.py
View File

@@ -20,7 +20,7 @@ import tempfile
import time import time
import urllib2 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 config
from tempest import exceptions from tempest import exceptions