Fix deletion of SVI networks

The auto-deletion of ports on SVI networks was broken in
more recent releases. The reason is that the monkey-patch
to add SVI ports to AUTO_DELETE_PORT_OWNERS wasn't taking
effect. The monkey-patch was moved to a different point
in the import process to ensure that it's applied.

Change-Id: Ib419758cc622f28aef4225d34d1d202dbef2d97a
This commit is contained in:
Thomas Bachman 2021-02-15 19:01:19 +00:00
parent 3aa1d5e51a
commit 339b91bc66
2 changed files with 5 additions and 7 deletions

View File

@ -14,6 +14,7 @@ import copy
from neutron.api import extensions
from neutron.api.v2 import resource as neutron_resource
from neutron.db.db_base_plugin_v2 import _constants
from neutron.db import l3_db
from neutron.db import models_v2
from neutron.db import securitygroups_db
@ -490,3 +491,7 @@ try:
except ImportError as e:
LOG.warning("Import error while patching networking-sfc: %s",
str(e))
DEVICE_OWNER_SVI_PORT = 'apic:svi'
_constants.AUTO_DELETE_PORT_OWNERS.append(DEVICE_OWNER_SVI_PORT)

View File

@ -59,13 +59,6 @@ from oslo_db.sqlalchemy import exc_filters
exc_filters.LOG.exception = exc_filters.LOG.debug
from neutron.common import _constants
DEVICE_OWNER_SVI_PORT = 'apic:svi'
_constants.AUTO_DELETE_PORT_OWNERS.append(DEVICE_OWNER_SVI_PORT)
from neutron.db import db_base_plugin_v2 as db_v2