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

Slice component:

- Updated old get_slice calls to new get_slice_by_uuid/_by_id
parent 895c4f68
No related branches found
No related tags found
2 merge requests!142Release TeraFlowSDN 2.1,!87Context & Device Performance Enhancements
......@@ -19,7 +19,7 @@ from common.proto.context_pb2 import (
from common.proto.slice_pb2_grpc import SliceServiceServicer
from common.method_wrappers.Decorator import MetricsPool, safe_and_metered_rpc_method
from common.tools.context_queries.InterDomain import is_multi_domain
from common.tools.context_queries.Slice import get_slice
from common.tools.context_queries.Slice import get_slice_by_id
from common.tools.grpc.ConfigRules import copy_config_rules
from common.tools.grpc.Constraints import copy_constraints
from common.tools.grpc.EndPointIds import copy_endpoint_ids
......@@ -44,9 +44,7 @@ class SliceServiceServicerImpl(SliceServiceServicer):
# Set slice status to "SERVICESTATUS_PLANNED" to ensure rest of components are aware the slice is
# being modified.
context_client = ContextClient()
slice_ro : Optional[Service] = get_slice(
context_client, request.slice_id.slice_uuid.uuid, request.slice_id.context_id.context_uuid.uuid,
rw_copy=False)
slice_ro : Optional[Slice] = get_slice_by_id(context_client, request.slice_id, rw_copy=False)
slice_rw = Slice()
slice_rw.CopyFrom(request if slice_ro is None else slice_ro)
......
......@@ -18,7 +18,7 @@ from common.Settings import get_setting
from common.method_wrappers.ServiceExceptions import NotFoundException
from common.proto.context_pb2 import IsolationLevelEnum, Slice, SliceId, SliceStatusEnum
from common.tools.context_queries.Context import create_context
from common.tools.context_queries.Slice import get_slice
from common.tools.context_queries.Slice import get_slice_by_uuid
from context.client.ContextClient import ContextClient
from slice.service.slice_grouper.MetricsExporter import MetricsExporter
......@@ -70,7 +70,7 @@ def create_slice_groups(
slice_group_ids : Dict[str, SliceId] = dict()
for slice_group in slice_groups:
slice_group_name = slice_group[0]
slice_group_obj = get_slice(context_client, slice_group_name, DEFAULT_CONTEXT_NAME)
slice_group_obj = get_slice_by_uuid(context_client, slice_group_name, DEFAULT_CONTEXT_NAME)
if slice_group_obj is None:
slice_group_obj = create_slice_group(
DEFAULT_CONTEXT_NAME, slice_group_name, slice_group[2], slice_group[1])
......@@ -111,7 +111,7 @@ def add_slice_to_group(slice_obj : Slice, selected_group : Tuple[str, float, flo
slice_uuid = slice_obj.slice_id.slice_uuid.uuid
context_client = ContextClient()
slice_group_obj = get_slice(context_client, group_name, DEFAULT_CONTEXT_NAME, rw_copy=True)
slice_group_obj = get_slice_by_uuid(context_client, group_name, DEFAULT_CONTEXT_NAME, rw_copy=True)
if slice_group_obj is None:
raise NotFoundException('Slice', group_name, extra_details='while adding to group')
......@@ -148,7 +148,7 @@ def remove_slice_from_group(slice_obj : Slice, selected_group : Tuple[str, float
slice_uuid = slice_obj.slice_id.slice_uuid.uuid
context_client = ContextClient()
slice_group_obj = get_slice(context_client, group_name, DEFAULT_CONTEXT_NAME, rw_copy=True)
slice_group_obj = get_slice_by_uuid(context_client, group_name, DEFAULT_CONTEXT_NAME, rw_copy=True)
if slice_group_obj is None:
raise NotFoundException('Slice', group_name, extra_details='while removing from group')
......
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