From 2fa4168dc415b764059e09fb53d111b78d45996e Mon Sep 17 00:00:00 2001 From: Puneet Arora Date: Sun, 2 Apr 2017 17:16:48 +0000 Subject: [PATCH] [Tempest]: Reusing Lbaasv2 cases for nsxv3 plugin also. Adding check so that same st of nsxv cases can be reused for nsxv3. Change-Id: Icf8243a5c2c872d4cb6be11fea040adc23accb3c --- vmware_nsx_tempest/tests/nsxv/api/lbaas/base.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/vmware_nsx_tempest/tests/nsxv/api/lbaas/base.py b/vmware_nsx_tempest/tests/nsxv/api/lbaas/base.py index e6c3c9d52b..99d828d12a 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/lbaas/base.py +++ b/vmware_nsx_tempest/tests/nsxv/api/lbaas/base.py @@ -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'])