Update imports to oslo_service

Update import locations based on upstream changes to oslo_service.

Change-Id: Ic4d15e17d87279bdbc2836bcc53b6327bdfcbfe9
Partial-Bug: #1466851

networking_cisco/plugins/cisco/cfg_agent/cfg_agent.py

@@ -22,6 +22,9 @@ from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_log import log as logging
 import oslo_messaging
+from oslo_service import loopingcall
+from oslo_service import periodic_task
+from oslo_service import service
 from oslo_utils import importutils
 from oslo_utils import timeutils
 
@@ -35,9 +38,6 @@ from neutron.common import topics
 from neutron import context as n_context
 from neutron.i18n import _LE, _LI, _LW
 from neutron import manager
-from neutron.openstack.common import loopingcall
-from neutron.openstack.common import periodic_task
-from neutron.openstack.common import service
 from neutron import service as neutron_service
 
 from networking_cisco.plugins.cisco.cfg_agent import device_status

networking_cisco/plugins/cisco/db/l3/l3_router_appliance_db.py

@@ -17,6 +17,7 @@ import copy
 from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_log import log as logging
+from oslo_service import loopingcall
 from oslo_utils import excutils
 from sqlalchemy.orm import exc
 from sqlalchemy.orm import joinedload
@@ -34,7 +35,6 @@ from neutron.db import models_v2
 from neutron.db import portbindings_db as p_binding
 from neutron.extensions import providernet as pr_net
 from neutron.i18n import _LE, _LI
-from neutron.openstack.common import loopingcall
 from neutron.plugins.cisco.db.l3 import l3_models
 
 from networking_cisco.plugins.cisco.common import cisco_constants as c_const

networking_cisco/plugins/ml2/drivers/cisco/apic/apic_sync.py

@@ -14,12 +14,12 @@
 #    under the License.
 
 from oslo_log import log as logging
+from oslo_service import loopingcall
 
 from neutron.common import constants as n_constants
 from neutron import context
 from neutron.i18n import _LW
 from neutron import manager
-from neutron.openstack.common import loopingcall
 from neutron.plugins.ml2 import db as l2_db
 from neutron.plugins.ml2 import driver_context
 

networking_cisco/plugins/ml2/drivers/cisco/apic/apic_topology.py

@@ -24,6 +24,8 @@ from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_log import log as logging
 import oslo_messaging
+from oslo_service import periodic_task
+from oslo_service import service as svc
 
 from neutron.agent.common import config
 from neutron.agent.linux import ip_lib
@@ -34,8 +36,6 @@ from neutron.common import utils as neutron_utils
 from neutron.db import agents_db
 from neutron.i18n import _LE, _LI
 from neutron import manager
-from neutron.openstack.common import periodic_task
-from neutron.openstack.common import service as svc
 from neutron.plugins.ml2.drivers.cisco.apic import mechanism_apic as ma
 from neutron.plugins.ml2.drivers import type_vlan  # noqa
 

networking_cisco/tests/unit/cisco/cfg_agent/test_cfg_agent.py

@@ -100,7 +100,7 @@ class TestCiscoCfgAgentWIthStateReporting(base.BaseTestCase):
         plugin_reportstate_api_cls.return_value = self.plugin_reportstate_api
 
         self.looping_call_p = mock.patch(
-            'neutron.openstack.common.loopingcall.FixedIntervalLoopingCall')
+            'oslo_service.loopingcall.FixedIntervalLoopingCall')
         self.looping_call_p.start()
 
         mock.patch('neutron.common.rpc.create_connection').start()

networking_cisco/tests/unit/cisco/cfg_agent/test_routing_svc_helper.py

@@ -152,7 +152,7 @@ class TestBasicRoutingOperations(base.BaseTestCase):
         l3plugin_api_cls.return_value = self.plugin_api
         self.plugin_api.get_routers = mock.MagicMock()
         self.looping_call_p = mock.patch(
-            'neutron.openstack.common.loopingcall.FixedIntervalLoopingCall')
+            'oslo_service.loopingcall.FixedIntervalLoopingCall')
         self.looping_call_p.start()
         mock.patch('neutron.common.rpc.create_connection').start()
 

networking_cisco/tests/unit/ml2/drivers/cisco/apic/test_cisco_apic_sync.py

@@ -22,7 +22,7 @@ sys.modules["apicapi"] = mock.Mock()
 from neutron.plugins.ml2.drivers.cisco.apic import apic_sync
 from neutron.tests import base
 
-LOOPING_CALL = 'neutron.openstack.common.loopingcall.FixedIntervalLoopingCall'
+LOOPING_CALL = 'oslo_service.loopingcall.FixedIntervalLoopingCall'
 GET_PLUGIN = 'neutron.manager.NeutronManager.get_plugin'
 GET_ADMIN_CONTEXT = 'neutron.context.get_admin_context'
 L2_DB = 'neutron.plugins.ml2.db.get_locked_port_and_binding'

networking_cisco/tests/unit/ml2/drivers/cisco/apic/test_cisco_apic_topology_agent.py

@@ -27,7 +27,7 @@ NOTIFIER = ('neutron.plugins.ml2.drivers.cisco.apic.'
             'apic_topology.ApicTopologyServiceNotifierApi')
 RPC_CONNECTION = 'neutron.common.rpc.Connection'
 AGENTS_DB = 'neutron.db.agents_db'
-PERIODIC_TASK = 'neutron.openstack.common.periodic_task'
+PERIODIC_TASK = 'oslo_service.periodic_task'
 DEV_EXISTS = 'neutron.agent.linux.ip_lib.device_exists'
 IP_DEVICE = 'neutron.agent.linux.ip_lib.IPDevice'
 EXECUTE = 'neutron.agent.linux.utils.execute'