c3fd3feba6
Fixes bug 1127664 Network cannot be created in NEC plugin when OFC network ID is unique inside a tenant. Some OFC implmenetations generate a network ID unique inside a tenant. In this case generated network IDs on can be duplicated in system-wide. To fix it, this changes resource ID on OFC to REST URI to make sure IDs on OFC globally unique. Fixes bug 1120962 Make sure NEC plugin creates shared networks In Quantum resource relationship is not limited inside a tenant. E.g., a non-owner tenant can create a port on a shared network. To deal with it the provider layer should not be aware of tenants each resource belongs to even when it has a kind of tenant concept. This commit changes ofc_manager to pass a parent resource for resource creation and identify a resouce by REST URI used to access OFC resources. It decouples Quantum resource access model from OFC resource models. OFC IDs created before this commit are also looked up. Primary keys of OFC ID mapping tables are changed to quantum_id because most of all accesses to these mapping tables are done by quantum_id. However the current version of alembic does not support changing primary keys, so new OFC ID mapping tables for tenant, network, port and packet filter are created. Dropping the previous mapping tables will be done along with the data migration logic. This commit also changes the following minor issues. - Make sure ID on ProgrammableFlow OpenFlow controller (PFC) is less than 32 chars. The current PFC accepts only 31 chars max as ID and 127 chars as a description string. - Some database accesses created their own session and did not support subtransactions. Make sure to use context.session passed from the API layer. - Removes Unused methods (update_network, update_port) in trema/pfc drivers. Change-Id: Ib4bb830e5f537c789974fa7b77f06eaeacb65333
229 lines
7.4 KiB
Python
229 lines
7.4 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
#
|
|
# Copyright 2012 NEC Corporation. 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: Ryota MIBU
|
|
|
|
import sqlalchemy as sa
|
|
|
|
from quantum.db import api as db
|
|
from quantum.db import model_base
|
|
from quantum.db import models_v2
|
|
from quantum.db import securitygroups_db as sg_db
|
|
from quantum.extensions import securitygroup as ext_sg
|
|
from quantum import manager
|
|
from quantum.openstack.common import log as logging
|
|
# NOTE (e0ne): this import is needed for config init
|
|
from quantum.plugins.nec.common import config
|
|
from quantum.plugins.nec.common import exceptions as nexc
|
|
from quantum.plugins.nec.db import models as nmodels
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
OFP_VLAN_NONE = 0xffff
|
|
|
|
|
|
resource_map = {'ofc_tenant': nmodels.OFCTenantMapping,
|
|
'ofc_network': nmodels.OFCNetworkMapping,
|
|
'ofc_port': nmodels.OFCPortMapping,
|
|
'ofc_packet_filter': nmodels.OFCFilterMapping}
|
|
|
|
old_resource_map = {'ofc_tenant': nmodels.OFCTenant,
|
|
'ofc_network': nmodels.OFCNetwork,
|
|
'ofc_port': nmodels.OFCPort,
|
|
'ofc_packet_filter': nmodels.OFCFilter}
|
|
|
|
|
|
# utitlity methods
|
|
|
|
def _get_resource_model(resource, old_style):
|
|
if old_style:
|
|
return old_resource_map[resource]
|
|
else:
|
|
return resource_map[resource]
|
|
|
|
|
|
def initialize():
|
|
db.configure_db()
|
|
|
|
|
|
def clear_db(base=model_base.BASEV2):
|
|
db.clear_db(base)
|
|
|
|
|
|
def get_ofc_item(session, resource, quantum_id, old_style=False):
|
|
try:
|
|
model = _get_resource_model(resource, old_style)
|
|
return session.query(model).filter_by(quantum_id=quantum_id).one()
|
|
except sa.orm.exc.NoResultFound:
|
|
return None
|
|
|
|
|
|
def get_ofc_id(session, resource, quantum_id, old_style=False):
|
|
ofc_item = get_ofc_item(session, resource, quantum_id, old_style)
|
|
if ofc_item:
|
|
if old_style:
|
|
return ofc_item.id
|
|
else:
|
|
return ofc_item.ofc_id
|
|
else:
|
|
return None
|
|
|
|
|
|
def exists_ofc_item(session, resource, quantum_id, old_style=False):
|
|
if get_ofc_item(session, resource, quantum_id, old_style):
|
|
return True
|
|
else:
|
|
return False
|
|
|
|
|
|
def find_ofc_item(session, resource, ofc_id, old_style=False):
|
|
try:
|
|
model = _get_resource_model(resource, old_style)
|
|
if old_style:
|
|
params = dict(id=ofc_id)
|
|
else:
|
|
params = dict(ofc_id=ofc_id)
|
|
return (session.query(model).filter_by(**params).one())
|
|
except sa.orm.exc.NoResultFound:
|
|
return None
|
|
|
|
|
|
def add_ofc_item(session, resource, quantum_id, ofc_id, old_style=False):
|
|
try:
|
|
model = _get_resource_model(resource, old_style)
|
|
if old_style:
|
|
params = dict(quantum_id=quantum_id, id=ofc_id)
|
|
else:
|
|
params = dict(quantum_id=quantum_id, ofc_id=ofc_id)
|
|
item = model(**params)
|
|
session.add(item)
|
|
session.flush()
|
|
except Exception as exc:
|
|
LOG.exception(exc)
|
|
raise nexc.NECDBException
|
|
return item
|
|
|
|
|
|
def del_ofc_item(session, resource, quantum_id, old_style=False,
|
|
warning=True):
|
|
try:
|
|
model = _get_resource_model(resource, old_style)
|
|
item = session.query(model).filter_by(quantum_id=quantum_id).one()
|
|
session.delete(item)
|
|
session.flush()
|
|
return True
|
|
except sa.orm.exc.NoResultFound:
|
|
if warning:
|
|
LOG.warning(_("_del_ofc_item(): NotFound item "
|
|
"(model=%(model)s, id=%(id)s) "),
|
|
{'model': model, 'id': quantum_id})
|
|
return False
|
|
|
|
|
|
def get_ofc_id_lookup_both(session, resource, quantum_id):
|
|
ofc_id = get_ofc_id(session, resource, quantum_id)
|
|
# Lookup old style of OFC mapping table
|
|
if not ofc_id:
|
|
ofc_id = get_ofc_id(session, resource, quantum_id,
|
|
old_style=True)
|
|
if not ofc_id:
|
|
reason = (_("NotFound %(resource)s for quantum_id=%(id)s.")
|
|
% {'resource': resource, 'id': quantum_id})
|
|
raise nexc.OFCConsistencyBroken(reason=reason)
|
|
return ofc_id
|
|
|
|
|
|
def exists_ofc_item_lookup_both(session, resource, quantum_id):
|
|
if exists_ofc_item(session, resource, quantum_id):
|
|
return True
|
|
# Check old style of OFC mapping table
|
|
if exists_ofc_item(session, resource, quantum_id,
|
|
old_style=True):
|
|
return True
|
|
return False
|
|
|
|
|
|
def del_ofc_item_lookup_both(session, resource, quantum_id):
|
|
# Delete the mapping from new style of OFC mapping table
|
|
if del_ofc_item(session, resource, quantum_id,
|
|
old_style=False, warning=False):
|
|
return
|
|
# Delete old style of OFC mapping table
|
|
if del_ofc_item(session, resource, quantum_id,
|
|
old_style=True, warning=False):
|
|
return
|
|
# The specified resource not found
|
|
LOG.warning(_("_del_ofc_item(): NotFound item "
|
|
"(resource=%(resource)s, id=%(id)s) "),
|
|
{'resource': resource, 'id': quantum_id})
|
|
|
|
|
|
def get_portinfo(session, id):
|
|
try:
|
|
return (session.query(nmodels.PortInfo).
|
|
filter_by(id=id).
|
|
one())
|
|
except sa.orm.exc.NoResultFound:
|
|
return None
|
|
|
|
|
|
def add_portinfo(session, id, datapath_id='', port_no=0,
|
|
vlan_id=OFP_VLAN_NONE, mac=''):
|
|
try:
|
|
portinfo = nmodels.PortInfo(id=id, datapath_id=datapath_id,
|
|
port_no=port_no, vlan_id=vlan_id, mac=mac)
|
|
session.add(portinfo)
|
|
session.flush()
|
|
except Exception as exc:
|
|
LOG.exception(exc)
|
|
raise nexc.NECDBException
|
|
return portinfo
|
|
|
|
|
|
def del_portinfo(session, id):
|
|
try:
|
|
portinfo = session.query(nmodels.PortInfo).filter_by(id=id).one()
|
|
session.delete(portinfo)
|
|
session.flush()
|
|
except sa.orm.exc.NoResultFound:
|
|
LOG.warning(_("del_portinfo(): NotFound portinfo for "
|
|
"port_id: %s"), id)
|
|
|
|
|
|
def get_port_from_device(port_id):
|
|
"""Get port from database"""
|
|
LOG.debug(_("get_port_with_securitygroups() called:port_id=%s"), port_id)
|
|
session = db.get_session()
|
|
sg_binding_port = sg_db.SecurityGroupPortBinding.port_id
|
|
|
|
query = session.query(models_v2.Port,
|
|
sg_db.SecurityGroupPortBinding.security_group_id)
|
|
query = query.outerjoin(sg_db.SecurityGroupPortBinding,
|
|
models_v2.Port.id == sg_binding_port)
|
|
query = query.filter(models_v2.Port.id == port_id)
|
|
port_and_sgs = query.all()
|
|
if not port_and_sgs:
|
|
return None
|
|
port = port_and_sgs[0][0]
|
|
plugin = manager.QuantumManager.get_plugin()
|
|
port_dict = plugin._make_port_dict(port)
|
|
port_dict[ext_sg.SECURITYGROUPS] = [
|
|
sg_id for port, sg_id in port_and_sgs if sg_id]
|
|
port_dict['security_group_rules'] = []
|
|
port_dict['security_group_source_groups'] = []
|
|
port_dict['fixed_ips'] = [ip['ip_address']
|
|
for ip in port['fixed_ips']]
|
|
return port_dict
|