X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=descriptorhandler%2Fviews.py;h=912df092a9e3d0ec3b4c645899f76f36051465b4;hb=refs%2Fchanges%2F50%2F7650%2F1;hp=c80af8a4b76a3b32ba69b0444cf075f48e18e936;hpb=0dc79eb941c0222f6d53d27fb2bca839bd60780d;p=osm%2FLW-UI.git diff --git a/descriptorhandler/views.py b/descriptorhandler/views.py index c80af8a..912df09 100644 --- a/descriptorhandler/views.py +++ b/descriptorhandler/views.py @@ -22,10 +22,10 @@ from sf_t3d.decorators import login_required from django.http import HttpResponse from django.shortcuts import render, redirect - from lib.util import Util from lib.osm.osmclient.clientv2 import Client from lib.osm.osm_rdcl_parser import OsmParser +from lib.osm.osm_util import OsmUtil import authosm.utils as osmutils logging.basicConfig(level=logging.DEBUG) @@ -33,127 +33,115 @@ log = logging.getLogger('descriptorhandler/view.py') @login_required -def show_descriptors(request, descriptor_type=None): +def addElement(request, descriptor_type=None, descriptor_id=None, element_type=None): user = osmutils.get_user(request) - project_id = user.project_id client = Client() - print descriptor_type - try: - if descriptor_type == 'nsd': - descriptors = client.nsd_list(user.get_token()) - elif descriptor_type == 'vnfd': - descriptors = client.vnfd_list(user.get_token()) - except Exception as e: - log.exception(e) - descriptors = [] - - url = 'osm/osm_project_descriptors.html' - return __response_handler(request, { - 'descriptors': descriptors['data'] if descriptors and descriptors['error'] is False else [], - 'project_id': project_id, - 'project_type': 'osm', - 'descriptor_type': descriptor_type - }, url) - + if descriptor_type == 'nsd': + descriptor_result = client.nsd_get(user.get_token(), descriptor_id) + element_id = request.POST.get('id', '') + util = OsmUtil() + descriptor_updated = util.add_base_node('nsd', descriptor_result, element_type, element_id, request.POST.dict()) + result = client.nsd_update(user.get_token(), descriptor_id, descriptor_updated) + if result['error'] == True: + return __response_handler(request, result['data'], url=None, + status=result['data']['status'] if 'status' in result['data'] else 500) + else: + parser = OsmParser() + # print nsr_object + if descriptor_type == 'nsd': + result_graph = parser.nsd_to_graph(descriptor_updated) -@login_required -def delete_descriptor(request, descriptor_type=None, descriptor_id=None): - user = osmutils.get_user(request) - project_id = user.project_id - try: - client = Client() - if descriptor_type == 'nsd': - result = client.nsd_delete(user.get_token(), descriptor_id) - elif descriptor_type == 'vnfd': - result = client.vnfd_delete(user.get_token(), descriptor_id) - except Exception as e: - log.exception(e) - result = {'error': True, 'data': str(e)} + return __response_handler(request, result_graph, url=None, status=200) - url = 'osm/osm_project_descriptors.html' - descriptors = {} - try: - if descriptor_type == 'nsd': - descriptors = client.nsd_list(user.get_token()) - elif descriptor_type == 'vnfd': - descriptors = client.vnfd_list(user.get_token()) - except Exception as e: - log.exception(e) + elif descriptor_type == 'vnfd': + descriptor_result = client.vnfd_get(user.get_token(), descriptor_id) + element_id = request.POST.get('id', '') + util = OsmUtil() + descriptor_updated = util.add_base_node('vnfd', descriptor_result, element_type, element_id, request.POST.dict()) + result = client.vnfd_update(user.get_token(), descriptor_id, descriptor_updated) + if result['error'] == True: + return __response_handler(request, result['data'], url=None, + status=result['data']['status'] if 'status' in result['data'] else 500) + else: + parser = OsmParser() + # print nsr_object + if descriptor_type == 'vnfd': + result_graph = parser.vnfd_to_graph(descriptor_updated) - return __response_handler(request, { - 'descriptors': descriptors['data'] if descriptors and descriptors['error'] is False else [], - 'project_id': project_id, - 'project_type': 'osm', - 'descriptor_type': descriptor_type, - 'alert_message': { - 'success': False if result['error'] is True else True, - 'message': 'An error occurred while processing your request.' if result and result['error'] is True else "Record deleted successfully"} - }, url) + return __response_handler(request, result_graph, url=None, status=200) @login_required -def clone_descriptor(request, descriptor_type=None, descriptor_id=None): +def removeElement(request, descriptor_type=None, descriptor_id=None, element_type=None): user = osmutils.get_user(request) - project_id = user.project_id + client = Client() + if descriptor_type == 'nsd': + descriptor_result = client.nsd_get(user.get_token(), descriptor_id) + element_id = request.POST.get('id', '') + util = OsmUtil() + descriptor_updated = util.remove_node('nsd', descriptor_result, element_type, element_id, request.POST.dict()) + result = client.nsd_update(user.get_token(), descriptor_id, descriptor_updated) + if result['error'] == True: + return __response_handler(request, result['data'], url=None, + status=result['data']['status'] if 'status' in result['data'] else 500) + else: + parser = OsmParser() + # print nsr_object + if descriptor_type == 'nsd': + result_graph = parser.nsd_to_graph(descriptor_updated) - try: - client = Client() - if descriptor_type == 'nsd': - result = client.nsd_clone(user.get_token(), descriptor_id) - elif descriptor_type == 'vnfd': - result = client.vnfd_clone(user.get_token(), descriptor_id) + return __response_handler(request, result_graph, url=None, status=200) + + elif descriptor_type == 'vnfd': + descriptor_result = client.vnfd_get(user.get_token(), descriptor_id) + element_id = request.POST.get('id', '') + util = OsmUtil() + descriptor_updated = util.remove_node('vnfd', descriptor_result, element_type, element_id, request.POST.dict()) + result = client.vnfd_update(user.get_token(), descriptor_id, descriptor_updated) + if result['error'] == True: + return __response_handler(request, result['data'], url=None, + status=result['data']['status'] if 'status' in result['data'] else 500) else: - log.debug('Update descriptor: Unknown data type') - result = {'error': True, 'data': 'Update descriptor: Unknown data type'} - except Exception as e: - log.exception(e) - result = {'error': True, 'data': str(e)} - if result['error'] == True: - return __response_handler(request, result['data'], url=None, - status=result['data']['status'] if 'status' in result['data'] else 500) + parser = OsmParser() + # print nsr_object + if descriptor_type == 'vnfd': + result_graph = parser.vnfd_to_graph(descriptor_updated) - else: - return __response_handler(request, {}, url=None, status=200) + return __response_handler(request, result_graph, url=None, status=200) @login_required -def new_descriptor(request, descriptor_type=None): +def updateElement(request, descriptor_type=None, descriptor_id=None, element_type=None): user = osmutils.get_user(request) - project_id = user.project_id - page = 'descriptor_new.html' - if request.method == 'GET': - request_id = request.GET.get('id', '') + client = Client() + payload = request.POST.dict() + util = OsmUtil() + + if descriptor_type == 'nsd': + descriptor_result = client.nsd_get(user.get_token(), descriptor_id) + elif descriptor_type == 'vnfd': + descriptor_result = client.vnfd_get(user.get_token(), descriptor_id) + + if element_type == 'graph_params': + descriptor_updated = util.update_graph_params(descriptor_type, descriptor_result, json.loads(payload['update'])) + else: + descriptor_updated = util.update_node(descriptor_type, descriptor_result, element_type, json.loads(payload['old']), json.loads(payload['update'])) - return __response_handler(request, { - 'project_id': project_id, - 'descriptor_type': descriptor_type, - 'descriptor_id': request_id, - }, page) - elif request.method == 'POST': - data_type = request.POST.get('type') - if data_type == "file": - file_uploaded = request.FILES['file'] - - try: - client = Client() - if descriptor_type == 'nsd': - result = client.nsd_onboard(user.get_token(), file_uploaded) - elif descriptor_type == 'vnfd': - result = client.vnfd_onboard(user.get_token(), file_uploaded) - else: - log.debug('Create descriptor: Unknown data type') - result = {'error': True, 'data': 'Create descriptor: Unknown data type'} - - except Exception as e: - log.exception(e) - result = {'error': True, 'data': str(e)} - else: - result = {'error': True, 'data': 'Create descriptor: Unknown data type'} + if descriptor_type == 'nsd': + result = client.nsd_update(user.get_token(), descriptor_id, descriptor_updated) + elif descriptor_type == 'vnfd': + result = client.vnfd_update(user.get_token(), descriptor_id, descriptor_updated) + if result['error'] == True: + return __response_handler(request, result['data'], url=None, + status=result['data']['status'] if 'status' in result['data'] else 500) + else: + parser = OsmParser() + if descriptor_type == 'vnfd': + result_graph = parser.vnfd_to_graph(descriptor_updated) + elif descriptor_type == 'nsd': + result_graph = parser.nsd_to_graph(descriptor_updated) + return __response_handler(request, result_graph, url=None, status=200) - 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 @@ -187,7 +175,6 @@ def edit_descriptor(request, descriptor_id=None, descriptor_type=None): result = {'error': True, 'data': str(e)} if result['error'] == True: 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) @@ -200,7 +187,6 @@ def edit_descriptor(request, descriptor_id=None, descriptor_type=None): result = client.nsd_get(user.get_token(), descriptor_id) elif descriptor_type == 'vnfd': result = client.vnfd_get(user.get_token(), descriptor_id) - except Exception as e: log.exception(e) result = {'error': True, 'data': str(e)} @@ -218,56 +204,17 @@ def edit_descriptor(request, descriptor_id=None, descriptor_type=None): 'descriptor_strings': {'descriptor_string_yaml': descriptor_string_yaml, 'descriptor_string_json': descriptor_string_json}}) - -@login_required -def get_package_files_list(request, descriptor_id, descriptor_type): - user = osmutils.get_user(request) - try: - client = Client() - if descriptor_type == 'nsd': - artifacts_res = client.nsd_artifacts(user.get_token(), descriptor_id) - elif descriptor_type == 'vnfd': - artifacts_res = client.vnf_packages_artifacts(user.get_token(), descriptor_id) - else: - return False - - files_list = yaml.load(artifacts_res['data'] if artifacts_res and artifacts_res['error'] is False else []) - result = {'files': files_list} - except Exception as e: - log.exception(e) - url = 'error.html' - result = {'error_msg': 'Unknown error.'} - return __response_handler(request, result) - - -@login_required -def download_pkg(request, descriptor_id, descriptor_type): - user = osmutils.get_user(request) - file_name = "osm_export.tar.gz" - tar_pkg = None - try: - client = Client() - if descriptor_type == 'nsd': - tar_pkg = client.get_nsd_pkg(user.get_token(), descriptor_id) - elif descriptor_type == 'vnfd': - tar_pkg = client.get_vnfd_pkg(user.get_token(), descriptor_id) - - except Exception as e: - log.exception(e) - - response = HttpResponse(content_type="application/tgz") - response["Content-Disposition"] = "attachment; filename="+ file_name - response.write(tar_pkg.getvalue()) - return response - @login_required def open_composer(request): user = osmutils.get_user(request) - project_id = user.project_id descriptor_id = request.GET.get('id') descriptor_type = request.GET.get('type') + result = {} client = Client() if descriptor_id: + raw_content_types = request.META.get('HTTP_ACCEPT', '*/*').split(',') + if 'application/json' not in raw_content_types: + return __response_handler(request, {'type': descriptor_type}, 'composer.html') try: if descriptor_type == 'nsd': descriptor_result = client.nsd_get(user.get_token(), descriptor_id) @@ -286,193 +233,33 @@ def open_composer(request): result = test.nsd_to_graph(descriptor_result) elif descriptor_type == 'vnfd': result = test.vnfd_to_graph(descriptor_result) - return __response_handler(request, result,'composer.html') - - result = {'project_id': project_id, - 'vertices': [ - {"info": {"type": "vnf", "property": {"custom_label": ""}, - "group": []}, "id": "vm"}, - {"info": {"type": "vnf", "property": {"custom_label": ""}, - "group": []}, "id": "vlan"}, - {"info": {"type": "vnf", "property": {"custom_label": ""}, - "group": []}, "id": "firewall"}, - {"info": {"type": "vnf", "property": {"custom_label": ""}, - "group": []}, "id": "ping"}, - - {"info": {"type": "ns_vl", "property": {"custom_label": ""}, - "group": []}, "id": "vl1"}, - {"info": {"type": "ns_vl", "property": {"custom_label": ""}, - "group": []}, "id": "vl2"}, - {"info": {"type": "ns_vl", "property": {"custom_label": ""}, - "group": []}, "id": "vl3"}, - ], - 'edges': [ - {"source": "vm", "group": [], "target": "vl3", "view": "ns"}, - {"source": "vlan", "group": [], "target": "vl3", "view": "ns"}, - {"source": "vlan", "group": [], "target": "vl1", "view": "ns"}, - {"source": "firewall", "group": [], "target": "vl1", "view": "ns"}, - {"source": "firewall", "group": [], "target": "vl2", "view": "ns"}, - {"source": "ping", "group": [], "target": "vl2", "view": "ns"}, - ], - '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", - "callback": { - "addNode": { - "file": "osm_controller.js", - "class": "OsmController" - }, - "removeNode": { - "file": "osm_controller.js", - "class": "OsmController" - }, - "addLink": { - "file": "osm_controller.js", - "class": "OsmController" - }, - "removeLink": { - "file": "osm_controller.js", - "class": "OsmController" - } - } - - } - }} - return __response_handler(request, result, 'composer.html') + return __response_handler(request, result, 'composer.html') + return __response_handler(request, result, 'composer.html') def get_available_nodes(request): - + user = osmutils.get_user(request) params = request.GET.dict() - nodes = { - 'ns': [{"types": [{"name": "Generic", "id": "vnf"}, - {"name": "ping", "id": "vnf"}, - {"name": "pong", "id": "vnf"}, - {"name": "hackfest1-vm", "id": "vnf"}], "category_name": "Vnf"}, - {"types": [{"name": "VL", "id": "ns_vl"}], "category_name": "VirtualLink"}], - 'vnf': [{"types": [{"name": "VDU", "id": "vdu"}], "category_name": "Vdu"}, - {"types": [{"name": "CP", "id": "cp"}], "category_name": "CP"}] - } - - return __response_handler(request, nodes[params['layer']]) + client = Client() + result = [] + try: + if params['layer'] == 'nsd': + descriptors = client.vnfd_list(user.get_token()) + except Exception as e: + log.exception(e) + descriptors = [] + if descriptors and descriptors['error'] is False: + for desc in descriptors['data']: + # print desc + result.append({'_id': desc['_id'],'id': desc['id'], 'name': desc['short-name']}) + return __response_handler(request, {'descriptors': result}) @login_required def custom_action(request, descriptor_id=None, descriptor_type=None, action_name=None): if request.method == 'GET': return globals()[action_name](request, descriptor_id, descriptor_type) - 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: