9688d06276
The Big Switch ML2 driver re-uses large parts of code from the Big Switch plugin. However, the plugin uses the old portbindings_db in its port tracking code. This db is not created/used by ML2, so it does not exist when the Big Switch ML2 driver is being used. This caused a problem when the portbindings_db module would be imported even though it wasn't being used since the SQLAlchemy models would create the relationships during the import. This patch moves the portbindings_db import down to the methods that leverage it so it won't be imported during use by the ML2 driver. This is a temporary solution which can be back-ported if disabling auto schema generation is back-ported to icehouse. An appropriate fix will require some refactoring to avoid the port tracking code from being imported for ML2. Closes-Bug: #1300628 Change-Id: I551abf9d6ec832c423cba0d50bb27715b43c0b1c
54 lines
2.1 KiB
Python
54 lines
2.1 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
#
|
|
# Copyright 2013, Big Switch Networks
|
|
# 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.
|
|
|
|
from neutron.api.v2 import attributes
|
|
from neutron.openstack.common import log as logging
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
def get_port_hostid(context, port_id):
|
|
# REVISIT(kevinbenton): this is a workaround to avoid portbindings_db
|
|
# relational table generation until one of the functions is called.
|
|
from neutron.db import portbindings_db
|
|
with context.session.begin(subtransactions=True):
|
|
query = context.session.query(portbindings_db.PortBindingPort)
|
|
res = query.filter_by(port_id=port_id).first()
|
|
if not res:
|
|
return False
|
|
return res.host
|
|
|
|
|
|
def put_port_hostid(context, port_id, host):
|
|
# REVISIT(kevinbenton): this is a workaround to avoid portbindings_db
|
|
# relational table generation until one of the functions is called.
|
|
from neutron.db import portbindings_db
|
|
if not attributes.is_attr_set(host):
|
|
LOG.warning(_("No host_id in port request to track port location."))
|
|
return
|
|
if port_id == '':
|
|
LOG.warning(_("Received an empty port ID for host_id '%s'"), host)
|
|
return
|
|
if host == '':
|
|
LOG.debug(_("Received an empty host_id for port '%s'"), port_id)
|
|
return
|
|
LOG.debug(_("Logging port %(port)s on host_id %(host)s"),
|
|
{'port': port_id, 'host': host})
|
|
with context.session.begin(subtransactions=True):
|
|
location = portbindings_db.PortBindingPort(port_id=port_id, host=host)
|
|
context.session.merge(location)
|