X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=rolehandler%2Fviews.py;h=dba444d99682285bba46ec0f7ba43a0edfe6fc80;hb=70f9629aef040ce2bd6fba9c082f15d33ac00ef1;hp=a13e28de8c0aa84e2b84fcf97a3eb433180e01b3;hpb=55d48e7d9a12c290048fa3214bcf16e6ff0d22e7;p=osm%2FLW-UI.git

diff --git a/rolehandler/views.py b/rolehandler/views.py
index a13e28d..dba444d 100644
--- a/rolehandler/views.py
+++ b/rolehandler/views.py
@@ -42,22 +42,21 @@ def role_list(request):
 def create(request):
     user = osmutils.get_user(request)
     client = Client()
-    role_data ={
+    role_data = {
        '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 'permissions' in request.POST and request.POST.get('permissions') != '':
+            role_permissions = yaml.load(request.POST.get('permissions'))
 
-            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(role_permissions, dict):
+                raise ValueError('Role permissions should be provided in a key-value fashion')
+            for key, value in role_permissions.items():
                 if not isinstance(value, bool):
-                    raise ValueError('Value in a role definition should be boolean')
+                    raise ValueError("Value of '{}' in a role permissionss should be boolean".format(key))
                 role_data[key] = value
     except Exception as e:
-        return __response_handler(request, {'status': 400, 'code': 'BAD_REQUEST', 'detail': e.message} , url=None, status=400)
+        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,
@@ -81,27 +80,27 @@ def delete(request, role_id=None):
     else:
         return __response_handler(request, {}, url=None, status=200)
 
+
 @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
+        'permissions': {}
     }
     try:
-        if 'definition' in request.POST and request.POST.get('definition') != '':
-            role_definition = yaml.load(request.POST.get('definition'))
+        if 'permissions' in request.POST and request.POST.get('permissions') != '':
+            role_permissions = yaml.load(request.POST.get('permissions'))
 
-            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(role_permissions, dict):
+                    raise ValueError('Role permissions should be provided in a key-value fashion')
+            for key, value in role_permissions.items():
                 if not isinstance(value, bool):
-                    raise ValueError('Value in a role definition should be boolean')
-                payload[key] = value
+                    raise ValueError('Value in a role permissions should be boolean')
+                payload['permissions'][key] = value
     except Exception as e:
-        return __response_handler(request, {'status': 400, 'code': 'BAD_REQUEST', 'detail': e.message} , url=None, status=400)
+        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,
@@ -109,6 +108,7 @@ def update(request, role_id=None):
     else:
         return __response_handler(request, {}, url=None, status=200)
 
+
 @login_required
 def get(request, role_id=None):
     user = osmutils.get_user(request)
@@ -126,8 +126,7 @@ def get(request, role_id=None):
         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'] }
+            'permissions': {key: value for key, value in role['permissions'].items() if key not in ['_id', 'name', 'root', '_admin'] }
         }
         return __response_handler(request, result, url=None, status=200)