From ec6bfd4f6ca40d6a377d3b6f8f962553d7b0d3e7 Mon Sep 17 00:00:00 2001 From: Boden R Date: Thu, 28 Mar 2019 11:47:38 -0600 Subject: [PATCH] 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 --- neutron_dynamic_routing/db/bgp_db.py | 3 +-- .../services/bgp/scheduler/test_bgp_dragent_scheduler.py | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/neutron_dynamic_routing/db/bgp_db.py b/neutron_dynamic_routing/db/bgp_db.py index 35834362..f0063d29 100644 --- a/neutron_dynamic_routing/db/bgp_db.py +++ b/neutron_dynamic_routing/db/bgp_db.py @@ -16,7 +16,6 @@ import itertools import netaddr -from neutron.db import common_db_mixin as common_db from neutron.db import l3_dvr_db from neutron.db.models import address_scope as address_scope_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) -class BgpDbMixin(common_db.CommonDbMixin): +class BgpDbMixin(object): def create_bgp_speaker(self, context, bgp_speaker): uuid = uuidutils.generate_uuid() diff --git a/neutron_dynamic_routing/tests/functional/services/bgp/scheduler/test_bgp_dragent_scheduler.py b/neutron_dynamic_routing/tests/functional/services/bgp/scheduler/test_bgp_dragent_scheduler.py index b263543d..0f0fb1c0 100644 --- a/neutron_dynamic_routing/tests/functional/services/bgp/scheduler/test_bgp_dragent_scheduler.py +++ b/neutron_dynamic_routing/tests/functional/services/bgp/scheduler/test_bgp_dragent_scheduler.py @@ -17,7 +17,6 @@ from neutron_lib import context import testscenarios from neutron.db import agents_db -from neutron.db import common_db_mixin from neutron.tests.unit import testlib_api from neutron_dynamic_routing.db import bgp_db @@ -31,8 +30,7 @@ load_tests = testscenarios.load_tests_apply_scenarios class TestAutoSchedule(testlib_api.SqlTestCase, bgp_dras_db.BgpDrAgentSchedulerDbMixin, - agents_db.AgentDbMixin, - common_db_mixin.CommonDbMixin): + agents_db.AgentDbMixin): """Test various scenarios for schedule_unscheduled_bgp_speakers. Below is the brief description of the scenario variables