From 5068617c4951df74b044cd265624aeeb62266800 Mon Sep 17 00:00:00 2001 From: Abhishek Raut Date: Thu, 8 Sep 2016 07:41:48 -0700 Subject: [PATCH] Use neutron-lib modules for neutron_taas Use model_base and exceptions from neutron-lib to remove DeprecationWarning. Change-Id: Idcc40332909bf24c46c926e7337070ebbc59bde4 --- neutron_taas/db/taas_db.py | 2 +- neutron_taas/extensions/taas.py | 2 +- neutron_taas/services/taas/service_drivers/taas_rpc.py | 2 +- neutron_taas/services/taas/taas_plugin.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/neutron_taas/db/taas_db.py b/neutron_taas/db/taas_db.py index d769425..2ba6b74 100755 --- a/neutron_taas/db/taas_db.py +++ b/neutron_taas/db/taas_db.py @@ -19,8 +19,8 @@ from sqlalchemy import orm from sqlalchemy.orm import exc from neutron.db import common_db_mixin as base_db -from neutron.db import model_base from neutron import manager +from neutron_lib.db import model_base from neutron_taas.extensions import taas from oslo_log import log as logging from oslo_utils import uuidutils diff --git a/neutron_taas/extensions/taas.py b/neutron_taas/extensions/taas.py index 9edb466..ef7ab36 100644 --- a/neutron_taas/extensions/taas.py +++ b/neutron_taas/extensions/taas.py @@ -18,8 +18,8 @@ import abc from neutron.api import extensions from neutron.api.v2 import attributes as attr from neutron.api.v2 import resource_helper -from neutron.common import exceptions as qexception from neutron.services import service_base +from neutron_lib import exceptions as qexception from neutron_taas.common import constants diff --git a/neutron_taas/services/taas/service_drivers/taas_rpc.py b/neutron_taas/services/taas/service_drivers/taas_rpc.py index 351c468..4a375be 100644 --- a/neutron_taas/services/taas/service_drivers/taas_rpc.py +++ b/neutron_taas/services/taas/service_drivers/taas_rpc.py @@ -14,8 +14,8 @@ # License for the specific language governing permissions and limitations # under the License. -from neutron.common import exceptions as n_exc from neutron.common import rpc as n_rpc +from neutron_lib import exceptions as n_exc from neutron_taas.common import topics from neutron_taas.extensions import taas as taas_ex from neutron_taas.services.taas import service_drivers diff --git a/neutron_taas/services/taas/taas_plugin.py b/neutron_taas/services/taas/taas_plugin.py index 916e28e..ac52c18 100755 --- a/neutron_taas/services/taas/taas_plugin.py +++ b/neutron_taas/services/taas/taas_plugin.py @@ -14,10 +14,10 @@ # License for the specific language governing permissions and limitations # under the License. -from neutron.common import exceptions as n_exc from neutron.db import servicetype_db as st_db from neutron.services import provider_configuration as pconf from neutron.services import service_base +from neutron_lib import exceptions as n_exc from neutron_taas.common import constants from neutron_taas.db import taas_db