X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=instancehandler%2Fviews.py;h=d80d18dda189e926e1bcc9e6e99a71e87f16cef7;hb=4908f382154fddb84d72ce8d516229649c01b606;hp=39837d7de90e3d7a08f7f390ab96d23aa991e9e4;hpb=f577644f99239013d63fc7c200ac2048e92712d5;p=osm%2FLW-UI.git diff --git a/instancehandler/views.py b/instancehandler/views.py index 39837d7..d80d18d 100644 --- a/instancehandler/views.py +++ b/instancehandler/views.py @@ -15,90 +15,116 @@ # from django.shortcuts import render, redirect -from django.contrib.auth.decorators import login_required +#from django.contrib.auth.decorators import login_required from django.http import HttpResponse, JsonResponse import yaml import json import logging from lib.osm.osmclient.clientv2 import Client +import authosm.utils as osmutils +from sf_t3d.decorators import login_required logging.basicConfig(level=logging.DEBUG) log = logging.getLogger('instancehandler/view.py') @login_required -def list(request, project_id=None, type=None): +def list(request, type=None): + + user = osmutils.get_user(request) + project_id = user.project_id client = Client() + result = {'type': type, 'project_id': project_id} + if "OSM_ERROR" in request.session: + result['alert_error'] = request.session["OSM_ERROR"] + del request.session["OSM_ERROR"] + raw_content_types = request.META.get('HTTP_ACCEPT', '*/*').split(',') + if 'application/json' not in raw_content_types: + return __response_handler(request, result, 'instance_list.html') + instance_list = None if type == 'ns': - instance_list = client.ns_list(request.session['token']) + instance_list = client.ns_list(user.get_token()) elif type == 'vnf': - instance_list = client.vnf_list(request.session['token']) + instance_list = client.vnf_list(user.get_token()) - result = {'instances': instance_list['data'] if instance_list and instance_list['error'] is False else [], - 'type': type, 'project_id': project_id} + result['instances'] = instance_list['data'] if instance_list and instance_list['error'] is False else [] return __response_handler(request, result, 'instance_list.html') @login_required -def create(request, project_id=None): +def create(request): result = {} - ns_data = { - "nsName": request.POST.get('nsName', 'WithoutName'), - "nsDescription": request.POST.get('nsDescription', ''), - "nsdId": request.POST.get('nsdId', ''), - "vimAccountId": request.POST.get('vimAccountId', ''), - } - if 'ssh_key' in request.POST and request.POST.get('ssh_key') != '': - ns_data["ssh-authorized-key"] = [request.POST.get('ssh_key')] - - if 'config' in request.POST: - ns_config = yaml.load(request.POST.get('config')) - if isinstance(ns_config, dict): - if "vim-network-name" in ns_config: - ns_config["vld"] = ns_config.pop("vim-network-name") - if "vld" in ns_config: - for vld in ns_config["vld"]: - if vld.get("vim-network-name"): - if isinstance(vld["vim-network-name"], dict): - vim_network_name_dict = {} - for vim_account, vim_net in vld["vim-network-name"].items(): - vim_network_name_dict[ns_data["vimAccountId"]] = vim_net - vld["vim-network-name"] = vim_network_name_dict - ns_data["vld"] = ns_config["vld"] - if "vnf" in ns_config: - for vnf in ns_config["vnf"]: - if vnf.get("vim_account"): - vnf["vimAccountId"] = ns_data["vimAccountId"] - - ns_data["vnf"] = ns_config["vnf"] + try: + + ns_data = { + "nsName": request.POST.get('nsName', 'WithoutName'), + "nsDescription": request.POST.get('nsDescription', ''), + "nsdId": request.POST.get('nsdId', ''), + "vimAccountId": request.POST.get('vimAccountId', ''), + } + if 'ssh_key' in request.POST and request.POST.get('ssh_key') != '': + ns_data["ssh-authorized-key"] = [request.POST.get('ssh_key')] + + if 'config' in request.POST: + ns_config = yaml.load(request.POST.get('config')) + if isinstance(ns_config, dict): + if "vim-network-name" in ns_config: + ns_config["vld"] = ns_config.pop("vim-network-name") + if "vld" in ns_config: + print ns_config + for vld in ns_config["vld"]: + if vld.get("vim-network-name"): + if isinstance(vld["vim-network-name"], dict): + vim_network_name_dict = {} + for vim_account, vim_net in vld["vim-network-name"].items(): + vim_network_name_dict[ns_data["vimAccountId"]] = vim_net + vld["vim-network-name"] = vim_network_name_dict + ns_data["vld"] = ns_config["vld"] + if "vnf" in ns_config: + for vnf in ns_config["vnf"]: + if vnf.get("vim_account"): + vnf["vimAccountId"] = ns_data["vimAccountId"] + + ns_data["vnf"] = ns_config["vnf"] + except Exception as e: + request.session["OSM_ERROR"] = "Error creating the NS; Invalid parameters provided." + return __response_handler(request, {}, 'instances:list', to_redirect=True, type='ns', ) + print ns_data + user = osmutils.get_user(request) client = Client() - result = client.ns_create(request.session['token'], ns_data) - return __response_handler(request, result, 'projects:instances:list', to_redirect=True, type='ns', - project_id=project_id) + result = client.ns_create(user.get_token(), ns_data) + return __response_handler(request, result, 'instances:list', to_redirect=True, type='ns',) @login_required -def ns_operations(request, project_id=None, instance_id=None, type=None): +def ns_operations(request, instance_id=None, type=None): + user = osmutils.get_user(request) + project_id = user.project_id + + result = {'type': 'ns', 'project_id': project_id, 'instance_id': instance_id} + raw_content_types = request.META.get('HTTP_ACCEPT', '*/*').split(',') + if 'application/json' not in raw_content_types: + return __response_handler(request, result, 'instance_operations_list.html') client = Client() - op_list = client.ns_op_list(request.session['token'], instance_id) - return __response_handler(request, - {'operations': op_list['data'] if op_list and op_list['error'] is False else [], - 'type': 'ns', 'project_id': project_id}, 'instance_operations_list.html') + op_list = client.ns_op_list(user.get_token(), instance_id) + result['operations'] = op_list['data'] if op_list and op_list['error'] is False else [] + return __response_handler(request, result, 'instance_operations_list.html') @login_required -def ns_operation(request, op_id, project_id=None, instance_id=None, type=None): +def ns_operation(request, op_id, instance_id=None, type=None): + user = osmutils.get_user(request) client = Client() - result = client.ns_op(request.session['token'], op_id) + result = client.ns_op(user.get_token(), op_id) return __response_handler(request, result['data']) @login_required -def action(request, project_id=None, instance_id=None, type=None): +def action(request, instance_id=None, type=None): + user = osmutils.get_user(request) client = Client() - # result = client.ns_action(instance_id, action_payload) primitive_param_keys = request.POST.getlist('primitive_params_name') primitive_param_value = request.POST.getlist('primitive_params_value') @@ -108,7 +134,7 @@ def action(request, project_id=None, instance_id=None, type=None): "primitive_params": {k: v for k, v in zip(primitive_param_keys, primitive_param_value) if len(k) > 0} } - result = client.ns_action(request.session['token'], instance_id, action_payload) + result = client.ns_action(user.get_token(), instance_id, action_payload) print result if result['error']: return __response_handler(request, result['data'], url=None, @@ -119,32 +145,190 @@ def action(request, project_id=None, instance_id=None, type=None): @login_required -def delete(request, project_id=None, instance_id=None, type=None): +def delete(request, instance_id=None, type=None): force = bool(request.GET.get('force', False)) result = {} + user = osmutils.get_user(request) client = Client() - result = client.ns_delete(request.session['token'], instance_id, force) + result = client.ns_delete(user.get_token(), instance_id, force) print result - return __response_handler(request, result, 'projects:instances:list', to_redirect=True, type='ns', - project_id=project_id) + return __response_handler(request, result, 'instances:list', to_redirect=True, type='ns') + + +def show_topology(request, instance_id=None, type=None): + user = osmutils.get_user(request) + project_id = user.project_id + raw_content_types = request.META.get('HTTP_ACCEPT', '*/*').split(',') + if 'application/json' in raw_content_types: + result = {'vertices': [ + {"info": {"type": "vnf", "property": {"custom_label": ""}, + "group": []}, "id": "ping"}, + {"info": {"type": "vnf", "property": {"custom_label": ""}, + "group": []}, "id": "pong"}, + {"info": {"type": "vdu", "property": {"custom_label": ""}, + "group": ['pong']}, "id": "pong/ubuntu"}, + {"info": {"type": "vdu", "property": {"custom_label": ""}, + "group": ['ping']}, "id": "ping/ubuntu"}, + {"info": {"type": "cp", "property": {"custom_label": ""}, + "group": ['ping']}, "id": "ping/cp0"}, + {"info": {"type": "cp", "property": {"custom_label": ""}, + "group": ['ping']}, "id": "ping/cp1"}, + {"info": {"type": "cp", "property": {"custom_label": ""}, + "group": ['pong']}, "id": "pong/cp0"}, + {"info": {"type": "cp", "property": {"custom_label": ""}, + "group": ['pong']}, "id": "pong/cp1"}, + {"info": {"type": "ns_vl", "property": {"custom_label": ""}, + "group": []}, "id": "mgmt_vl"}, + ], + 'edges': [ + # {"source": "ping", "group": [], "target": "ping/cp0", "view": "Data"}, + {"source": "pong/ubuntu", "group": ['pong'], "target": "pong/cp0", "view": "vnf"}, + {"source": "ping/ubuntu", "group": ['ping'], "target": "ping/cp0", "view": "vnf"}, + {"source": "pong/ubuntu", "group": ['pong'], "target": "pong/cp1", "view": "vnf"}, + {"source": "ping/ubuntu", "group": ['ping'], "target": "ping/cp1", "view": "vnf"}, + {"source": "pong", "group": [], "target": "mgmt_vl", "view": "ns"}, + {"source": "ping", "group": [], "target": "mgmt_vl", "view": "ns"}, + ], 'graph_parameters': [], + 'model': { + "layer": { + + "ns": { + "nodes": { + "vnf": { + "addable": { + "callback": "addNode" + }, + "removable": { + "callback": "removeNode" + }, + "expands": "vnf" + }, + "ns_vl": { + "addable": { + "callback": "addNode" + }, + "removable": { + "callback": "removeNode" + } + }, + + }, + "allowed_edges": { + "ns_vl": { + "destination": { + "vnf": { + "callback": "addLink", + "direct_edge": False, + "removable": { + "callback": "removeLink" + } + } + } + }, + "vnf": { + "destination": { + "ns_vl": { + "callback": "addLink", + "direct_edge": False, + "removable": { + "callback": "removeLink" + } + }, + + } + } + + } + }, + "vnf": { + "nodes": { + "vdu": { + "addable": { + "callback": "addNode" + }, + "removable": { + "callback": "removeNode" + } + }, + "cp": { + "addable": { + "callback": "addNode" + }, + "removable": { + "callback": "removeNode" + } + }, + + }, + "allowed_edges": { + "vdu": { + "destination": { + "cp": { + "callback": "addLink", + "direct_edge": False, + "removable": { + "callback": "removeLink" + } + } + } + }, + "cp": { + "destination": { + "vdu": { + "callback": "addLink", + "direct_edge": False, + "removable": { + "callback": "removeLink" + } + } + } + } + } + }, + "name": "OSM", + "version": 1, + "nodes": { + "vnf": { + "label": "vnf" + }, + "ns_vl": { + "label": "vl" + }, + "cp": { + "label": "cp" + }, + "vdu": { + "label": "vdu" + } + }, + "description": "osm" + } + }} + return __response_handler(request, result) + else: + result = {'type': type, 'project_id': project_id, 'instance_id': instance_id} + return __response_handler(request, result, 'instance_topology_view.html') @login_required -def show(request, project_id=None, instance_id=None, type=None): +def show(request, instance_id=None, type=None): # result = {} + user = osmutils.get_user(request) + project_id = user.project_id client = Client() if type == 'ns': - result = client.ns_get(request.session['token'], instance_id) + result = client.ns_get(user.get_token(), instance_id) elif type == 'vnf': - result = client.vnf_get(request.session['token'], instance_id) + result = client.vnf_get(user.get_token(), instance_id) print result return __response_handler(request, result) @login_required -def export_metric(request, project_id=None, instance_id=None, type=None): +def export_metric(request, instance_id=None, type=None): metric_data = request.POST.dict() - + user = osmutils.get_user(request) + project_id = user.project_id client = Client() keys = ["collection_period", "vnf_member_index", @@ -154,7 +338,7 @@ def export_metric(request, project_id=None, instance_id=None, type=None): "collection_unit"] metric_data = dict(filter(lambda i: i[0] in keys and len(i[1]) > 0, metric_data.items())) - result = client.ns_metric_export(request.session['token'], instance_id, metric_data) + result = client.ns_metric_export(user.get_token(), instance_id, metric_data) if result['error']: print result @@ -165,9 +349,11 @@ def export_metric(request, project_id=None, instance_id=None, type=None): @login_required -def create_alarm(request, project_id=None, instance_id=None, type=None): +def create_alarm(request, instance_id=None, type=None): metric_data = request.POST.dict() print metric_data + user = osmutils.get_user(request) + project_id = user.project_id client = Client() keys = ["threshold_value", @@ -181,7 +367,7 @@ def create_alarm(request, project_id=None, instance_id=None, type=None): "severity"] metric_data = dict(filter(lambda i: i[0] in keys and len(i[1]) > 0, metric_data.items())) - result = client.ns_alarm_create(request.session['token'], instance_id, metric_data) + result = client.ns_alarm_create(user.get_token(), instance_id, metric_data) if result['error']: print result return __response_handler(request, result['data'], url=None, @@ -193,7 +379,7 @@ def create_alarm(request, project_id=None, instance_id=None, type=None): 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 or url is None: - return HttpResponse(json.dumps(data_res), content_type="application/json", *args, **kwargs) + return HttpResponse(json.dumps(data_res), content_type="application/json") elif to_redirect: return redirect(url, *args, **kwargs) else: