summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinji YANAGIDA <s-yanagida@pb.jp.nec.com>2016-10-02 15:08:35 +0900
committerShinji YANAGIDA <s-yanagida@pb.jp.nec.com>2016-10-02 15:10:06 +0900
commitb25cd3d217bcaca02391a45e69bad7672cdcaf44 (patch)
tree2d7824617507aaef6833fd6c09eef6b81957a1a4
parent215b1f701057b3395783f769f8586d3883eb1667 (diff)
Reflect changes in the neutron path.
Notes
Notes (review): Code-Review+2: Shinji YANAGIDA <s-yanagida@pb.jp.nec.com> Workflow+1: Shinji YANAGIDA <s-yanagida@pb.jp.nec.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Sun, 02 Oct 2016 21:52:58 +0000 Reviewed-on: https://review.openstack.org/380804 Project: openstack/networking-nec Branch: refs/heads/master
-rw-r--r--networking_nec/nwa/l2/utils.py2
-rw-r--r--networking_nec/nwa/l3/db_api.py2
-rw-r--r--networking_nec/nwa/l3/plugin.py4
3 files changed, 4 insertions, 4 deletions
diff --git a/networking_nec/nwa/l2/utils.py b/networking_nec/nwa/l2/utils.py
index 5c53a9f..85d2d9b 100644
--- a/networking_nec/nwa/l2/utils.py
+++ b/networking_nec/nwa/l2/utils.py
@@ -12,7 +12,7 @@
12# License for the specific language governing permissions and limitations 12# License for the specific language governing permissions and limitations
13# under the License. 13# under the License.
14 14
15from neutron.db import external_net_db 15from neutron.db.models import external_net as external_net_db
16from neutron.plugins.ml2 import db as db_ml2 16from neutron.plugins.ml2 import db as db_ml2
17from neutron.plugins.ml2 import driver_api as api 17from neutron.plugins.ml2 import driver_api as api
18from neutron_lib import constants 18from neutron_lib import constants
diff --git a/networking_nec/nwa/l3/db_api.py b/networking_nec/nwa/l3/db_api.py
index ae16125..815db13 100644
--- a/networking_nec/nwa/l3/db_api.py
+++ b/networking_nec/nwa/l3/db_api.py
@@ -14,7 +14,7 @@
14 14
15from sqlalchemy.orm import exc as sa_exc 15from sqlalchemy.orm import exc as sa_exc
16 16
17from neutron.db import l3_db 17from neutron.db.models import l3 as l3_db
18from oslo_log import log as logging 18from oslo_log import log as logging
19 19
20LOG = logging.getLogger(__name__) 20LOG = logging.getLogger(__name__)
diff --git a/networking_nec/nwa/l3/plugin.py b/networking_nec/nwa/l3/plugin.py
index 237fcc1..10f92da 100644
--- a/networking_nec/nwa/l3/plugin.py
+++ b/networking_nec/nwa/l3/plugin.py
@@ -22,8 +22,8 @@ from neutron.common import topics
22from neutron.db import common_db_mixin 22from neutron.db import common_db_mixin
23from neutron.db import extraroute_db 23from neutron.db import extraroute_db
24from neutron.db import l3_agentschedulers_db 24from neutron.db import l3_agentschedulers_db
25from neutron.db import l3_db
26from neutron.db import l3_gwmode_db 25from neutron.db import l3_gwmode_db
26from neutron.db.models import l3 as l3_db
27from neutron.plugins.common import constants 27from neutron.plugins.common import constants
28from neutron.plugins.ml2 import driver_context 28from neutron.plugins.ml2 import driver_context
29from neutron.services import service_base 29from neutron.services import service_base
@@ -55,7 +55,7 @@ class NECNWAL3Plugin(service_base.ServicePluginBase,
55 55
56 def __init__(self): 56 def __init__(self):
57 super(NECNWAL3Plugin, self).__init__() 57 super(NECNWAL3Plugin, self).__init__()
58 l3_db.subscribe() 58 # l3_db.subscribe()
59 self.start_rpc_listeners() 59 self.start_rpc_listeners()
60 self.nwa_proxies = {} 60 self.nwa_proxies = {}
61 self.resource_groups = nwa_com_utils.load_json_from_file( 61 self.resource_groups = nwa_com_utils.load_json_from_file(