Merge "Switch to use directly ovsdbapp.api module"

neutron/agent/ovsdb/api.py

@@ -15,20 +15,11 @@
 import collections
 import uuid
 
-from debtcollector import moves
 from oslo_config import cfg
 from oslo_utils import importutils
-from ovsdbapp import api
-from ovsdbapp import exceptions
 
 from neutron.conf.agent import ovsdb_api
 
-API = moves.moved_class(api.API, 'API', __name__)
-Command = moves.moved_class(api.Command, 'Command', __name__)
-Transaction = moves.moved_class(api.Transaction, 'Transaction', __name__)
-TimeoutException = moves.moved_class(exceptions.TimeoutException,
-                                     'TimeoutException', __name__)
-
 
 ovsdb_api.register_ovsdb_api_opts()
 

neutron/agent/ovsdb/impl_vsctl.py

@@ -20,6 +20,7 @@ from oslo_log import log as logging
 from oslo_serialization import jsonutils
 from oslo_utils import excutils
 from oslo_utils import uuidutils
+from ovsdbapp import api as ovsdb_api
 import six
 
 from neutron.agent.common import utils
@@ -32,7 +33,7 @@ def api_factory(context):
     return OvsdbVsctl(context)
 
 
-class Transaction(ovsdb.Transaction):
+class Transaction(ovsdb_api.Transaction):
     def __init__(self, context, check_error=False, log_errors=True, opts=None):
         self.context = context
         self.check_error = check_error
@@ -76,7 +77,7 @@ class Transaction(ovsdb.Transaction):
                     ctxt.reraise = False
 
 
-class BaseCommand(ovsdb.Command):
+class BaseCommand(ovsdb_api.Command):
     def __init__(self, context, cmd, opts=None, args=None):
         self.context = context
         self.cmd = cmd
@@ -180,7 +181,7 @@ class BrExistsCommand(DbCommand):
                                                     log_errors=False)
 
 
-class OvsdbVsctl(ovsdb.API):
+class OvsdbVsctl(ovsdb_api.API):
     def __init__(self, context):
         super(OvsdbVsctl, self).__init__()
         self.context = context

neutron/tests/functional/services/logapi/test_logging.py

@@ -66,7 +66,8 @@ class LoggingExtensionTestFramework(test_firewall.BaseFirewallTestCase):
         int_br = ovs_ext_api.OVSCookieBridge(ovs_bridge.OVSAgentBridge(
             self.tester.bridge.br_name))
         mock.patch('ryu.base.app_manager.AppManager.get_instance').start()
-        mock.patch('neutron.agent.ovsdb.api.API.transaction').start()
+        mock.patch(
+            'neutron.agent.ovsdb.impl_vsctl.OvsdbVsctl.transaction').start()
         log_driver = ovs_fw_log.OVSFirewallLoggingDriver(int_br)
         log_driver.initialize(self.resource_rpc)
         return log_driver