Fix neutron-lbaas gates

Broken by https://review.openstack.org/#/c/343045/ finally merging.

Change-Id: Idf0443ec84cc007eb99c0bba82c8318356cc5f2a

neutron_lbaas/agent/agent.py

@@ -15,11 +15,11 @@
 
 import sys
 
-from neutron.agent.common import config
 from neutron.agent.linux import external_process
 from neutron.agent.linux import interface
 from neutron.common import config as common_config
 from neutron.common import rpc as n_rpc
+from neutron.conf.agent import common as config
 from oslo_config import cfg
 from oslo_service import service
 

neutron_lbaas/opts.py

@@ -12,8 +12,8 @@
 
 import itertools
 
-import neutron.agent.common.config
 import neutron.agent.linux.interface
+import neutron.conf.agent.common
 import neutron.conf.services.provider_configuration
 
 import neutron_lbaas.agent.agent
@@ -27,26 +27,13 @@ import neutron_lbaas.drivers.radware.base_v2_driver
 import neutron_lbaas.extensions.loadbalancerv2
 
 
-# TODO(johndperkins): Remove when https://review.openstack.org/#/c/343045
-# merges
-try:
-    import neutron.conf.agent.common
-except ImportError:
-    pass
-
-try:
-    _INTERFACE_DRIVER_OPTS = neutron.agent.common.config.INTERFACE_DRIVER_OPTS
-except AttributeError:
-    _INTERFACE_DRIVER_OPTS = neutron.conf.agent.common.INTERFACE_DRIVER_OPTS
-
-
 def list_agent_opts():
     return [
         ('DEFAULT',
          itertools.chain(
              neutron_lbaas.agent.agent.OPTS,
              neutron.agent.linux.interface.OPTS,
-             _INTERFACE_DRIVER_OPTS)
+             neutron.conf.agent.common.INTERFACE_DRIVER_OPTS)
          ),
         ('haproxy',
          neutron_lbaas.drivers.haproxy.namespace_driver.OPTS)
@@ -80,7 +67,7 @@ def list_service_opts():
          neutron_lbaas.drivers.radware.base_v2_driver.driver_debug_opts),
         ('haproxy',
          itertools.chain(
-             _INTERFACE_DRIVER_OPTS,
+             neutron.conf.agent.common.INTERFACE_DRIVER_OPTS,
              neutron_lbaas.agent.agent.OPTS,
          )),
         ('octavia',

neutron_lbaas/tests/unit/agent/test_agent.py

@@ -34,7 +34,7 @@ class TestLbaasService(base.BaseTestCase):
             self.assertTrue(mock_start.called)
 
     def test_main(self):
-        logging_str = 'neutron.agent.common.config.setup_logging'
+        logging_str = 'neutron.conf.agent.common.setup_logging'
         with mock.patch(logging_str), \
                 mock.patch.object(agent.service, 'launch') as mock_launch, \
                 mock.patch('sys.argv'), \