openstack/neutron
Code Issues Proposed changes

_create_subnet_from_implicit_pool assumes external network extension

Browse Source 
network.external is only present if one is using the external_net_db
mixin. This patch just adds a check to see network has the attribute
external to avoid an Attribute error.

Closes-bug: 1441793
Change-Id: Ic003879b557a8c7ab52268a95d08d6d710618438
This commit is contained in:
Aaron Rosen 2015-04-20 12:45:12 -07:00
parent 4d75058804
commit bde4f6f767
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/db/db_base_plugin_v2.py
View File

@ -1260,7 +1260,7 @@ class NeutronDbPluginV2(neutron_plugin_base_v2.NeutronPluginBaseV2,
s['dns_nameservers'],
s['host_routes'],
s['allocation_pools'])
if network.external:
if hasattr(network, 'external') and network.external:
self._update_router_gw_ports(context,
subnet['id'],
subnet['network_id'])
@ -1286,7 +1286,7 @@ class NeutronDbPluginV2(neutron_plugin_base_v2.NeutronPluginBaseV2,
s['dns_nameservers'],
s['host_routes'],
s['allocation_pools'])
if network.external:
if hasattr(network, 'external') and network.external:
self._update_router_gw_ports(context,
subnet['id'],
subnet['network_id'])