From 606dfa3cacc537ffa1864472139f34198ca6074f Mon Sep 17 00:00:00 2001 From: asarfaty Date: Thu, 16 Jul 2020 06:36:04 +0200 Subject: [PATCH] Fix broken code due to openstack updates Stop using constant AUTO_DELETE_PORT_OWNERS as Commit Iba02f5a2211b18c2deb9097daad6be5e7d21faf8 removed this Cheery picked from commit I25ad6e1670d19fa3dcf8210eb4fd13aef6c3ad37 Change-Id: Ib4ede63f28757a3591b991b1293144e8ba08ad15 --- vmware_nsx/plugins/common_v3/plugin.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vmware_nsx/plugins/common_v3/plugin.py b/vmware_nsx/plugins/common_v3/plugin.py index 7419a7b6c9..bcd8eca996 100644 --- a/vmware_nsx/plugins/common_v3/plugin.py +++ b/vmware_nsx/plugins/common_v3/plugin.py @@ -33,7 +33,6 @@ from neutron.db import agents_db from neutron.db import agentschedulers_db from neutron.db import allowedaddresspairs_db as addr_pair_db from neutron.db.availability_zone import router as router_az_db -from neutron.db import db_base_plugin_v2 from neutron.db import dns_db from neutron.db import external_net_db from neutron.db import extradhcpopt_db @@ -2511,8 +2510,7 @@ class NsxPluginV3Base(agentschedulers_db.AZDhcpAgentSchedulerDbMixin, def _has_active_port(self, context, network_id): ports_in_use = context.session.query(models_v2.Port).filter_by( network_id=network_id).all() - return not all([p.device_owner in - db_base_plugin_v2.AUTO_DELETE_PORT_OWNERS + return not all([p.device_owner == constants.DEVICE_OWNER_DHCP for p in ports_in_use]) if ports_in_use else False def _delete_network_disable_dhcp(self, context, network_id):