change import path.

I changed the following path.

neutron.plugins.ml2.db -> neutron.db.segments_db

Change-Id: I2ddd63a31d8ba20a7fd4b7efe3aed3d0d8501eb6

networking_nec/nwa/l2/drivers/mech_necnwa.py

@@ -14,10 +14,10 @@
 
 from neutron.common import constants as neutron_const
 from neutron.common import utils
+from neutron.db import segments_db as db_ml2
 from neutron.extensions import portbindings
 from neutron.extensions import providernet as prov_net
 from neutron.plugins.common import constants as plugin_const
-from neutron.plugins.ml2 import db
 from neutron.plugins.ml2 import driver_api as api
 from neutron.plugins.ml2.drivers.openvswitch.mech_driver \
     import mech_openvswitch as ovs
@@ -129,7 +129,7 @@ class NECNWAMechanismDriver(ovs.OpenvswitchMechanismDriver):
             return
         network_id = context.network.current['id']
         session = context.network._plugin_context.session
-        dummy_segment = db.get_dynamic_segment(
+        dummy_segment = db_ml2.get_dynamic_segment(
             session, network_id, physical_network=physical_network)
         LOG.debug("1st: dummy segment is %s", dummy_segment)
         if not dummy_segment:
@@ -138,7 +138,7 @@ class NECNWAMechanismDriver(ovs.OpenvswitchMechanismDriver):
                 api.NETWORK_TYPE: plugin_const.TYPE_VLAN,
                 api.SEGMENTATION_ID: 0
             }
-            db.add_network_segment(
+            db_ml2.add_network_segment(
                 session, network_id, dummy_segment, is_dynamic=True)
         LOG.debug("2nd: dummy segment is %s", dummy_segment)
         context.set_binding(dummy_segment[api.ID],
@@ -221,13 +221,13 @@ class NECNWAMechanismDriver(ovs.OpenvswitchMechanismDriver):
 
     def _l2_delete_segment(self, context, nwa_info):
         session = context.network._plugin_context.session
-        del_segment = db.get_dynamic_segment(
+        del_segment = db_ml2.get_dynamic_segment(
             session,
             context.network.current['id'],
             physical_network=nwa_info['physical_network'])
         if del_segment:
             LOG.debug('delete_network_segment %s', del_segment)
-            db.delete_network_segment(session, del_segment['id'])
+            db_ml2.delete_network_segment(session, del_segment['id'])
 
     def _l3_create_tenant_fw(self, context):
         device_owner = context._port['device_owner']

networking_nec/nwa/l2/plugin.py

@@ -18,9 +18,9 @@ from neutron.api.rpc.handlers import securitygroups_rpc
 from neutron.common import rpc as n_rpc
 from neutron.common import topics
 from neutron.db import agents_db
+from neutron.db import segments_db as db_ml2
 from neutron.extensions import multiprovidernet as mpnet
 from neutron.extensions import providernet as provider
-from neutron.plugins.ml2 import db as db_ml2
 from neutron.plugins.ml2 import driver_api as api
 from neutron.plugins.ml2 import plugin as ml2_plugin
 from oslo_log import log as logging

networking_nec/nwa/l2/rpc/nwa_l2_server_callback.py

@@ -15,8 +15,8 @@
 from neutron.db import api as db_api
 from neutron.db.models import segment as segments_db
 from neutron.db import models_v2
+from neutron.db import segments_db as db_ml2
 from neutron import manager
-from neutron.plugins.ml2 import db as db_ml2
 from neutron_lib import constants
 from oslo_log import helpers
 from oslo_log import log as logging

networking_nec/nwa/l2/utils.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 from neutron.db.models import external_net as external_net_db
-from neutron.plugins.ml2 import db as db_ml2
+from neutron.db import segments_db as db_ml2
 from neutron.plugins.ml2 import driver_api as api
 from neutron_lib import constants
 from oslo_config import cfg

networking_nec/tests/unit/nwa/l2/drivers/test_mech_necnwa.py

@@ -550,15 +550,15 @@ class TestNECNWAMechanismDriver(TestMechNwa):
         physnet = self.driver._find_nwa_physical_network(self.context)
         self.assertEqual(physnet, 'Common/App/Pod3')
 
-    @patch('neutron.plugins.ml2.db.get_dynamic_segment')
+    @patch('neutron.db.segments_db.get_dynamic_segment')
     def test__bind_segment_to_vif_type_dummy_segment_none(self, gds):
         gds.return_value = None
         physnet = 'Common/App/Pod3'
         rd = self.driver._bind_segment_to_vif_type(self.context, physnet)
         self.assertIsNone(rd)
 
-    @patch('neutron.plugins.ml2.db.get_dynamic_segment')
-    @patch('neutron.plugins.ml2.db.add_network_segment')
+    @patch('neutron.db.segments_db.get_dynamic_segment')
+    @patch('neutron.db.segments_db.add_network_segment')
     def test__bind_segment_to_vif_type_dummy_segment_exists(self, ans, gds):
         gds.return_value = self.network_segments[1]
         physnet = 'Common/KVM/Pod1-2'
@@ -642,8 +642,8 @@ class TestNECNWAMechanismDriver(TestMechNwa):
         gntb.side_effect = Exception
         self.driver._bind_port_nwa(self.context)
 
-    @patch('neutron.plugins.ml2.db.get_dynamic_segment')
-    @patch('neutron.plugins.ml2.db.delete_network_segment')
+    @patch('neutron.db.segments_db.get_dynamic_segment')
+    @patch('neutron.db.segments_db.delete_network_segment')
     def test__l2_delete_segment(self, dns, gds):
         gds.return_value = None
         self.driver._l2_delete_segment(self.context, MagicMock())

networking_nec/tests/unit/nwa/l2/rpc/test_ml2_server_callback.py

@@ -76,7 +76,7 @@ class TestNECNWAServerRpcCallbacks(base.BaseTestCase):
         self.assertTrue(device)
 
     @mock.patch('neutron.plugins.ml2.plugin.Ml2Plugin.update_port_status')
-    @mock.patch('neutron.plugins.ml2.db.get_network_segments')
+    @mock.patch('neutron.db.segments_db.get_network_segments')
     @mock.patch('neutron.db.api.get_session')
     @mock.patch('networking_nec.nwa.l2.plugin.'
                 'NECNWAL2Plugin.get_bound_port_context')
@@ -96,7 +96,7 @@ class TestNECNWAServerRpcCallbacks(base.BaseTestCase):
         self.assertTrue(device)
 
     @mock.patch('neutron.plugins.ml2.plugin.Ml2Plugin.update_port_status')
-    @mock.patch('neutron.plugins.ml2.db.get_network_segments')
+    @mock.patch('neutron.db.segments_db.get_network_segments')
     @mock.patch('neutron.db.api.get_session')
     @mock.patch('networking_nec.nwa.l2.plugin.'
                 'NECNWAL2Plugin.get_bound_port_context')
@@ -116,7 +116,7 @@ class TestNECNWAServerRpcCallbacks(base.BaseTestCase):
         self.assertTrue(device)
 
     @mock.patch('neutron.plugins.ml2.plugin.Ml2Plugin.update_port_status')
-    @mock.patch('neutron.plugins.ml2.db.get_network_segments')
+    @mock.patch('neutron.db.segments_db.get_network_segments')
     @mock.patch('neutron.db.api.get_session')
     @mock.patch('networking_nec.nwa.l2.plugin.'
                 'NECNWAL2Plugin.get_bound_port_context')
@@ -135,7 +135,7 @@ class TestNECNWAServerRpcCallbacks(base.BaseTestCase):
         self.rpc.get_device_details(rpc_context, kwargs={'test': "sample"})
 
     @mock.patch('neutron.plugins.ml2.plugin.Ml2Plugin.update_port_status')
-    @mock.patch('neutron.plugins.ml2.db.get_network_segments')
+    @mock.patch('neutron.db.segments_db.get_network_segments')
     @mock.patch('neutron.db.api.get_session')
     @mock.patch('networking_nec.nwa.l2.plugin.'
                 'NECNWAL2Plugin.get_bound_port_context')
@@ -156,7 +156,7 @@ class TestNECNWAServerRpcCallbacks(base.BaseTestCase):
 
     @mock.patch('neutron.plugins.ml2.plugin.Ml2Plugin.update_port_status')
     @mock.patch('networking_nec.nwa.l2.db_api.ensure_port_binding')
-    @mock.patch('neutron.plugins.ml2.db.get_network_segments')
+    @mock.patch('neutron.db.segments_db.get_network_segments')
     @mock.patch('neutron.db.api.get_session')
     @mock.patch('networking_nec.nwa.l2.plugin.'
                 'NECNWAL2Plugin.get_bound_port_context')
@@ -186,7 +186,7 @@ class TestNECNWAServerRpcCallbacks(base.BaseTestCase):
     @mock.patch('networking_nec.nwa.l2.plugin.'
                 'NECNWAL2Plugin.update_port_status')
     @mock.patch('networking_nec.nwa.l2.db_api.ensure_port_binding')
-    @mock.patch('neutron.plugins.ml2.db.get_network_segments')
+    @mock.patch('neutron.db.segments_db.get_network_segments')
     @mock.patch('neutron.db.api.get_session')
     @mock.patch('networking_nec.nwa.l2.plugin.'
                 'NECNWAL2Plugin.get_bound_port_context')
@@ -212,7 +212,7 @@ class TestNECNWAServerRpcCallbacks(base.BaseTestCase):
     @mock.patch('networking_nec.nwa.l2.plugin.'
                 'NECNWAL2Plugin.update_port_status')
     @mock.patch('networking_nec.nwa.l2.db_api.ensure_port_binding')
-    @mock.patch('neutron.plugins.ml2.db.get_network_segments')
+    @mock.patch('neutron.db.segments_db.get_network_segments')
     @mock.patch('neutron.db.api.get_session')
     @mock.patch('networking_nec.nwa.l2.plugin.'
                 'NECNWAL2Plugin.get_bound_port_context')

networking_nec/tests/unit/nwa/l2/rpc/test_nwa_l2_server_callback.py

@@ -26,8 +26,8 @@ class TestNwaL2ServerRpcCallback(base.BaseTestCase):
         self.context = mock.MagicMock()
 
     @mock.patch('neutron.db.api.get_session')
-    @mock.patch('neutron.plugins.ml2.db.get_dynamic_segment')
-    @mock.patch('neutron.plugins.ml2.db.delete_network_segment')
+    @mock.patch('neutron.db.segments_db.get_dynamic_segment')
+    @mock.patch('neutron.db.segments_db.delete_network_segment')
     def test_release_dynamic_segment_from_agent(self, dns, gds, gs):
         del_segment = {'segmentation_id': 0, 'id': 'ID-0'}
         gds.return_value = del_segment

networking_nec/tests/unit/nwa/l2/test_plugin.py

@@ -54,7 +54,7 @@ class TestNECNWAL2Plugin(base.BaseTestCase):
 
         self.assertIsNone(result)
 
-    @patch('neutron.plugins.ml2.db.get_network_segments')
+    @patch('neutron.db.segments_db.get_network_segments')
     def test_extend_network_dict_provider_segment_none(self, f1):
         context = MagicMock()
         network = {'id': '99f771b4-af69-45cc-942f-a76be4e8cd1d'}
@@ -64,7 +64,7 @@ class TestNECNWAL2Plugin(base.BaseTestCase):
                                                               network)
         self.assertIsNone(result)
 
-    @patch('neutron.plugins.ml2.db.get_network_segments')
+    @patch('neutron.db.segments_db.get_network_segments')
     def test_extend_network_dict_provider_segment_one(self, f1):
         context = MagicMock()
         network = {'id': '99f771b4-af69-45cc-942f-a76be4e8cd1d'}
@@ -76,7 +76,7 @@ class TestNECNWAL2Plugin(base.BaseTestCase):
                                                               network)
         self.assertIsNone(result)
 
-    @patch('neutron.plugins.ml2.db.get_network_segments')
+    @patch('neutron.db.segments_db.get_network_segments')
     def test_extend_network_dict_provider_segment_multi(self, f1):
         context = MagicMock()
         network = {'id': '99f771b4-af69-45cc-942f-a76be4e8cd1d'}

networking_nec/tests/unit/nwa/l3/test_plugin.py

@@ -16,8 +16,8 @@ from mock import MagicMock
 from mock import patch
 from sqlalchemy.orm import exc as sa_exc
 
-from neutron.common import exceptions as n_exc
 from neutron.tests import base
+from neutron_lib import exceptions as n_exc
 
 from networking_nec.nwa.l3.plugin import NECNWAL3Plugin