From af0ad67a1ddce877fa020cb5a9f4f60802e0e9b5 Mon Sep 17 00:00:00 2001 From: gifrerenom Date: Thu, 12 Jan 2023 17:07:58 +0000 Subject: [PATCH] Common - Object Factory: - corrected slice and service methods --- src/common/tools/object_factory/Service.py | 2 +- src/common/tools/object_factory/Slice.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/common/tools/object_factory/Service.py b/src/common/tools/object_factory/Service.py index 3dcc83a84..5c0a60776 100644 --- a/src/common/tools/object_factory/Service.py +++ b/src/common/tools/object_factory/Service.py @@ -44,7 +44,7 @@ def json_service( def json_service_l2nm_planned( service_uuid : str, endpoint_ids : List[Dict] = [], constraints : List[Dict] = [], - config_rules : List[Dict] = [], context_uuid : str = DEFAULT_CONTEXT_UUID + config_rules : List[Dict] = [], context_uuid : str = DEFAULT_CONTEXT_NAME ): return json_service( diff --git a/src/common/tools/object_factory/Slice.py b/src/common/tools/object_factory/Slice.py index 2376784e3..6ab666aa6 100644 --- a/src/common/tools/object_factory/Slice.py +++ b/src/common/tools/object_factory/Slice.py @@ -14,9 +14,7 @@ import copy from typing import Dict, List, Optional -from common.Constants import DEFAULT_CONTEXT_UUID from common.proto.context_pb2 import SliceStatusEnum -from common.tools.object_factory.Context import json_context_id def get_slice_uuid(a_endpoint_id : Dict, z_endpoint_id : Dict) -> str: return 'slc:{:s}/{:s}=={:s}/{:s}'.format( @@ -32,13 +30,13 @@ def json_slice_owner(owner_uuid : str, owner_string : str) -> Dict: return {'owner_uuid': {'uuid': owner_uuid}, 'owner_string': owner_string} def json_slice( - slice_uuid : str, context_uuid : str = DEFAULT_CONTEXT_UUID, + slice_uuid : str, context_id : Optional[Dict] = None, status : SliceStatusEnum = SliceStatusEnum.SLICESTATUS_PLANNED, endpoint_ids : List[Dict] = [], constraints : List[Dict] = [], config_rules : List[Dict] = [], service_ids : List[Dict] = [], subslice_ids : List[Dict] = [], owner : Optional[Dict] = None): result = { - 'slice_id' : json_slice_id(slice_uuid, context_id=json_context_id(context_uuid)), + 'slice_id' : json_slice_id(slice_uuid, context_id=context_id), 'slice_status' : {'slice_status': status}, 'slice_endpoint_ids': copy.deepcopy(endpoint_ids), 'slice_constraints' : copy.deepcopy(constraints), -- GitLab