openstack
/
neutron
Code Issues Proposed changes

ipam_backend_mixin: Service Type model to OVO 

Migrate to using Service Type OVO objects
in the IPAM backend mixin code

Change-Id: Ifcbaf471f4b5f6e6ddf277c35f01e7cba71fd087
Partially-Implements: blueprint adopt-oslo-versioned-objects-for-db
This commit is contained in:
Vu Cong Tuan 2018-04-19 13:02:55 +07:00
parent 0dada3b26d
commit 642e41dda7
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
neutron/db/ipam_backend_mixin.py
View File

@ -37,7 +37,6 @@ from neutron.db import _utils as db_utils
from neutron.db import api as db_api
from neutron.db import db_base_plugin_common
from neutron.db.models import segment as segment_model
from neutron.db.models import subnet_service_type as sst_model
from neutron.db import models_v2
from neutron.extensions import segment
from neutron.ipam import exceptions as ipam_exceptions
@ -607,21 +606,6 @@ class IpamBackendMixin(db_base_plugin_common.DbBasePluginCommon):
query = model_query.get_collection_query(context, models_v2.Subnet)
return query.filter(models_v2.Subnet.network_id == network_id)
def _query_filter_service_subnets(self, query, service_type):
# TODO(korzen) use SubnetServiceType OVO here
Subnet = models_v2.Subnet
ServiceType = sst_model.SubnetServiceType
query = query.add_entity(ServiceType)
query = query.outerjoin(ServiceType)
query = query.filter(or_(
ServiceType.service_type.is_(None),
ServiceType.service_type == service_type,
# Allow DHCP ports to be created on subnets of any
# service type when DHCP is enabled on the subnet.
and_(Subnet.enable_dhcp.is_(True),
service_type == const.DEVICE_OWNER_DHCP)))
return query.from_self(Subnet)
@staticmethod
def _query_filter_by_segment_host_mapping(query, host):
"""Excludes subnets on segments not reachable by the host
@ -703,7 +687,8 @@ class IpamBackendMixin(db_base_plugin_common.DbBasePluginCommon):
return []
# Does filtering ineligible service subnets makes the list empty?
query = self._query_filter_service_subnets(query, service_type)
query = subnet_obj.SubnetServiceType.query_filter_service_subnets(
query, service_type)
if query.limit(1).count():
# No, must be a deferred IP port because there are matching
# subnets. Happens on routed networks when host isn't known.
@ -716,7 +701,8 @@ class IpamBackendMixin(db_base_plugin_common.DbBasePluginCommon):
fixed_configured):
"""Find canditate subnets for the network, host, and service_type"""
query = self._query_subnets_on_network(context, network_id)
query = self._query_filter_service_subnets(query, service_type)
query = subnet_obj.SubnetServiceType.query_filter_service_subnets(
query, service_type)
# Select candidate subnets and return them
if not self.is_host_set(host):

18
neutron/objects/subnet.py
View File

@ -11,8 +11,10 @@
# under the License.
import netaddr
from neutron_lib import constants as const
from oslo_versionedobjects import fields as obj_fields
from sqlalchemy import and_, or_
from neutron.common import utils
from neutron.db.models import subnet_service_type
@ -154,6 +156,22 @@ class SubnetServiceType(base.NeutronDbObject):
'service_type': obj_fields.StringField()
}
@classmethod
def query_filter_service_subnets(cls, query, service_type):
# TODO(tuanvu): find OVO-like solution for handling "join queries"
Subnet = models_v2.Subnet
ServiceType = subnet_service_type.SubnetServiceType
query = query.add_entity(ServiceType)
query = query.outerjoin(ServiceType)
query = query.filter(or_(
ServiceType.service_type.is_(None),
ServiceType.service_type == service_type,
# Allow DHCP ports to be created on subnets of any
# service type when DHCP is enabled on the subnet.
and_(Subnet.enable_dhcp.is_(True),
service_type == const.DEVICE_OWNER_DHCP)))
return query.from_self(Subnet)
# RBAC metaclass is not applied here because 'shared' attribute of Subnet
# is dependent on Network 'shared' state, and in Subnet object