Browse Source

Reflect changes in the neutron path.

Change-Id: If95b03a0bca4d3a2bf94c6a4bf2b899b11cab0bf
Shinji YANAGIDA 2 years ago
parent
commit
b25cd3d217

+ 1
- 1
networking_nec/nwa/l2/utils.py View File

@@ -12,7 +12,7 @@
12 12
 #    License for the specific language governing permissions and limitations
13 13
 #    under the License.
14 14
 
15
-from neutron.db import external_net_db
15
+from neutron.db.models import external_net as external_net_db
16 16
 from neutron.plugins.ml2 import db as db_ml2
17 17
 from neutron.plugins.ml2 import driver_api as api
18 18
 from neutron_lib import constants

+ 1
- 1
networking_nec/nwa/l3/db_api.py View File

@@ -14,7 +14,7 @@
14 14
 
15 15
 from sqlalchemy.orm import exc as sa_exc
16 16
 
17
-from neutron.db import l3_db
17
+from neutron.db.models import l3 as l3_db
18 18
 from oslo_log import log as logging
19 19
 
20 20
 LOG = logging.getLogger(__name__)

+ 2
- 2
networking_nec/nwa/l3/plugin.py View File

@@ -22,8 +22,8 @@ from neutron.common import topics
22 22
 from neutron.db import common_db_mixin
23 23
 from neutron.db import extraroute_db
24 24
 from neutron.db import l3_agentschedulers_db
25
-from neutron.db import l3_db
26 25
 from neutron.db import l3_gwmode_db
26
+from neutron.db.models import l3 as l3_db
27 27
 from neutron.plugins.common import constants
28 28
 from neutron.plugins.ml2 import driver_context
29 29
 from neutron.services import service_base
@@ -55,7 +55,7 @@ class NECNWAL3Plugin(service_base.ServicePluginBase,
55 55
 
56 56
     def __init__(self):
57 57
         super(NECNWAL3Plugin, self).__init__()
58
-        l3_db.subscribe()
58
+        # l3_db.subscribe()
59 59
         self.start_rpc_listeners()
60 60
         self.nwa_proxies = {}
61 61
         self.resource_groups = nwa_com_utils.load_json_from_file(

Loading…
Cancel
Save