Work around DbBasePluginCommon._get_subnet removal
The upstream commit [0] removed the _get_subnet method from the common DB plugin. However, this method is still in use by the group-based-policy project. As a workaround, we re-add this method to our specialization of the core plugin. This should be replaced at some point by a method that follows upstream. [0]: //review.opendev.org/c/openstack/neutron/+/742829. Change-Id: I64615d499cca206a840a6d70477513132077fd50
This commit is contained in:
parent
b076090cf7
commit
fa6cb71ecf
|
@ -31,15 +31,18 @@ from neutron_lib.api.definitions import port as port_def
|
||||||
from neutron_lib.api.definitions import subnet as subnet_def
|
from neutron_lib.api.definitions import subnet as subnet_def
|
||||||
from neutron_lib.api.definitions import subnetpool as subnetpool_def
|
from neutron_lib.api.definitions import subnetpool as subnetpool_def
|
||||||
from neutron_lib.api import validators
|
from neutron_lib.api import validators
|
||||||
|
from neutron_lib import exceptions
|
||||||
from neutron_lib.callbacks import events
|
from neutron_lib.callbacks import events
|
||||||
from neutron_lib.callbacks import registry
|
from neutron_lib.callbacks import registry
|
||||||
from neutron_lib.callbacks import resources
|
from neutron_lib.callbacks import resources
|
||||||
from neutron_lib import constants as n_const
|
from neutron_lib import constants as n_const
|
||||||
|
from neutron_lib.db import model_query
|
||||||
from neutron_lib.db import resource_extend
|
from neutron_lib.db import resource_extend
|
||||||
from neutron_lib.db import utils as db_utils
|
from neutron_lib.db import utils as db_utils
|
||||||
from neutron_lib.plugins import directory
|
from neutron_lib.plugins import directory
|
||||||
from oslo_log import log
|
from oslo_log import log
|
||||||
from oslo_utils import excutils
|
from oslo_utils import excutils
|
||||||
|
from sqlalchemy.orm import exc
|
||||||
|
|
||||||
from gbpservice.neutron.db import api as db_api
|
from gbpservice.neutron.db import api as db_api
|
||||||
from gbpservice.neutron.db import implicitsubnetpool_db
|
from gbpservice.neutron.db import implicitsubnetpool_db
|
||||||
|
@ -648,6 +651,17 @@ class Ml2PlusPlugin(ml2_plugin.Ml2Plugin,
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
|
# REVISIT: workaround due to the change in
|
||||||
|
# https://review.opendev.org/c/openstack/neutron/+/742829.
|
||||||
|
def _get_subnet(self, context, id):
|
||||||
|
# TODO(slaweq): remove this method when all will be switched to use OVO
|
||||||
|
# objects only
|
||||||
|
try:
|
||||||
|
subnet = model_query.get_by_id(context, models_v2.Subnet, id)
|
||||||
|
except exc.NoResultFound:
|
||||||
|
raise exceptions.SubnetNotFound(subnet_id=id)
|
||||||
|
return subnet
|
||||||
|
|
||||||
@db_api.retry_if_session_inactive()
|
@db_api.retry_if_session_inactive()
|
||||||
def get_subnets(self, context, filters=None, fields=None,
|
def get_subnets(self, context, filters=None, fields=None,
|
||||||
sorts=None, limit=None, marker=None,
|
sorts=None, limit=None, marker=None,
|
||||||
|
|
Loading…
Reference in New Issue