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 @@ # License for the specific language governing permissions and limitations # under the License. -from neutron.db import external_net_db +from neutron.db.models import external_net as external_net_db from neutron.plugins.ml2 import db as db_ml2 from neutron.plugins.ml2 import driver_api as api from 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 @@ from sqlalchemy.orm import exc as sa_exc -from neutron.db import l3_db +from neutron.db.models import l3 as l3_db from oslo_log import log as logging LOG = 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 from neutron.db import common_db_mixin from neutron.db import extraroute_db from neutron.db import l3_agentschedulers_db -from neutron.db import l3_db from neutron.db import l3_gwmode_db +from neutron.db.models import l3 as l3_db from neutron.plugins.common import constants from neutron.plugins.ml2 import driver_context from neutron.services import service_base @@ -55,7 +55,7 @@ class NECNWAL3Plugin(service_base.ServicePluginBase, def __init__(self): super(NECNWAL3Plugin, self).__init__() - l3_db.subscribe() + # l3_db.subscribe() self.start_rpc_listeners() self.nwa_proxies = {} self.resource_groups = nwa_com_utils.load_json_from_file(