Merge "Checks if net_dns is None and returns so that we don't attempt to load None objects" into stable/ocata

This commit is contained in:
Jenkins 2017-06-16 02:16:28 +00:00 committed by Gerrit Code Review
commit 609d463473
1 changed files with 2 additions and 0 deletions

View File

@ -252,4 +252,6 @@ class NetworkDNSDomain(base.NeutronDbObject):
models_v2.Port, cls.db_model.network_id ==
models_v2.Port.network_id).filter_by(
id=port_id).one_or_none()
if net_dns is None:
return None
return super(NetworkDNSDomain, cls)._load_object(context, net_dns)