X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=instancehandler%2Fviews.py;h=e38e586f468f70168ffc7d4ac15e0c9abab04a94;hb=e6eb7437628e932ef823800b5a8380790a6b22d7;hp=212fbbf59f4988450e9f5c065ce455100d67c808;hpb=0b4fb877a77e112fd242ff244be8c9eb613447a7;p=osm%2FLW-UI.git diff --git a/instancehandler/views.py b/instancehandler/views.py index 212fbbf..e38e586 100644 --- a/instancehandler/views.py +++ b/instancehandler/views.py @@ -15,33 +15,40 @@ # 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 +from lib.osm.osm_rdcl_parser import OsmParser 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, 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(user.get_token()) elif type == 'vnf': 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} - - if "OSM_ERROR" in request.session: - result['alert_error'] = request.session["OSM_ERROR"] - del request.session["OSM_ERROR"] + result['instances'] = instance_list['data'] if instance_list and instance_list['error'] is False else [] return __response_handler(request, result, 'instance_list.html') @@ -58,7 +65,7 @@ def create(request): "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')] + ns_data["ssh_keys"] = request.POST.get('ssh_key') if 'config' in request.POST: ns_config = yaml.load(request.POST.get('config')) @@ -96,12 +103,16 @@ def create(request): 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(user.get_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') + 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, instance_id=None, type=None): @@ -144,156 +155,33 @@ def delete(request, instance_id=None, type=None): print result return __response_handler(request, result, 'instances:list', to_redirect=True, type='ns') - +@login_required 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" - } - }} + client = Client() + nsr_object = {'nsr': {}, 'vnfr': {}, 'vnfd': {}} + if type == 'ns': + + nsr_resp = client.ns_get(user.get_token(), instance_id) + nsr_object['nsr'] = nsr_resp['data'] + if 'constituent-vnfr-ref' in nsr_object['nsr'] : + for vnfr_id in nsr_object['nsr']['constituent-vnfr-ref']: + vnfr_resp = client.vnf_get(user.get_token(), vnfr_id) + vnfr = vnfr_resp['data'] + nsr_object['vnfr'][vnfr['id']] = vnfr + if vnfr['vnfd-id'] not in nsr_object['vnfd']: + vnfd_resp = client.vnfd_get(user.get_token(), vnfr['vnfd-id']) + nsr_object['vnfd'][vnfr['vnfd-id']] = vnfd_resp['vnfd:vnfd-catalog']['vnfd'][0] + + + + test = OsmParser() + #print nsr_object + + result = test.nsr_to_graph(nsr_object) return __response_handler(request, result) else: result = {'type': type, 'project_id': project_id, 'instance_id': instance_id}