X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=instancehandler%2Fviews.py;h=ad7ead7debb274a89767568a7cb035315b94243e;hb=b58d5d8e177049ab63587f4329f282bc206352ec;hp=d71cd3278f17ea46efa346ce7c65ef385e8e15d8;hpb=91cd0dc4b0651b16aa17c742fc6dea211ef9c5df;p=osm%2FLW-UI.git diff --git a/instancehandler/views.py b/instancehandler/views.py index d71cd32..ad7ead7 100644 --- a/instancehandler/views.py +++ b/instancehandler/views.py @@ -31,7 +31,6 @@ 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() @@ -47,57 +46,82 @@ def list(request, type=None): instance_list = client.ns_list(user.get_token()) elif type == 'vnf': instance_list = client.vnf_list(user.get_token()) + elif type == 'pdu': + instance_list = client.pdu_list(user.get_token()) 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): +def create(request, type=None): result = {} - 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_keys"] = [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(user.get_token(), ns_data) - return __response_handler(request, result, 'instances:list', to_redirect=True, type='ns',) - + if type == 'ns': + 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_keys"] = [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', ) + result = client.ns_create(user.get_token(), ns_data) + return __response_handler(request, result, 'instances:list', to_redirect=True, type='ns') + elif type == 'pdu': + interface_param_name = request.POST.getlist('interfaces_name') + interface_param_ip = request.POST.getlist('interfaces_ip') + interface_param_mgmt = request.POST.getlist('interfaces_mgmt') + interface_param_netname = request.POST.getlist('interfaces_vimnetname') + + pdu_payload = { + "name": request.POST.get('name'), + "type": request.POST.get('pdu_type'), + "vim_accounts": request.POST.getlist('pdu_vim_accounts'), + "description": request.POST.get('description'), + "interfaces": [] + } + for i in (0,len(interface_param_name)-1): + pdu_payload['interfaces'].append({ + 'name': interface_param_name[i], + 'mgmt': True if interface_param_mgmt[i] == 'true' else False, + 'ip-address': interface_param_ip[i], + 'vim-network-name': interface_param_netname[i] + }) + result = client.pdu_create(user.get_token(), pdu_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 ns_operations(request, instance_id=None, type=None): @@ -151,7 +175,10 @@ def delete(request, instance_id=None, type=None): result = {} user = osmutils.get_user(request) client = Client() - result = client.ns_delete(user.get_token(), instance_id, force) + if type == 'ns': + result = client.ns_delete(user.get_token(), instance_id, force) + elif type == 'pdu': + result = client.pdu_delete(user.get_token(), instance_id) print result return __response_handler(request, result, 'instances:list', to_redirect=True, type='ns') @@ -176,10 +203,7 @@ def show_topology(request, instance_id=None, type=None): 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) @@ -198,6 +222,8 @@ def show(request, instance_id=None, type=None): result = client.ns_get(user.get_token(), instance_id) elif type == 'vnf': result = client.vnf_get(user.get_token(), instance_id) + elif type == 'pdu': + result = client.pdu_get(user.get_token(), instance_id) print result return __response_handler(request, result) @@ -256,8 +282,8 @@ def create_alarm(request, 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") + if not to_redirect and ('application/json' in raw_content_types or url is None): + return HttpResponse(json.dumps(data_res), content_type="application/json", *args, **kwargs) elif to_redirect: return redirect(url, *args, **kwargs) else: