Relocate Geneve DB models
To avoid cyclic imports for OVO work. Change-Id: Iebd5a44d2195276e92111cb8964b90fc2955e2de Partial-Bug: #1597913
This commit is contained in:
parent
ec158688f4
commit
e1a832dad8
|
@ -50,7 +50,6 @@ from neutron.db import segments_db # noqa
|
||||||
from neutron.db import servicetype_db # noqa
|
from neutron.db import servicetype_db # noqa
|
||||||
from neutron.db import tag_db # noqa
|
from neutron.db import tag_db # noqa
|
||||||
from neutron.ipam.drivers.neutrondb_ipam import db_models # noqa
|
from neutron.ipam.drivers.neutrondb_ipam import db_models # noqa
|
||||||
from neutron.plugins.ml2.drivers import type_geneve # noqa
|
|
||||||
from neutron.plugins.ml2 import models as ml2_models # noqa
|
from neutron.plugins.ml2 import models as ml2_models # noqa
|
||||||
from neutron.services.auto_allocate import models as aa_models # noqa
|
from neutron.services.auto_allocate import models as aa_models # noqa
|
||||||
from neutron.services.segments import db # noqa
|
from neutron.services.segments import db # noqa
|
||||||
|
|
|
@ -0,0 +1,42 @@
|
||||||
|
# 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.
|
||||||
|
|
||||||
|
import sqlalchemy as sa
|
||||||
|
from sqlalchemy import sql
|
||||||
|
|
||||||
|
from neutron_lib.db import model_base
|
||||||
|
|
||||||
|
|
||||||
|
class GeneveAllocation(model_base.BASEV2):
|
||||||
|
|
||||||
|
__tablename__ = 'ml2_geneve_allocations'
|
||||||
|
|
||||||
|
geneve_vni = sa.Column(sa.Integer, nullable=False, primary_key=True,
|
||||||
|
autoincrement=False)
|
||||||
|
allocated = sa.Column(sa.Boolean, nullable=False, default=False,
|
||||||
|
server_default=sql.false(), index=True)
|
||||||
|
|
||||||
|
|
||||||
|
class GeneveEndpoints(model_base.BASEV2):
|
||||||
|
"""Represents tunnel endpoint in RPC mode."""
|
||||||
|
|
||||||
|
__tablename__ = 'ml2_geneve_endpoints'
|
||||||
|
__table_args__ = (
|
||||||
|
sa.UniqueConstraint('host',
|
||||||
|
name='unique_ml2_geneve_endpoints0host'),
|
||||||
|
model_base.BASEV2.__table_args__
|
||||||
|
)
|
||||||
|
ip_address = sa.Column(sa.String(64), primary_key=True)
|
||||||
|
host = sa.Column(sa.String(255), nullable=True)
|
||||||
|
|
||||||
|
def __repr__(self):
|
||||||
|
return "<GeneveTunnelEndpoint(%s)>" % self.ip_address
|
|
@ -13,19 +13,23 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
from neutron_lib.db import model_base
|
|
||||||
from neutron_lib import exceptions as n_exc
|
from neutron_lib import exceptions as n_exc
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log
|
from oslo_log import log
|
||||||
import sqlalchemy as sa
|
|
||||||
from sqlalchemy import sql
|
|
||||||
|
|
||||||
from neutron._i18n import _, _LE
|
from neutron._i18n import _, _LE
|
||||||
|
from neutron.common import _deprecate
|
||||||
|
from neutron.db.models.plugins.ml2 import geneveallocation \
|
||||||
|
as geneve_model
|
||||||
from neutron.plugins.common import constants as p_const
|
from neutron.plugins.common import constants as p_const
|
||||||
from neutron.plugins.ml2.drivers import type_tunnel
|
from neutron.plugins.ml2.drivers import type_tunnel
|
||||||
|
|
||||||
LOG = log.getLogger(__name__)
|
LOG = log.getLogger(__name__)
|
||||||
|
|
||||||
|
_deprecate._moved_global('GeneveAllocation', new_module=geneve_model)
|
||||||
|
_deprecate._moved_global('GeneveEndpoints', new_module=geneve_model)
|
||||||
|
|
||||||
geneve_opts = [
|
geneve_opts = [
|
||||||
cfg.ListOpt('vni_ranges',
|
cfg.ListOpt('vni_ranges',
|
||||||
default=[],
|
default=[],
|
||||||
|
@ -47,37 +51,11 @@ geneve_opts = [
|
||||||
cfg.CONF.register_opts(geneve_opts, "ml2_type_geneve")
|
cfg.CONF.register_opts(geneve_opts, "ml2_type_geneve")
|
||||||
|
|
||||||
|
|
||||||
class GeneveAllocation(model_base.BASEV2):
|
|
||||||
|
|
||||||
__tablename__ = 'ml2_geneve_allocations'
|
|
||||||
|
|
||||||
geneve_vni = sa.Column(sa.Integer, nullable=False, primary_key=True,
|
|
||||||
autoincrement=False)
|
|
||||||
allocated = sa.Column(sa.Boolean, nullable=False, default=False,
|
|
||||||
server_default=sql.false(), index=True)
|
|
||||||
|
|
||||||
|
|
||||||
class GeneveEndpoints(model_base.BASEV2):
|
|
||||||
"""Represents tunnel endpoint in RPC mode."""
|
|
||||||
|
|
||||||
__tablename__ = 'ml2_geneve_endpoints'
|
|
||||||
__table_args__ = (
|
|
||||||
sa.UniqueConstraint('host',
|
|
||||||
name='unique_ml2_geneve_endpoints0host'),
|
|
||||||
model_base.BASEV2.__table_args__
|
|
||||||
)
|
|
||||||
ip_address = sa.Column(sa.String(64), primary_key=True)
|
|
||||||
host = sa.Column(sa.String(255), nullable=True)
|
|
||||||
|
|
||||||
def __repr__(self):
|
|
||||||
return "<GeneveTunnelEndpoint(%s)>" % self.ip_address
|
|
||||||
|
|
||||||
|
|
||||||
class GeneveTypeDriver(type_tunnel.EndpointTunnelTypeDriver):
|
class GeneveTypeDriver(type_tunnel.EndpointTunnelTypeDriver):
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
super(GeneveTypeDriver, self).__init__(GeneveAllocation,
|
super(GeneveTypeDriver, self).__init__(geneve_model.GeneveAllocation,
|
||||||
GeneveEndpoints)
|
geneve_model.GeneveEndpoints)
|
||||||
self.max_encap_size = cfg.CONF.ml2_type_geneve.max_header_size
|
self.max_encap_size = cfg.CONF.ml2_type_geneve.max_header_size
|
||||||
|
|
||||||
def get_type(self):
|
def get_type(self):
|
||||||
|
@ -104,3 +82,5 @@ class GeneveTypeDriver(type_tunnel.EndpointTunnelTypeDriver):
|
||||||
def get_mtu(self, physical_network=None):
|
def get_mtu(self, physical_network=None):
|
||||||
mtu = super(GeneveTypeDriver, self).get_mtu()
|
mtu = super(GeneveTypeDriver, self).get_mtu()
|
||||||
return mtu - self.max_encap_size if mtu else 0
|
return mtu - self.max_encap_size if mtu else 0
|
||||||
|
|
||||||
|
_deprecate._MovedGlobals()
|
||||||
|
|
Loading…
Reference in New Issue