x/vmware-nsx
Code Issues Proposed changes

Merge "NSX|V3: allow VLAN router interfaces if nsx supports it"

Browse Source
This commit is contained in:
Jenkins 2017-10-06 06:45:44 +00:00 committed by Gerrit Code Review
commit c8b940ce3c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vmware_nsx/plugins/nsx_v3/plugin.py
View File

@ -3435,7 +3435,10 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
def _validate_multiple_subnets_routers(self, context, router_id, net_id):
network = self.get_network(context, net_id)
net_type = network.get(pnet.NETWORK_TYPE)
if (net_type and not self._is_overlay_network(context, net_id)):
if (net_type and
not self.nsxlib.feature_supported(
nsxlib_consts.FEATURE_VLAN_ROUTER_INTERFACE) and
not self._is_overlay_network(context, net_id)):
err_msg = (_("Only overlay networks can be attached to a logical "
"router. Network %(net_id)s is a %(net_type)s based "
"network") % {'net_id': net_id, 'net_type': net_type})