openstack/neutron
Code Issues Proposed changes

Merge "Removed ovsdbapp deprecation warnings"

Browse Source
This commit is contained in:
Jenkins 2017-07-13 22:59:54 +00:00 committed by Gerrit Code Review
commit a9fd0e5f77
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
neutron/agent/ovsdb/impl_idl.py
View File

@ -14,11 +14,12 @@
from debtcollector import moves from debtcollector import moves
from oslo_config import cfg from oslo_config import cfg
from ovsdbapp.backend.ovs_idl import connection
from ovsdbapp.backend.ovs_idl import transaction from ovsdbapp.backend.ovs_idl import transaction
from ovsdbapp.backend.ovs_idl import vlog
from ovsdbapp.schema.open_vswitch import impl_idl from ovsdbapp.schema.open_vswitch import impl_idl
from neutron.agent.ovsdb.native import connection from neutron.agent.ovsdb.native import connection as n_connection
from neutron.agent.ovsdb.native import vlog
from neutron.conf.agent import ovs_conf from neutron.conf.agent import ovs_conf
NeutronOVSDBTransaction = moves.moved_class( NeutronOVSDBTransaction = moves.moved_class(
@ -43,11 +44,12 @@ def api_factory(context):
if _connection is None: if _connection is None:
try: try:
_connection = connection.Connection( _connection = connection.Connection(
idl=connection.idl_factory(), idl=n_connection.idl_factory(),
timeout=cfg.CONF.ovs_vsctl_timeout) timeout=cfg.CONF.ovs_vsctl_timeout)
except TypeError: except TypeError:
#pylint: disable=unexpected-keyword-arg,no-value-for-parameter
_connection = connection.Connection( _connection = connection.Connection(
idl_factory=connection.idl_factory, idl_factory=n_connection.idl_factory, # noqa
timeout=cfg.CONF.ovs_vsctl_timeout) timeout=cfg.CONF.ovs_vsctl_timeout)
return NeutronOvsdbIdl(_connection) return NeutronOvsdbIdl(_connection)