Merge "Import model_base from neutron-lib"

neutron_lbaas/agent_scheduler.py

@@ -17,7 +17,7 @@ import random
 
 from neutron.db import agents_db
 from neutron.db import agentschedulers_db
-from neutron.db import model_base
+from neutron_lib.db import model_base
 from oslo_log import log as logging
 import six
 import sqlalchemy as sa

neutron_lbaas/db/loadbalancer/models.py

@@ -14,9 +14,9 @@
 #    under the License.
 
 from neutron.api.v2 import attributes as attr
-from neutron.db import model_base
 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
 from sqlalchemy import orm

neutron_lbaas/services/loadbalancer/data_models.py

@@ -25,9 +25,9 @@ These data models do provide methods for instantiation from SQLAlchemy models
 and also converting to dictionaries.
 """
 
-from neutron.db import model_base
 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
 from sqlalchemy.orm import collections