projects
/
osm
/
LW-UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
enabled VNF Repositories
[osm/LW-UI.git]
/
sdnctrlhandler
/
views.py
diff --git
a/sdnctrlhandler/views.py
b/sdnctrlhandler/views.py
index
aa89a59
..
52be0a4
100644
(file)
--- a/
sdnctrlhandler/views.py
+++ b/
sdnctrlhandler/views.py
@@
-15,7
+15,7
@@
#
from django.shortcuts import render, redirect
#
from django.shortcuts import render, redirect
-from
django.contrib.auth
.decorators import login_required
+from
sf_t3d
.decorators import login_required
from django.http import HttpResponse
import json
import logging
from django.http import HttpResponse
import json
import logging
@@
-30,13
+30,15
@@
log = logging.getLogger('sdnctrlhandler/view.py')
def list(request):
user = osmutils.get_user(request)
project_id = user.project_id
def list(request):
user = osmutils.get_user(request)
project_id = user.project_id
+ result = {'project_id': project_id}
+ raw_content_types = request.META.get('HTTP_ACCEPT', '*/*').split(',')
+ if 'application/json' not in raw_content_types:
+ return __response_handler(request, result, 'sdn_list.html')
client = Client()
client = Client()
- result = client.sdn_list(user.get_token())
+ result_client = client.sdn_list(user.get_token())
+
+ result['sdns'] = result_client['data'] if result_client and result_client['error'] is False else []
- result = {
- 'project_id': project_id,
- 'sdns': result['data'] if result and result['error'] is False else []
- }
return __response_handler(request, result, 'sdn_list.html')
return __response_handler(request, result, 'sdn_list.html')
@@
-75,7
+77,7
@@
def delete(request, sdn_id=None):
del_res = client.sdn_delete(user.get_token(), sdn_id)
except Exception as e:
log.exception(e)
del_res = client.sdn_delete(user.get_token(), sdn_id)
except Exception as e:
log.exception(e)
- return __response_handler(request,
{}
, 'sdns:list', to_redirect=True, )
+ return __response_handler(request,
del_res
, 'sdns:list', to_redirect=True, )
@login_required
@login_required