Loading src/context/service/database/Slice.py +6 −7 Original line number Diff line number Diff line Loading @@ -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 Loading Loading @@ -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) Loading Loading
src/context/service/database/Slice.py +6 −7 Original line number Diff line number Diff line Loading @@ -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 Loading Loading @@ -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) Loading