Commit af0ad67a authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Common - Object Factory:

- corrected slice and service methods
parent 50fa943c
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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(
+2 −4
Original line number Diff line number Diff line
@@ -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),