X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=vimhandler%2Fviews.py;h=d16fb7ed7cf2937e1e4f7bc5e44e9fa81710ef35;hb=4908f382154fddb84d72ce8d516229649c01b606;hp=d3507040f160e165658589ca0dc7e63b4a39d876;hpb=1a6af28f66d2686ad53368095c9143279bf54ec3;p=osm%2FLW-UI.git

diff --git a/vimhandler/views.py b/vimhandler/views.py
index d350704..d16fb7e 100644
--- a/vimhandler/views.py
+++ b/vimhandler/views.py
@@ -15,28 +15,37 @@
 #
 
 from django.shortcuts import render, redirect
-from django.contrib.auth.decorators import login_required, permission_required
-from django.http import HttpResponse, JsonResponse
-from lib.osm.osmclient.client import Client
+from sf_t3d.decorators import login_required
+from django.http import HttpResponse
 import json
+from lib.osm.osmclient.clientv2 import Client
+import authosm.utils as osmutils
+import yaml
 import logging
 
 logging.basicConfig(level=logging.DEBUG)
-log = logging.getLogger('helper.py')
+log = logging.getLogger('vimhandler.py')
+
 
 @login_required
 def list(request):
+    user = osmutils.get_user(request)
+    project_id = user.project_id
+    result = {'type': 'ns', '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, 'vim_list.html')
     client = Client()
-    result = client.vim_list()
-    print result
-    result = {
-        "datacenters": result
-    }
+    result_client = client.vim_list(user.get_token())
+    result["datacenters"] = result_client['data'] if result_client and result_client['error'] is False else []
     return __response_handler(request, result, 'vim_list.html')
 
+
 @login_required
 def create(request):
-    result = {}
+    user = osmutils.get_user(request)
+    project_id = user.project_id
+    result = {'project_id': project_id}
     if request.method == 'GET':
         return __response_handler(request, result, 'vim_create.html')
     else:
@@ -52,43 +61,53 @@ def create(request):
                 "vim_tenant_name",
                 "description"]
         vim_data = dict(filter(lambda i: i[0] in keys and len(i[1]) > 0, new_vim_dict.items()))
-        vim_data['config']={}
-        for k,v in new_vim_dict.items():
+        vim_data['config'] = {}
+        for k, v in new_vim_dict.items():
             if str(k).startswith('config_') and len(v) > 0:
                 config_key = k[7:]
                 vim_data['config'][config_key] = v
         if 'additional_conf' in new_vim_dict:
-            additional_conf_dict = json.loads(new_vim_dict['additional_conf'])
-            for k,v in additional_conf_dict.items():
-                vim_data['config'][k] = v
-        print vim_data
-        result = client.vim_create(vim_data)
+            try:
+                additional_conf_dict = yaml.safe_load(new_vim_dict['additional_conf'])
+                for k,v in additional_conf_dict.items():
+                    vim_data['config'][k] = v
+            except Exception as e:
+                # TODO return error on json.loads exception
+                print e
+        result = client.vim_create(user.get_token(), vim_data)
         # TODO  'vim:show', to_redirect=True, vim_id=vim_id
-        return __response_handler(request, result, 'vim:list', to_redirect=True)
+        return __response_handler(request, result, 'vims:list', to_redirect=True, )
 
 @login_required
 def delete(request, vim_id=None):
+    user = osmutils.get_user(request)
     try:
         client = Client()
-        del_res = client.vim_delete(vim_id)
+        del_res = client.vim_delete(user.get_token(), vim_id)
     except Exception as e:
         log.exception(e)
-    return __response_handler(request, {}, 'vim:list', to_redirect=True)
+    return __response_handler(request, del_res, 'vims:list', to_redirect=True, )
 
 @login_required
 def show(request, vim_id=None):
+    user = osmutils.get_user(request)
+    project_id = user.project_id
     client = Client()
-    datacenter = client.vim_get(vim_id)
-    print datacenter
+    result = client.vim_get(user.get_token(), vim_id)
+    print result
+    if isinstance(result, dict) and 'error' in result and result['error']:
+        return render(request, 'error.html')
+
     return __response_handler(request, {
-        "datacenter": datacenter
+        "datacenter": result['data'],
+        "project_id": project_id
     }, 'vim_show.html')
 
 
 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: