Merge "use service type constants from neutron_lib plugins"

networking_odl/common/constants.py

@@ -13,7 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from neutron_lib import constants
+from neutron_lib.plugins import constants
 
 ODL_NETWORK = 'network'
 ODL_NETWORKS = 'networks'

networking_odl/journal/recovery.py

@@ -14,9 +14,9 @@
 #  under the License.
 #
 
-from neutron_lib import constants
 from neutron_lib import context as neutron_context
 from neutron_lib import exceptions as nexc
+from neutron_lib.plugins import constants
 from neutron_lib.plugins import directory
 from oslo_log import log as logging
 

networking_odl/l3/l3_odl.py

@@ -26,6 +26,7 @@ from neutron.db import l3_agentschedulers_db
 from neutron.db import l3_dvr_db
 from neutron.db import l3_gwmode_db
 from neutron_lib import constants as q_const
+from neutron_lib.plugins import constants as plugin_constants
 
 from networking_odl.common import client as odl_client
 from networking_odl.common import utils as odl_utils
@@ -77,7 +78,7 @@ class OpenDaylightL3RouterPlugin(
         self.conn.consume_in_threads()
 
     def get_plugin_type(self):
-        return q_const.L3
+        return plugin_constants.L3
 
     def get_plugin_description(self):
         """returns string description of the plugin."""

networking_odl/l3/l3_odl_v2.py

@@ -23,6 +23,7 @@ from neutron.db import l3_agentschedulers_db
 from neutron.db import l3_dvr_db
 from neutron.db import l3_gwmode_db
 from neutron_lib import constants as q_const
+from neutron_lib.plugins import constants as plugin_constants
 
 from networking_odl.common import config  # noqa
 from networking_odl.common import constants as odl_const
@@ -55,7 +56,7 @@ class OpenDaylightL3RouterPlugin(
         self.journal = journal.OpendaylightJournalThread()
 
     def get_plugin_type(self):
-        return q_const.L3
+        return plugin_constants.L3
 
     def get_plugin_description(self):
         """Returns string description of the plugin."""

networking_odl/tests/unit/journal/test_full_sync.py

@@ -17,7 +17,7 @@
 import mock
 import requests
 
-from neutron_lib import constants
+from neutron_lib.plugins import constants
 from neutron_lib.plugins import directory
 
 from networking_odl.common import constants as odl_const

networking_odl/tests/unit/l3/test_l3_odl.py

@@ -23,7 +23,7 @@ from neutron.extensions import l3
 from neutron.extensions import l3_ext_gw_mode
 from neutron.tests.unit.api.v2 import test_base
 from neutron.tests.unit.extensions import base as test_extensions_base
-from neutron_lib import constants
+from neutron_lib.plugins import constants
 from webob import exc
 
 from networking_odl.tests import base as odl_base

networking_odl/tests/unit/l3/test_l3_odl_v2.py

@@ -22,8 +22,8 @@ from neutron.plugins.ml2 import plugin
 from neutron.tests import base
 from neutron.tests.unit.db import test_db_base_plugin_v2
 from neutron.tests.unit import testlib_api
-from neutron_lib import constants
 from neutron_lib import context
+from neutron_lib.plugins import constants
 from neutron_lib.plugins import directory
 from oslo_config import cfg
 from oslo_serialization import jsonutils