Merge "Check subnet in "_remove_subnet_dhcp_options"" into stable/ussuri

5 months ago · de490c54db
1 changed files with 1 additions and 1 deletions
--- a/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py
+++ b/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_client.py
@ -1909,7 +1909,7 @@ class OVNClient(object):
        dhcp_options = self._nb_idl.get_subnet_dhcp_options(
            subnet_id, with_ports=True)

-        if dhcp_options['subnet'] is not None:
+        if dhcp_options['subnet']:
            txn.add(self._nb_idl.delete_dhcp_options(
                dhcp_options['subnet']['uuid']))