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

Change-Id: I0f102d84383de25663f055eb192a96f603615ca3
This commit is contained in:
Adit Sarfaty 2017-09-26 13:52:13 +03:00
parent cd06cd21c4
commit 3642c34436

View File

@ -3371,7 +3371,10 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
def _validate_multiple_subnets_routers(self, context, router_id, net_id): def _validate_multiple_subnets_routers(self, context, router_id, net_id):
network = self.get_network(context, net_id) network = self.get_network(context, net_id)
net_type = network.get(pnet.NETWORK_TYPE) 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 " err_msg = (_("Only overlay networks can be attached to a logical "
"router. Network %(net_id)s is a %(net_type)s based " "router. Network %(net_id)s is a %(net_type)s based "
"network") % {'net_id': net_id, 'net_type': net_type}) "network") % {'net_id': net_id, 'net_type': net_type})