X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=sdnctrlhandler%2Fviews.py;h=52be0a484d6e72d8d0e4dd21251195accea4987b;hb=4908f382154fddb84d72ce8d516229649c01b606;hp=0cd66929315e41c89a1ed60727319dfbcca65783;hpb=a03da5e2aab552daa3e7ced70b3e90466c7c8b82;p=osm%2FLW-UI.git

diff --git a/sdnctrlhandler/views.py b/sdnctrlhandler/views.py
index 0cd6692..52be0a4 100644
--- a/sdnctrlhandler/views.py
+++ b/sdnctrlhandler/views.py
@@ -15,29 +15,37 @@
 #
 
 from django.shortcuts import render, redirect
-from django.contrib.auth.decorators import login_required
-from django.http import JsonResponse
-from lib.osm.osmclient.client import Client
+from sf_t3d.decorators import login_required
+from django.http import HttpResponse
+import json
 import logging
+import authosm.utils as osmutils
+from lib.osm.osmclient.clientv2 import Client
 
 logging.basicConfig(level=logging.DEBUG)
-log = logging.getLogger('view.py')
+log = logging.getLogger('sdnctrlhandler/view.py')
 
 
 @login_required
-def list(request, 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()
-    result = client.sdn_list()
+    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
-    }
     return __response_handler(request, result, 'sdn_list.html')
 
 
 @login_required
-def create(request, project_id):
+def create(request):
+    user = osmutils.get_user(request)
+    project_id = user.project_id
     result = {'project_id': project_id}
     if request.method == 'GET':
         return __response_handler(request, result, 'sdn_create.html')
@@ -55,34 +63,40 @@ def create(request, project_id):
         sdn_data = dict(filter(lambda i: i[0] in keys and len(i[1]) > 0, new_sdn_dict.items()))
         sdn_data['port'] = int(sdn_data['port'])
 
-        result = client.sdn_create(sdn_data)
+        result = client.sdn_create(user.get_token(), sdn_data)
 
-        return __response_handler(request, result, 'projects:sdns:list', to_redirect=True, project_id=project_id)
+        return __response_handler(request, result, 'sdns:list', to_redirect=True, )
 
 
 @login_required
-def delete(request, project_id, sdn_id=None):
+def delete(request, sdn_id=None):
+    user = osmutils.get_user(request)
+    project_id = user.project_id
     try:
         client = Client()
-        del_res = client.sdn_delete(sdn_id)
+        del_res = client.sdn_delete(user.get_token(), sdn_id)
     except Exception as e:
         log.exception(e)
-    return __response_handler(request, {}, 'projects:sdns:list', to_redirect=True, project_id=project_id)
+    return __response_handler(request, del_res, 'sdns:list', to_redirect=True, )
 
 
 @login_required
-def show(request, project_id, sdn_id=None):
+def show(request, sdn_id=None):
+    user = osmutils.get_user(request)
+    project_id = user.project_id
     client = Client()
-    datacenter = client.sdn_get(sdn_id)
+    result = client.sdn_get(user.get_token(), sdn_id)
+    if isinstance(result, dict) and 'error' in result and result['error']:
+        return render(request, 'error.html')
     return __response_handler(request, {
-        "sdn": datacenter
-    }, project_id=project_id)
+        "sdn": result['data'],
+        "project_id": project_id})
 
 
 def __response_handler(request, data_res, url=None, to_redirect=None, *args, **kwargs):
     raw_content_types = request.META.get('HTTP_ACCEPT', '*/*').split(',')
-    if 'application/json' in raw_content_types:
-        return JsonResponse(data_res)
+    if 'application/json' in raw_content_types or url is None:
+        return HttpResponse(json.dumps(data_res), content_type="application/json", *args, **kwargs)
     elif to_redirect:
         return redirect(url, *args, **kwargs)
     else: