diff --git a/src/context/service/database/Slice.py b/src/context/service/database/Slice.py index b0b83238c8bcfbac826cc13789413e2ae957f47c..717cac9cf17c3d2dccadb90f1b58f81d48302ffa 100644 --- a/src/context/service/database/Slice.py +++ b/src/context/service/database/Slice.py @@ -13,7 +13,6 @@ # limitations under the License. import datetime, logging -from sqlalchemy import and_ from sqlalchemy.dialects.postgresql import insert from sqlalchemy.engine import Engine from sqlalchemy.orm import Session, sessionmaker @@ -203,20 +202,20 @@ def slice_unset(db_engine : Engine, request : Slice) -> Tuple[Dict, bool]: def callback(session : Session) -> bool: num_deletes = 0 num_deletes += session.query(SliceServiceModel)\ - .filter_by(and_( + .filter_by( SliceServiceModel.slice_uuid == slice_uuid, SliceServiceModel.service_uuid.in_(slice_service_uuids) - )).delete() + ).delete() num_deletes += session.query(SliceSubSliceModel)\ - .filter_by(and_( + .filter_by( SliceSubSliceModel.slice_uuid == slice_uuid, SliceSubSliceModel.subslice_uuid.in_(slice_subslice_uuids) - )).delete() + ).delete() num_deletes += session.query(SliceEndPointModel)\ - .filter_by(and_( + .filter_by( SliceEndPointModel.slice_uuid == slice_uuid, SliceEndPointModel.endpoint_uuid.in_(slice_endpoint_uuids) - )).delete() + ).delete() return num_deletes > 0 updated = run_transaction(sessionmaker(bind=db_engine), callback)