From 4dd8101bd42db43f84f45e59d89bd50738c8a398 Mon Sep 17 00:00:00 2001 From: Kevin Benton Date: Sun, 5 Feb 2017 17:59:12 -0800 Subject: [PATCH] Delete segments using OVO code This gets rid of the last part of the segments module referencing the model directly. Partially-Implements: blueprint adopt-oslo-versioned-objects-for-db Change-Id: I9135aa7a3e952340654d3de51bf11a9bec71cbf2 --- neutron/services/segments/db.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/neutron/services/segments/db.py b/neutron/services/segments/db.py index 45ce77d51fe..b749902e56f 100644 --- a/neutron/services/segments/db.py +++ b/neutron/services/segments/db.py @@ -28,7 +28,6 @@ from neutron.callbacks import resources from neutron.db import _utils as db_utils from neutron.db import api as db_api from neutron.db import common_db_mixin -from neutron.db.models import segment as segment_model from neutron.db import segments_db as db from neutron.extensions import segment as extension from neutron import manager @@ -167,9 +166,7 @@ class SegmentDbMixin(common_db_mixin.CommonDbMixin): # Delete segment in DB with db_api.context_manager.writer.using(context): - query = self._model_query(context, segment_model.NetworkSegment) - query = query.filter(segment_model.NetworkSegment.id == uuid) - if 0 == query.delete(): + if not network.NetworkSegment.delete_objects(context, id=uuid): raise exceptions.SegmentNotFound(segment_id=uuid) # Do some preliminary operations before deleting segment in db registry.notify(resources.SEGMENT, events.PRECOMMIT_DELETE,