046672247d
Fixed the queries to retrieve the segment ID allocations when service plugin network_segment_range is enabled. With the previous implementation, a project user was able to allocate a segment ID belonging to other project segment range. The solution implemented was discussed in [1]: - A project user will retrieve segments from the project ranges. - When depleted, the segment IDs will be retrieved from the shared range, never using another project segment ID. [1]http://lists.openstack.org/pipermail/openstack-discuss/2020-February/012736.html Change-Id: I953062d9ee8ee5ee9a9f07aff4a8222ac63ed525 Closes-Bug: #1863423
55 lines
1.7 KiB
Python
55 lines
1.7 KiB
Python
# Copyright (c) 2016 Intel Corporation.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from neutron_lib import constants as n_const
|
|
from oslo_versionedobjects import fields as obj_fields
|
|
|
|
from neutron.db.models.plugins.ml2 import geneveallocation
|
|
from neutron.objects import base
|
|
from neutron.objects.plugins.ml2 import base as ml2_base
|
|
|
|
|
|
@base.NeutronObjectRegistry.register
|
|
class GeneveAllocation(base.NeutronDbObject, ml2_base.SegmentAllocation):
|
|
# Version 1.0: Initial version
|
|
VERSION = '1.0'
|
|
|
|
db_model = geneveallocation.GeneveAllocation
|
|
|
|
primary_keys = ['geneve_vni']
|
|
|
|
fields = {
|
|
'geneve_vni': obj_fields.IntegerField(),
|
|
'allocated': obj_fields.BooleanField(default=False),
|
|
}
|
|
|
|
network_type = n_const.TYPE_GENEVE
|
|
|
|
@classmethod
|
|
def get_segmentation_id(cls):
|
|
return cls.db_model.get_segmentation_id()
|
|
|
|
|
|
@base.NeutronObjectRegistry.register
|
|
class GeneveEndpoint(ml2_base.EndpointBase):
|
|
# Version 1.0: Initial version
|
|
VERSION = '1.0'
|
|
|
|
db_model = geneveallocation.GeneveEndpoints
|
|
|
|
fields = {
|
|
'ip_address': obj_fields.IPAddressField(),
|
|
'host': obj_fields.StringField(nullable=True),
|
|
}
|