From 2535cac55fd3e56239bac0fb96719fcf9f7b3916 Mon Sep 17 00:00:00 2001 From: Adit Sarfaty Date: Mon, 2 Apr 2018 13:26:46 +0300 Subject: [PATCH] NSX-v3: fix overlay network check Change-Id: I8e6db4d89b9741f50a19f2499703a9c755063c31 --- vmware_nsx/plugins/nsx_v3/plugin.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/vmware_nsx/plugins/nsx_v3/plugin.py b/vmware_nsx/plugins/nsx_v3/plugin.py index 9b225881d8..6023626d6f 100644 --- a/vmware_nsx/plugins/nsx_v3/plugin.py +++ b/vmware_nsx/plugins/nsx_v3/plugin.py @@ -1037,16 +1037,20 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin, bindings = nsx_db.get_network_bindings(context.session, network_id) # With NSX plugin, "normal" overlay networks will have no binding if not bindings: - # check the backend network - # TODO(asarfaty): Keep TZ type in DB to avoid going to the backend + # check the backend transport zone az = self.get_network_az_by_net_id(context, network_id) - ls = self.nsxlib.logical_switch.get(az._default_overlay_tz_uuid) - tz = ls.get('transport_zone_id') + tz = az._default_overlay_tz_uuid if tz: backend_type = self.nsxlib.transport_zone.get_transport_type( tz) - return (backend_type == - self.nsxlib.transport_zone.TRANSPORT_TYPE_OVERLAY) + if (backend_type != + self.nsxlib.transport_zone.TRANSPORT_TYPE_OVERLAY): + # This is a misconfiguration + LOG.warning("Availability zone %(az)s default overlay TZ " + "%(tz)s is of type %(type)s", + {'az': az.name, 'tz': tz, + 'type': backend_type}) + return False return True binding = bindings[0] if binding.binding_type == utils.NsxV3NetworkTypes.GENEVE: