Skip to content
Snippets Groups Projects
Commit e75818fc authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Context component:

- corrected slice_unset query filters
parent 2460257e
No related branches found
No related tags found
2 merge requests!54Release 2.0.0,!34Context Scalability extensions using CockroachDB + Removal of Stateful database inside Device + other
...@@ -13,6 +13,7 @@ ...@@ -13,6 +13,7 @@
# limitations under the License. # limitations under the License.
import datetime, logging import datetime, logging
from sqlalchemy import and_
from sqlalchemy.dialects.postgresql import insert from sqlalchemy.dialects.postgresql import insert
from sqlalchemy.engine import Engine from sqlalchemy.engine import Engine
from sqlalchemy.orm import Session, sessionmaker from sqlalchemy.orm import Session, sessionmaker
...@@ -202,20 +203,20 @@ def slice_unset(db_engine : Engine, request : Slice) -> Tuple[Dict, bool]: ...@@ -202,20 +203,20 @@ def slice_unset(db_engine : Engine, request : Slice) -> Tuple[Dict, bool]:
def callback(session : Session) -> bool: def callback(session : Session) -> bool:
num_deletes = 0 num_deletes = 0
num_deletes += session.query(SliceServiceModel)\ num_deletes += session.query(SliceServiceModel)\
.filter_by( .filter(and_(
SliceServiceModel.slice_uuid == slice_uuid, SliceServiceModel.slice_uuid == slice_uuid,
SliceServiceModel.service_uuid.in_(slice_service_uuids) SliceServiceModel.service_uuid.in_(slice_service_uuids)
).delete() )).delete()
num_deletes += session.query(SliceSubSliceModel)\ num_deletes += session.query(SliceSubSliceModel)\
.filter_by( .filter_by(and_(
SliceSubSliceModel.slice_uuid == slice_uuid, SliceSubSliceModel.slice_uuid == slice_uuid,
SliceSubSliceModel.subslice_uuid.in_(slice_subslice_uuids) SliceSubSliceModel.subslice_uuid.in_(slice_subslice_uuids)
).delete() )).delete()
num_deletes += session.query(SliceEndPointModel)\ num_deletes += session.query(SliceEndPointModel)\
.filter_by( .filter_by(and_(
SliceEndPointModel.slice_uuid == slice_uuid, SliceEndPointModel.slice_uuid == slice_uuid,
SliceEndPointModel.endpoint_uuid.in_(slice_endpoint_uuids) SliceEndPointModel.endpoint_uuid.in_(slice_endpoint_uuids)
).delete() )).delete()
return num_deletes > 0 return num_deletes > 0
updated = run_transaction(sessionmaker(bind=db_engine), callback) updated = run_transaction(sessionmaker(bind=db_engine), callback)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment