From bc2b0e9ef1740e575b083eaf301cd4ad36a652f9 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Mon, 20 Feb 2023 14:39:35 +0000
Subject: [PATCH] Context component:
- Corrected slice-to-subslice db schema
- Corrected removal of endpoints
---
src/context/service/database/Slice.py | 2 +-
src/context/service/database/models/SliceModel.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/context/service/database/Slice.py b/src/context/service/database/Slice.py
index b841b9cc8..80af759de 100644
--- a/src/context/service/database/Slice.py
+++ b/src/context/service/database/Slice.py
@@ -180,7 +180,7 @@ def slice_unset(db_engine : Engine, request : Slice) -> Tuple[Dict, bool]:
if len(request.slice_constraints) > 0: raise NotImplementedError('UnsetSlice: removal of constraints')
if len(request.slice_config.config_rules) > 0: raise NotImplementedError('UnsetSlice: removal of config rules')
- if len(request.slice_endpoint_ids) > 0: raise NotImplementedError('UnsetSlice: removal of endpoints')
+ #if len(request.slice_endpoint_ids) > 0: raise NotImplementedError('UnsetSlice: removal of endpoints')
slice_endpoint_uuids : Set[str] = set()
for i,endpoint_id in enumerate(request.slice_endpoint_ids):
diff --git a/src/context/service/database/models/SliceModel.py b/src/context/service/database/models/SliceModel.py
index 6943861c8..458bc714a 100644
--- a/src/context/service/database/models/SliceModel.py
+++ b/src/context/service/database/models/SliceModel.py
@@ -98,8 +98,8 @@ class SliceServiceModel(_Base):
class SliceSubSliceModel(_Base):
__tablename__ = 'slice_subslice'
- slice_uuid = Column(ForeignKey('slice.slice_uuid', ondelete='CASCADE' ), primary_key=True)
- subslice_uuid = Column(ForeignKey('slice.slice_uuid', ondelete='RESTRICT'), primary_key=True)
+ slice_uuid = Column(ForeignKey('slice.slice_uuid', ondelete='CASCADE'), primary_key=True)
+ subslice_uuid = Column(ForeignKey('slice.slice_uuid', ondelete='CASCADE'), primary_key=True)
slice = relationship(
'SliceModel', foreign_keys='SliceSubSliceModel.slice_uuid', back_populates='slice_subslices', lazy='joined')
--
GitLab