Merge "Movement of OVSDB models to db directory"

stable/ocata
Jenkins 8 years ago committed by Gerrit Code Review
commit 73e7bca07b
  1. 0
      networking_l2gw/db/l2gateway/ovsdb/__init__.py
  2. 2
      networking_l2gw/db/l2gateway/ovsdb/lib.py
  3. 0
      networking_l2gw/db/l2gateway/ovsdb/models.py
  4. 2
      networking_l2gw/services/l2gateway/ovsdb/data.py
  5. 0
      networking_l2gw/tests/unit/db/ovsdb/__init__.py
  6. 4
      networking_l2gw/tests/unit/db/ovsdb/test_lib.py
  7. 2
      networking_l2gw/tests/unit/services/l2gateway/ovsdb/test_data.py

@ -17,7 +17,7 @@ from sqlalchemy.orm import exc
from neutron.openstack.common import log as logging
from networking_l2gw.services.l2gateway.ovsdb import models
from networking_l2gw.db.l2gateway.ovsdb import models
LOG = logging.getLogger(__name__)

@ -16,9 +16,9 @@
from neutron import context as ctx
from neutron.openstack.common import log as logging
from networking_l2gw.db.l2gateway.ovsdb import lib as db
from networking_l2gw.services.l2gateway.common import constants as n_const
from networking_l2gw.services.l2gateway.common import topics
from networking_l2gw.services.l2gateway.ovsdb import lib as db
from networking_l2gw.services.l2gateway import plugin as l2gw_plugin
from oslo.config import cfg

@ -19,8 +19,8 @@ from neutron import context
from neutron.openstack.common import uuidutils
from neutron.tests.unit import testlib_api
from networking_l2gw.services.l2gateway.ovsdb import lib
from networking_l2gw.services.l2gateway.ovsdb import models
from networking_l2gw.db.l2gateway.ovsdb import lib
from networking_l2gw.db.l2gateway.ovsdb import models
_uuid = uuidutils.generate_uuid

@ -19,9 +19,9 @@ import contextlib
from neutron import context
from neutron.tests import base
from networking_l2gw.db.l2gateway.ovsdb import lib
from networking_l2gw.services.l2gateway.common import constants as n_const
from networking_l2gw.services.l2gateway.ovsdb import data
from networking_l2gw.services.l2gateway.ovsdb import lib
class TestL2GatewayOVSDBCallbacks():

Loading…
Cancel
Save