Merge "Skip validating the subnetpool if it is none"

This commit is contained in:
Zuul 2018-04-09 03:52:36 +00:00 committed by Gerrit Code Review
commit b5cf60a4f0

View File

@ -142,6 +142,8 @@ class KuryrNetwork(network.Network):
admin_context = zun_context.get_admin_context()
neutron_api = neutron.NeutronAPI(admin_context)
subnetpool_id = subnet.get('subnetpool_id')
if not subnetpool_id:
return None
if self._check_valid_subnetpool(neutron_api, subnetpool_id,
subnet['cidr']):
return subnetpool_id