stop using common_db_mixin
This patch removes all use of common_db_mixin. All methods of that class are available in some form from neutron-lib and we are removing the mixing from neutron soon. Change-Id: I80d17a491d4468a94f4ae184f1b453f41cdf92a2
This commit is contained in:
parent
e88c093d40
commit
ec6bfd4f6c
@ -16,7 +16,6 @@ import itertools
|
|||||||
|
|
||||||
import netaddr
|
import netaddr
|
||||||
|
|
||||||
from neutron.db import common_db_mixin as common_db
|
|
||||||
from neutron.db import l3_dvr_db
|
from neutron.db import l3_dvr_db
|
||||||
from neutron.db.models import address_scope as address_scope_db
|
from neutron.db.models import address_scope as address_scope_db
|
||||||
from neutron.db.models import l3 as l3_db
|
from neutron.db.models import l3 as l3_db
|
||||||
@ -129,7 +128,7 @@ class BgpPeer(model_base.BASEV2,
|
|||||||
password = sa.Column(sa.String(255), nullable=True)
|
password = sa.Column(sa.String(255), nullable=True)
|
||||||
|
|
||||||
|
|
||||||
class BgpDbMixin(common_db.CommonDbMixin):
|
class BgpDbMixin(object):
|
||||||
|
|
||||||
def create_bgp_speaker(self, context, bgp_speaker):
|
def create_bgp_speaker(self, context, bgp_speaker):
|
||||||
uuid = uuidutils.generate_uuid()
|
uuid = uuidutils.generate_uuid()
|
||||||
|
@ -17,7 +17,6 @@ from neutron_lib import context
|
|||||||
import testscenarios
|
import testscenarios
|
||||||
|
|
||||||
from neutron.db import agents_db
|
from neutron.db import agents_db
|
||||||
from neutron.db import common_db_mixin
|
|
||||||
from neutron.tests.unit import testlib_api
|
from neutron.tests.unit import testlib_api
|
||||||
|
|
||||||
from neutron_dynamic_routing.db import bgp_db
|
from neutron_dynamic_routing.db import bgp_db
|
||||||
@ -31,8 +30,7 @@ load_tests = testscenarios.load_tests_apply_scenarios
|
|||||||
|
|
||||||
class TestAutoSchedule(testlib_api.SqlTestCase,
|
class TestAutoSchedule(testlib_api.SqlTestCase,
|
||||||
bgp_dras_db.BgpDrAgentSchedulerDbMixin,
|
bgp_dras_db.BgpDrAgentSchedulerDbMixin,
|
||||||
agents_db.AgentDbMixin,
|
agents_db.AgentDbMixin):
|
||||||
common_db_mixin.CommonDbMixin):
|
|
||||||
"""Test various scenarios for schedule_unscheduled_bgp_speakers.
|
"""Test various scenarios for schedule_unscheduled_bgp_speakers.
|
||||||
|
|
||||||
Below is the brief description of the scenario variables
|
Below is the brief description of the scenario variables
|
||||||
|
Loading…
Reference in New Issue
Block a user