From 55d48e7d9a12c290048fa3214bcf16e6ff0d22e7 Mon Sep 17 00:00:00 2001 From: lombardofr Date: Fri, 21 Jun 2019 19:35:14 +0200 Subject: [PATCH 1/1] improved role management Change-Id: Iaf87385269b2195ba964a951939deca6be938013 Signed-off-by: lombardofr --- authosm/views.py | 3 +- instancehandler/views.py | 2 +- projecthandler/osm_model.py | 9 +-- rolehandler/templates/modal/role_create.html | 17 ++++- rolehandler/templates/modal/role_edit.html | 22 +++++- rolehandler/templates/role_list.html | 12 ++-- rolehandler/urls.py | 5 +- rolehandler/views.py | 66 ++++++++++++++--- static/src/rolehandler/role_list.js | 76 +++++++++++++++----- vimhandler/views.py | 1 - 10 files changed, 164 insertions(+), 49 deletions(-) diff --git a/authosm/views.py b/authosm/views.py index f82f4dd..2cfe043 100644 --- a/authosm/views.py +++ b/authosm/views.py @@ -26,8 +26,7 @@ def user_login(request): error_message = '' if request.POST: - print request.POST.get('username') - print request.POST.get('password') + next_page = request.POST.get('next') next_page = urllib.unquote(next_page).decode('iso-8859-2') try: diff --git a/instancehandler/views.py b/instancehandler/views.py index edf0da1..cf88f99 100644 --- a/instancehandler/views.py +++ b/instancehandler/views.py @@ -167,7 +167,7 @@ def create(request, type=None): except Exception as e: return __response_handler(request, {'status': 400, 'code': 'BAD_REQUEST', 'detail': e.message} , url=None, status=400) result = client.ns_create(user.get_token(), ns_data) - print result + if result['error']: return __response_handler(request, result['data'], url=None, status=result['data']['status'] if 'status' in result['data'] else 500) diff --git a/projecthandler/osm_model.py b/projecthandler/osm_model.py index 1775797..718c08d 100644 --- a/projecthandler/osm_model.py +++ b/projecthandler/osm_model.py @@ -56,11 +56,10 @@ class OsmProject(object): client = Client() if type_descriptor == 'nsd': result = client.nsd_get(descriptor_id) - print result + elif type_descriptor == 'vnfd': result = client.vnfd_get(descriptor_id) - print result except Exception as e: log.exception(e) result = {} @@ -175,11 +174,11 @@ class OsmProject(object): else: return False result = yaml.load(result) - print result + except Exception as e: log.exception(e) result = False - print result + return result def get_add_element(self, request): @@ -215,7 +214,6 @@ class OsmProject(object): except Exception as e: log.exception(e) result = False - print result return result @staticmethod @@ -232,5 +230,4 @@ class OsmProject(object): except Exception as e: log.exception(e) result = False - print result return result \ No newline at end of file diff --git a/rolehandler/templates/modal/role_create.html b/rolehandler/templates/modal/role_create.html index 58d68ca..d8282a7 100644 --- a/rolehandler/templates/modal/role_create.html +++ b/rolehandler/templates/modal/role_create.html @@ -17,9 +17,22 @@ + + +
+
+
+ +
+
+
+
+ +
+ +
- -
diff --git a/rolehandler/templates/modal/role_edit.html b/rolehandler/templates/modal/role_edit.html index 8541177..ca3c4c0 100644 --- a/rolehandler/templates/modal/role_edit.html +++ b/rolehandler/templates/modal/role_edit.html @@ -14,10 +14,26 @@
- +
- + +
+ +
+
+
+
+ +
+
+
+ +
+ +
+
diff --git a/rolehandler/templates/role_list.html b/rolehandler/templates/role_list.html index 5cf49a1..bfc7566 100644 --- a/rolehandler/templates/role_list.html +++ b/rolehandler/templates/role_list.html @@ -19,7 +19,7 @@ {% block breadcrumb_body %} {{ block.super }} -
  • roles
    • +
  • Roles
    • {% endblock %} {% block content_body %} @@ -33,10 +33,10 @@
    -

    roles

    +

    Roles

    ' + '
    '; }, "targets": 4, @@ -197,7 +197,7 @@ table.ajax.reload(); bootbox.alert({ title: "Result", - message: "role successfully modified." + message: "Role successfully modified." }); }).fail(function (result) { diff --git a/rolehandler/urls.py b/rolehandler/urls.py index c37325d..64d7ab1 100644 --- a/rolehandler/urls.py +++ b/rolehandler/urls.py @@ -20,7 +20,8 @@ from rolehandler import views urlpatterns = [ url(r'^list$', views.role_list, name='list'), url(r'^create$', views.create, name='create'), - url(r'^(?P[0-9a-zA-Z]+)/delete$', views.delete, name='delete'), - url(r'^(?P[0-9a-zA-Z]+)', views.update, name='update') + url(r'^(?P[0-9a-zA-Z]+)/delete$', views.delete, name='delete'), + url(r'^(?P[0-9a-zA-Z]+)/update$', views.update, name='update'), + url(r'^(?P[0-9a-zA-Z]+)$', views.get, name='get') ] diff --git a/rolehandler/views.py b/rolehandler/views.py index f6a0799..a13e28d 100644 --- a/rolehandler/views.py +++ b/rolehandler/views.py @@ -17,6 +17,7 @@ from django.shortcuts import render, redirect from sf_t3d.decorators import login_required from django.http import HttpResponse +import yaml import json import logging import authosm.utils as osmutils @@ -42,8 +43,21 @@ def create(request): user = osmutils.get_user(request) client = Client() role_data ={ - 'name' + 'name': request.POST['name'], + 'root': True if request.POST.get('root') else False } + try: + if 'definition' in request.POST and request.POST.get('definition') != '': + role_definition = yaml.load(request.POST.get('definition')) + + if not isinstance(role_definition, dict): + raise ValueError('Role definition should be provided in a key-value fashion') + for key, value in role_definition.items(): + if not isinstance(value, bool): + raise ValueError('Value in a role definition should be boolean') + role_data[key] = value + except Exception as e: + return __response_handler(request, {'status': 400, 'code': 'BAD_REQUEST', 'detail': e.message} , url=None, status=400) result = client.role_create(user.get_token(), role_data) if result['error']: return __response_handler(request, result['data'], url=None, @@ -69,21 +83,53 @@ def delete(request, role_id=None): @login_required def update(request, role_id=None): + user = osmutils.get_user(request) + client = Client() + payload = { + '_id': role_id, + 'name': request.POST['name'], + 'root': True if request.POST.get('root') else False + } + try: + if 'definition' in request.POST and request.POST.get('definition') != '': + role_definition = yaml.load(request.POST.get('definition')) + + if not isinstance(role_definition, dict): + raise ValueError('Role definition should be provided in a key-value fashion') + for key, value in role_definition.items(): + if not isinstance(value, bool): + raise ValueError('Value in a role definition should be boolean') + payload[key] = value + except Exception as e: + return __response_handler(request, {'status': 400, 'code': 'BAD_REQUEST', 'detail': e.message} , url=None, status=400) + result = client.role_update(user.get_token(), role_id, payload) + if result['error']: + return __response_handler(request, result['data'], url=None, + status=result['data']['status'] if 'status' in result['data'] else 500) + else: + return __response_handler(request, {}, url=None, status=200) + +@login_required +def get(request, role_id=None): user = osmutils.get_user(request) try: client = Client() - payload = {} - if request.POST.get('name') and request.POST.get('name') is not '': - payload["name"] = request.POST.get('name') - update_res = client.role_update(user.get_token(), role_id, payload) + get_res = client.role_get(user.get_token(), role_id) except Exception as e: log.exception(e) - update_res = {'error': True, 'data': str(e)} - if update_res['error']: - return __response_handler(request, update_res['data'], url=None, - status=update_res['data']['status'] if 'status' in update_res['data'] else 500) + get_res = {'error': True, 'data': str(e)} + if get_res['error']: + return __response_handler(request, get_res['data'], url=None, + status=get_res['data']['status'] if 'status' in get_res['data'] else 500) else: - return __response_handler(request, {}, url=None, status=200) + role = get_res['data'] + result = { + '_id': role['_id'], + 'name': role['name'], + 'root': role['root'], + 'definition': { key:value for key, value in role.items() if key not in ['_id', 'name', 'root', '_admin'] } + } + return __response_handler(request, result, url=None, status=200) def __response_handler(request, data_res, url=None, to_redirect=None, *args, **kwargs): diff --git a/static/src/rolehandler/role_list.js b/static/src/rolehandler/role_list.js index fc19f52..5145a04 100644 --- a/static/src/rolehandler/role_list.js +++ b/static/src/rolehandler/role_list.js @@ -16,18 +16,48 @@ function openModalCreateRole(args) { - - $('#modal_new_role').modal('show'); } function openModalEditRole(args) { var url = '/admin/roles/' + args.role_id; + var url_update = '/admin/roles/' + args.role_id+'/update'; + var dialog = bootbox.dialog({ + message: '
    Loading...
    ', + closeButton: false + }); + $.ajax({ + url: url, + type: 'GET', + headers: { + "Accept": 'application/json' + }, + contentType: false, + processData: false + }) + .done(function (response,textStatus, jqXHR) { + dialog.modal('hide'); + $("#formEditRole").attr("action", url_update); + $('#modal_edit_role').modal('show'); + $('#edit_rolename').val(response['name']) + $('#edit_definition').val(JSON.stringify(response['definition'])) + if(response['root'] === true){ + $("#edit_root").attr("checked", true); + } + else { + $("#edit_root").attr("checked", false); + } + }).fail(function(result){ + dialog.modal('hide'); + var data = result.responseJSON; + var title = "Error " + (data.code ? data.code: 'unknown'); + var message = data.detail ? data.detail: 'No detail available.'; + bootbox.alert({ + title: title, + message: message + }); + }); - $("#formEditRole").attr("action", url); - - - $('#modal_edit_role').modal('show'); } function deleteRole(role_id, name) { @@ -40,17 +70,31 @@ function deleteRole(role_id, name) { }); $.ajax({ url: delete_url, - dataType: "json", - contentType: "application/json;charset=utf-8", - success: function (result) { - //$('#modal_show_vim_body').empty(); - dialog.modal('hide'); - table.ajax.reload(); + type: 'GET', + headers: { + "Accept": 'application/json' }, - error: function (result) { - dialog.modal('hide'); - bootbox.alert("An error occurred."); - } + contentType: false, + processData: false + }) + .done(function (response,textStatus, jqXHR) { + bootbox.alert({ + title: "Result", + message: "Role deleted.", + callback: function () { + dialog.modal('hide'); + table.ajax.reload(); + } + }); + }).fail(function(result){ + dialog.modal('hide'); + var data = result.responseJSON; + var title = "Error " + (data.code ? data.code: 'unknown'); + var message = data.detail ? data.detail: 'No detail available.'; + bootbox.alert({ + title: title, + message: message + }); }); } }) diff --git a/vimhandler/views.py b/vimhandler/views.py index d16fb7e..2a0d07e 100644 --- a/vimhandler/views.py +++ b/vimhandler/views.py @@ -94,7 +94,6 @@ def show(request, vim_id=None): project_id = user.project_id client = Client() 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') -- 2.25.1