x/vmware-nsx
Code Issues Proposed changes

Merge "[Tempest]: Reusing Lbaasv2 cases for nsxv3 plugin also."

Browse Source
This commit is contained in:
Jenkins 2017-04-02 15:29:58 +00:00 committed by Gerrit Code Review
commit 58f6333d96
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vmware_nsx_tempest/tests/nsxv/api/lbaas/base.py
View File

@ -87,10 +87,13 @@ class BaseTestCase(base.BaseNetworkTest):
cls.tenant_id = cls.subnet.get('tenant_id')
cls.subnet_id = cls.subnet.get('id')
# NSX-v: load-balancer's subnet need to attach to exclusive-router
router_cfg = dict(router_name=router_name, router_type='exclusive')
if NO_ROUTER_TYPE:
# router_type is NSX-v extension.
router_cfg.pop('router_type', None)
if CONF.nsxv3:
router_cfg = dict(router_name=router_name)
else:
router_cfg = dict(router_name=router_name, router_type='exclusive')
if NO_ROUTER_TYPE:
# router_type is NSX-v extension.
router_cfg.pop('router_type', None)
cls.router = cls.create_router(**router_cfg)
cls.create_router_interface(cls.router['id'], cls.subnet['id'])