From 79e83969db272f8ac994054a24f07e9f2fedbcfb Mon Sep 17 00:00:00 2001 From: gifrerenom <lluis.gifre@cttc.es> Date: Tue, 8 Nov 2022 07:48:15 +0000 Subject: [PATCH] Context component: - added slice_owner fields to SliceModel and Servicer --- src/context/service/database/SliceModel.py | 9 +++++++++ .../service/grpc_server/ContextServiceServicerImpl.py | 2 ++ 2 files changed, 11 insertions(+) diff --git a/src/context/service/database/SliceModel.py b/src/context/service/database/SliceModel.py index bc00ada43..d951669c1 100644 --- a/src/context/service/database/SliceModel.py +++ b/src/context/service/database/SliceModel.py @@ -46,6 +46,8 @@ class SliceModel(Model): slice_constraints_fk = ForeignKeyField(ConstraintsModel) slice_status = EnumeratedField(ORM_SliceStatusEnum, required=True) slice_config_fk = ForeignKeyField(ConfigModel) + slice_owner_uuid = StringField(required=False, allow_empty=True) + slice_owner_string = StringField(required=False, allow_empty=True) def delete(self) -> None: # pylint: disable=import-outside-toplevel @@ -106,4 +108,11 @@ class SliceModel(Model): if include_config_rules: result.setdefault('slice_config', {})['config_rules'] = self.dump_config() if include_service_ids: result['slice_service_ids'] = self.dump_service_ids() if include_subslice_ids: result['slice_subslice_ids'] = self.dump_subslice_ids() + + if len(self.slice_owner_uuid) > 0: + result.setdefault('slice_owner', {}).setdefault('owner_uuid', {})['uuid'] = self.slice_owner_uuid + + if len(self.slice_owner_string) > 0: + result.setdefault('slice_owner', {})['owner_string'] = self.slice_owner_string + return result diff --git a/src/context/service/grpc_server/ContextServiceServicerImpl.py b/src/context/service/grpc_server/ContextServiceServicerImpl.py index 88f7bd8af..8bec2698b 100644 --- a/src/context/service/grpc_server/ContextServiceServicerImpl.py +++ b/src/context/service/grpc_server/ContextServiceServicerImpl.py @@ -606,6 +606,8 @@ class ContextServiceServicerImpl(ContextServiceServicer): 'slice_constraints_fk': db_constraints, 'slice_status' : grpc_to_enum__slice_status(request.slice_status.slice_status), 'slice_config_fk' : db_running_config, + 'slice_owner_uuid' : request.slice_owner.owner_uuid.uuid, + 'slice_owner_string' : request.slice_owner.owner_string, }) db_slice, updated = result -- GitLab