Use model_base from neutron-lib

This removes the deprecation warnings.

In addition to this this also changed HasTenant
to HasProject

Change-Id: I6cce8dffb5f85276d904b101bcd46c04a12a147d
Closes-bug: #1620334
This commit is contained in:
Gary Kotton 2016-09-05 07:29:50 -07:00
parent 2c4a8bfd2a
commit c8a632acf6
2 changed files with 4 additions and 4 deletions

View File

@ -24,6 +24,7 @@ from sqlalchemy.orm import exc as sa_exc
from neutron_lib.api import validators
from neutron_lib import constants as lib_consts
from neutron_lib.db import model_base
from neutron_lib import exceptions as n_exc
from neutron.api.v2 import attributes as attr
@ -31,7 +32,6 @@ from neutron.db import address_scope_db
from neutron.db import common_db_mixin as common_db
from neutron.db import l3_attrs_db
from neutron.db import l3_db
from neutron.db import model_base
from neutron.db import models_v2
from neutron.plugins.ml2 import models as ml2_models
@ -83,7 +83,7 @@ class BgpSpeakerNetworkBinding(model_base.BASEV2):
class BgpSpeaker(model_base.BASEV2,
model_base.HasId,
model_base.HasTenant):
model_base.HasProject):
"""Represents a BGP speaker"""
@ -106,7 +106,7 @@ class BgpSpeaker(model_base.BASEV2,
class BgpPeer(model_base.BASEV2,
model_base.HasId,
model_base.HasTenant):
model_base.HasProject):
"""Represents a BGP routing peer."""

View File

@ -13,6 +13,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from neutron_lib.db import model_base
from oslo_config import cfg
from oslo_db import exception as db_exc
from oslo_log import log as logging
@ -22,7 +23,6 @@ from sqlalchemy.orm import exc
from neutron.db import agents_db
from neutron.db import agentschedulers_db as as_db
from neutron.db import model_base
from neutron_dynamic_routing._i18n import _
from neutron_dynamic_routing._i18n import _LW