Skip to content
Snippets Groups Projects
Commit a184bbdd authored by Shayan Hajipour's avatar Shayan Hajipour
Browse files

conflict resolved

parents 1e947895 91166434
No related branches found
No related tags found
2 merge requests!359Release TeraFlowSDN 5.0,!321Resolve: "(CTTC) CAMARA Demo Integration tests"
Hide whitespace changes
Inline Side-by-side
src/common/tools/context_queries/Slice.py
+ 1
− 1
View file @ a184bbdd
...@@ -159,4 +159,4 @@ def get_slice_by_defualt_name( ...@@ -159,4 +159,4 @@ def get_slice_by_defualt_name(
return get_slice_by_id( return get_slice_by_id(
context_client, slice_id, rw_copy=rw_copy, include_endpoint_ids=include_endpoint_ids, context_client, slice_id, rw_copy=rw_copy, include_endpoint_ids=include_endpoint_ids,
include_constraints=include_constraints, include_service_ids=include_service_ids, include_constraints=include_constraints, include_service_ids=include_service_ids,
include_subslice_ids=include_subslice_ids, include_config_rules=include_config_rules) include_subslice_ids=include_subslice_ids, include_config_rules=include_config_rules)
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment