x/quark
Code Issues Proposed changes

Merge pull request #484 from rackerlabs/ncp1746

Browse Source 
Exclude provider subnets from overlapping CIDR validation
This commit is contained in:
Justin Hammond
2015-10-30 09:16:24 -05:00
parent dfaf24931e 78c3b56309
commit 0f67c0ddc8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
quark/plugin_modules/subnets.py
View File

@@ -65,7 +65,8 @@ def _validate_subnet_cidr(context, network_id, new_subnet_cidr):
# Using admin context here, in case we actually share networks later # Using admin context here, in case we actually share networks later
subnet_list = db_api.subnet_find(context.elevated(), None, None, None, subnet_list = db_api.subnet_find(context.elevated(), None, None, None,
False, network_id=network_id) False, network_id=network_id,
shared=[False])
for subnet in subnet_list: for subnet in subnet_list:
if (netaddr.IPSet([subnet.cidr]) & new_subnet_ipset): if (netaddr.IPSet([subnet.cidr]) & new_subnet_ipset):
# don't give out details of the overlapping subnet # don't give out details of the overlapping subnet