diff --git a/src/slice/service/SliceServiceServicerImpl.py b/src/slice/service/SliceServiceServicerImpl.py index f91c55e281e8ed5f994dea3dce43a63184669795..e87ee0f9740cb221e9b3db8afc756f6288cc9563 100644 --- a/src/slice/service/SliceServiceServicerImpl.py +++ b/src/slice/service/SliceServiceServicerImpl.py @@ -18,7 +18,7 @@ from common.proto.context_pb2 import ( Empty, Service, ServiceId, ServiceStatusEnum, ServiceTypeEnum, Slice, SliceId, SliceStatusEnum) 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.InterDomain import is_inter_domain #, is_multi_domain 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 @@ -74,7 +74,7 @@ class SliceServiceServicerImpl(SliceServiceServicer): #changes = deepdiff.DeepDiff(json_current_slice, json_updated_slice) #LOGGER.info('changes = {:s}'.format(str(changes))) - if is_multi_domain(context_client, slice_with_uuids.slice_endpoint_ids): + if is_inter_domain(context_client, slice_with_uuids.slice_endpoint_ids): interdomain_client = InterdomainClient() slice_id = interdomain_client.RequestSlice(slice_with_uuids) slice_ = context_client.GetSlice(slice_id) @@ -203,10 +203,11 @@ class SliceServiceServicerImpl(SliceServiceServicer): context_client.close() return Empty() - if is_multi_domain(context_client, _slice.slice_endpoint_ids): - #interdomain_client = InterdomainClient() - #slice_id = interdomain_client.DeleteSlice(request) - raise NotImplementedError('Delete inter-domain slice') + if is_inter_domain(context_client, _slice.slice_endpoint_ids): + interdomain_client = InterdomainClient() + slice_id = interdomain_client.DeleteSlice(request) + #raise NotImplementedError('Delete inter-domain slice') + interdomain_client.close() else: current_slice = Slice() current_slice.CopyFrom(_slice)