nsxv fixes
Change-Id: If9582116ab43fafa862afa63112e192ecc08566e
This commit is contained in:
parent
d5c4d014ad
commit
5735e66c2f
|
@ -86,6 +86,7 @@ class RouterSizeBaseTest(base.BaseAdminNetworkTest):
|
||||||
external_gateway_info=ext_gw_info,
|
external_gateway_info=ext_gw_info,
|
||||||
router_type='exclusive',
|
router_type='exclusive',
|
||||||
router_size=router_size)
|
router_size=router_size)
|
||||||
|
self.routers_client.http_obj.connection_pool_kw['timeout'] = 600
|
||||||
router = self.routers_client.create_router(**rtr_cfg)
|
router = self.routers_client.create_router(**rtr_cfg)
|
||||||
router = router.get('router', router)
|
router = router.get('router', router)
|
||||||
self.routers.append(router)
|
self.routers.append(router)
|
||||||
|
|
|
@ -69,9 +69,11 @@ class SubnetTestJSON(base.BaseAdminNetworkTest):
|
||||||
@classmethod
|
@classmethod
|
||||||
def resource_setup(cls):
|
def resource_setup(cls):
|
||||||
super(SubnetTestJSON, cls).resource_setup()
|
super(SubnetTestJSON, cls).resource_setup()
|
||||||
for k, v in cls._provider_network_body.items():
|
temp_dict = {}
|
||||||
if not v:
|
for parameter in sorted(cls._provider_network_body.items()):
|
||||||
cls._provider_network_body.pop(k)
|
if parameter[1]:
|
||||||
|
temp_dict[parameter[0]] = parameter[1]
|
||||||
|
cls._provider_network_body = temp_dict
|
||||||
body = cls.create_network(client=cls.admin_networks_client,
|
body = cls.create_network(client=cls.admin_networks_client,
|
||||||
**cls._provider_network_body)
|
**cls._provider_network_body)
|
||||||
cls.network = body['network']
|
cls.network = body['network']
|
||||||
|
|
|
@ -75,9 +75,11 @@ class VlanNetworksTestJSON(SNET.SubnetTestJSON):
|
||||||
'provider:physical_network': VLAN_PHYSICAL_NETWORK,
|
'provider:physical_network': VLAN_PHYSICAL_NETWORK,
|
||||||
'provider:segmentation_id': segmentation_id}
|
'provider:segmentation_id': segmentation_id}
|
||||||
post_body.update(kwargs)
|
post_body.update(kwargs)
|
||||||
for k, v in post_body.items():
|
temp_dict = {}
|
||||||
if not v:
|
for parameter in sorted(post_body.items()):
|
||||||
post_body.pop(k)
|
if parameter[1]:
|
||||||
|
temp_dict[parameter[0]] = parameter[1]
|
||||||
|
post_body = temp_dict
|
||||||
LOG.debug("create VLAN network: %s", str(post_body))
|
LOG.debug("create VLAN network: %s", str(post_body))
|
||||||
body = self.create_network(**post_body)
|
body = self.create_network(**post_body)
|
||||||
network = body['network']
|
network = body['network']
|
||||||
|
|
Loading…
Reference in New Issue