From 3642c344360707148de30b9304f808fe6bd67d1f Mon Sep 17 00:00:00 2001 From: Adit Sarfaty Date: Tue, 26 Sep 2017 13:52:13 +0300 Subject: [PATCH] NSX|V3: allow VLAN router interfaces if nsx supports it Change-Id: I0f102d84383de25663f055eb192a96f603615ca3 --- vmware_nsx/plugins/nsx_v3/plugin.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vmware_nsx/plugins/nsx_v3/plugin.py b/vmware_nsx/plugins/nsx_v3/plugin.py index ea46eec799..e7f8ab8c3d 100644 --- a/vmware_nsx/plugins/nsx_v3/plugin.py +++ b/vmware_nsx/plugins/nsx_v3/plugin.py @@ -3371,7 +3371,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})