Fix various neutron deprecation warnings

Neutron has moved some database classes [1] around which caused
deprecation warnings during test runs.  This patch corrects
those paths to stop the warning messages.

[1] https://review.openstack.org/#/c/330870/

Change-Id: I7c1512875dd816bdc4e9ff2c2058d83029c70de3
This commit is contained in:
Michael Johnson 2016-10-15 01:28:33 +00:00
parent 68ae7d9d2c
commit f268c67bbd
3 changed files with 3 additions and 3 deletions

View File

@ -15,8 +15,8 @@
import random
from neutron.db import agents_db
from neutron.db import agentschedulers_db
from neutron.db.models import agent as agents_db
from neutron_lib.db import model_base
from oslo_log import log as logging
import six

View File

@ -14,8 +14,8 @@
# under the License.
from neutron.api.v2 import attributes as attr
from neutron.db.models import servicetype as st_db
from neutron.db import models_v2
from neutron.db import servicetype_db as st_db
from neutron_lib.db import model_base
import sqlalchemy as sa
from sqlalchemy.ext import orderinglist

View File

@ -25,8 +25,8 @@ These data models do provide methods for instantiation from SQLAlchemy models
and also converting to dictionaries.
"""
from neutron.db.models import servicetype as servicetype_db
from neutron.db import models_v2
from neutron.db import servicetype_db
from neutron_lib.db import model_base
import six
from sqlalchemy.ext import orderinglist