b10e253dc2
The provider:vlan_id extended attribute is renamed to provider:segmentation_id, and the openvswitch plugin returns the tunnel_id of GRE networks as this attribute. Fixes bug 1044375. Final patch in series that fixes bug 1037341 and bug 1035492. Detailed changes: - Rename provider:vlan_id to provider:segmentation_id. - Use consts for providernet extension's attribute names - Remove validation clause from provider:segmentation_id resource attribute map data. - Validate provider:segmentation_id in linuxbridge and openvswitch plugins. - Rename physical_id to segmentation_id in the openvswitch schema, plugin, and agent. Change-Id: Ic023b30b6e3275955bcb8a09c7936035dacf3f87
111 lines
3.8 KiB
Python
111 lines
3.8 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
# Copyright 2011 Nicira Networks, Inc.
|
|
# All Rights Reserved.
|
|
#
|
|
# 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.
|
|
# @author: Aaron Rosen, Nicira Networks, Inc.
|
|
# @author: Bob Kukura, Red Hat, Inc.
|
|
|
|
|
|
from sqlalchemy import Boolean, Column, ForeignKey, Integer, String
|
|
|
|
from quantum.db.models_v2 import model_base
|
|
|
|
|
|
class VlanAllocation(model_base.BASEV2):
|
|
"""Represents allocation state of vlan_id on physical network"""
|
|
__tablename__ = 'ovs_vlan_allocations'
|
|
|
|
physical_network = Column(String(64), nullable=False, primary_key=True)
|
|
vlan_id = Column(Integer, nullable=False, primary_key=True,
|
|
autoincrement=False)
|
|
allocated = Column(Boolean, nullable=False)
|
|
|
|
def __init__(self, physical_network, vlan_id):
|
|
self.physical_network = physical_network
|
|
self.vlan_id = vlan_id
|
|
self.allocated = False
|
|
|
|
def __repr__(self):
|
|
return "<VlanAllocation(%s,%d,%s)>" % (self.physical_network,
|
|
self.vlan_id, self.allocated)
|
|
|
|
|
|
class TunnelAllocation(model_base.BASEV2):
|
|
"""Represents allocation state of tunnel_id"""
|
|
__tablename__ = 'ovs_tunnel_allocations'
|
|
|
|
tunnel_id = Column(Integer, nullable=False, primary_key=True,
|
|
autoincrement=False)
|
|
allocated = Column(Boolean, nullable=False)
|
|
|
|
def __init__(self, tunnel_id):
|
|
self.tunnel_id = tunnel_id
|
|
self.allocated = False
|
|
|
|
def __repr__(self):
|
|
return "<TunnelAllocation(%d,%s)>" % (self.tunnel_id, self.allocated)
|
|
|
|
|
|
class NetworkBinding(model_base.BASEV2):
|
|
"""Represents binding of virtual network to physical realization"""
|
|
__tablename__ = 'ovs_network_bindings'
|
|
|
|
network_id = Column(String(36),
|
|
ForeignKey('networks.id', ondelete="CASCADE"),
|
|
primary_key=True)
|
|
network_type = Column(String(32), nullable=False) # 'gre', 'vlan', 'flat'
|
|
physical_network = Column(String(64))
|
|
segmentation_id = Column(Integer) # tunnel_id or vlan_id
|
|
|
|
def __init__(self, network_id, network_type, physical_network,
|
|
segmentation_id):
|
|
self.network_id = network_id
|
|
self.network_type = network_type
|
|
self.physical_network = physical_network
|
|
self.segmentation_id = segmentation_id
|
|
|
|
def __repr__(self):
|
|
return "<NetworkBinding(%s,%s,%s,%d)>" % (self.network_id,
|
|
self.network_type,
|
|
self.physical_network,
|
|
self.segmentation_id)
|
|
|
|
|
|
class TunnelIP(model_base.BASEV2):
|
|
"""Represents tunnel endpoint in DB mode"""
|
|
__tablename__ = 'ovs_tunnel_ips'
|
|
|
|
ip_address = Column(String(255), primary_key=True)
|
|
|
|
def __init__(self, ip_address):
|
|
self.ip_address = ip_address
|
|
|
|
def __repr__(self):
|
|
return "<TunnelIP(%s)>" % (self.ip_address)
|
|
|
|
|
|
class TunnelEndpoint(model_base.BASEV2):
|
|
"""Represents tunnel endpoint in RPC mode"""
|
|
__tablename__ = 'ovs_tunnel_endpoints'
|
|
|
|
ip_address = Column(String(64), primary_key=True)
|
|
id = Column(Integer, nullable=False)
|
|
|
|
def __init__(self, ip_address, id):
|
|
self.ip_address = ip_address
|
|
self.id = id
|
|
|
|
def __repr__(self):
|
|
return "<TunnelEndpoint(%s,%s)>" % (self.ip_address, self.id)
|