From ad0955ecbfd7025aa3e474d75d9ac7e54bb1b10d Mon Sep 17 00:00:00 2001
From: Doug Wiegley <dougw@a10networks.com>
Date: Tue, 30 Aug 2016 00:05:18 -0600
Subject: [PATCH] Import model_base from neutron-lib

Change-Id: I1123daa653f6c0105ae910a23708d6062712496c
---
 neutron_lbaas/agent_scheduler.py                     | 2 +-
 neutron_lbaas/db/loadbalancer/models.py              | 2 +-
 neutron_lbaas/db/migration/alembic_migrations/env.py | 2 +-
 neutron_lbaas/services/loadbalancer/data_models.py   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/neutron_lbaas/agent_scheduler.py b/neutron_lbaas/agent_scheduler.py
index f6c214ff9..839fc9f9d 100644
--- a/neutron_lbaas/agent_scheduler.py
+++ b/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
diff --git a/neutron_lbaas/db/loadbalancer/models.py b/neutron_lbaas/db/loadbalancer/models.py
index fb91a7729..d9a29b2e5 100644
--- a/neutron_lbaas/db/loadbalancer/models.py
+++ b/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
diff --git a/neutron_lbaas/db/migration/alembic_migrations/env.py b/neutron_lbaas/db/migration/alembic_migrations/env.py
index 01fcdb832..36f2cae78 100644
--- a/neutron_lbaas/db/migration/alembic_migrations/env.py
+++ b/neutron_lbaas/db/migration/alembic_migrations/env.py
@@ -13,6 +13,7 @@
 from logging import config as logging_config
 
 from alembic import context
+from neutron_lib.db import model_base
 from oslo_config import cfg
 from oslo_db.sqlalchemy import session
 import sqlalchemy as sa
@@ -20,7 +21,6 @@ from sqlalchemy import event
 
 from neutron.db.migration.alembic_migrations import external
 from neutron.db.migration.models import head  # noqa
-from neutron.db import model_base
 from neutron_lbaas.db.models import head  # noqa
 
 MYSQL_ENGINE = None
diff --git a/neutron_lbaas/services/loadbalancer/data_models.py b/neutron_lbaas/services/loadbalancer/data_models.py
index 963dfc4ca..fa0a32e7f 100644
--- a/neutron_lbaas/services/loadbalancer/data_models.py
+++ b/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