Commit db8e219e authored by Felipe Fonseca's avatar Felipe Fonseca
Browse files

Merge branch '1.3.5'

parents 70d79c91 1f023b9e
...@@ -653,7 +653,7 @@ def get_slice_min_topology_and_oedl(request, slice_urn): ...@@ -653,7 +653,7 @@ def get_slice_min_topology_and_oedl(request, slice_urn):
is_topology_custom = True is_topology_custom = True
except ObjectDoesNotExist as e: except ObjectDoesNotExist as e:
print(e) logging.error(e)
if is_topology_custom: if is_topology_custom:
# print("Topology located") # print("Topology located")
...@@ -673,7 +673,7 @@ def get_slice_min_topology_and_oedl(request, slice_urn): ...@@ -673,7 +673,7 @@ def get_slice_min_topology_and_oedl(request, slice_urn):
'stop_oedl_template': OEDL.build_stop(processed_topologies['min_topology'], slice_resource, active_lease) 'stop_oedl_template': OEDL.build_stop(processed_topologies['min_topology'], slice_resource, active_lease)
} }
except Exception as e: except Exception as e:
print('Error', str(e)) logging.error(e)
pass pass
return JsonResponse(response, json_dumps_params={'indent': 2}) return JsonResponse(response, json_dumps_params={'indent': 2})
...@@ -757,7 +757,7 @@ def save_topology_and_get_oedl(request, slice_urn): ...@@ -757,7 +757,7 @@ def save_topology_and_get_oedl(request, slice_urn):
def _get_active_lease(request, slice_urn): def _get_active_lease(request, slice_urn):
leases = json.loads(get_slice_leases(request, slice_urn).content)['leases'] leases = json.loads(get_slice_leases(request, slice_urn).content.decode('utf-8'))['leases']
chosen_lease = None chosen_lease = None
for lease in leases: for lease in leases:
......
Supports Markdown
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