openstack
/
tempest
Code Issues Proposed changes

Merge "Also calculate external subnets when check cidr whether in use"

This commit is contained in:
Zuul 2020-12-21 22:55:44 +00:00 committed by Gerrit Code Review
parent 7d775d6d1c 4ad346e649
commit 172d71e51e
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tempest/scenario/manager.py
View File

@ -1067,12 +1067,19 @@ class NetworkScenarioTest(ScenarioTest):
def cidr_in_use(cidr, project_id):
"""Check cidr existence
:returns: True if subnet with cidr already exist in tenant
False else
:returns: True if subnet with cidr already exist in tenant or
external False else
"""
cidr_in_use = self.os_admin.subnets_client.list_subnets(
tenant_subnets = self.os_admin.subnets_client.list_subnets(
project_id=project_id, cidr=cidr)['subnets']
return len(cidr_in_use) != 0
external_nets = self.os_admin.networks_client.list_networks(
**{"router:external": True})['networks']
external_subnets = []
for ext_net in external_nets:
external_subnets.extend(
self.os_admin.subnets_client.list_subnets(
network_id=ext_net['id'], cidr=cidr)['subnets'])
return len(tenant_subnets + external_subnets) != 0
ip_version = kwargs.pop('ip_version', 4)