X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=vimhandler%2Fviews.py;h=78e2e67f07740e2fa9bbf992a42d111e3591bdc5;hb=e5476c0177144dccef48642129ad29c860d3cf7e;hp=817a05216f2624f00788f3748f3df57611330b8c;hpb=fb37bca4b7e8178c65df2f1496afe372c1d55e78;p=osm%2FLW-UI.git diff --git a/vimhandler/views.py b/vimhandler/views.py index 817a052..78e2e67 100644 --- a/vimhandler/views.py +++ b/vimhandler/views.py @@ -18,7 +18,7 @@ from django.shortcuts import render, redirect from django.contrib.auth.decorators import login_required, permission_required from django.http import HttpResponse, JsonResponse from lib.osm.osmclient.client import Client -import json +import yaml import logging logging.basicConfig(level=logging.DEBUG) @@ -57,7 +57,14 @@ def create(request): if str(k).startswith('config_') and len(v) > 0: config_key = k[7:] vim_data['config'][config_key] = v - print vim_data + if 'additional_conf' in new_vim_dict: + try: + additional_conf_dict = yaml.safe_load(new_vim_dict['additional_conf']) + for k,v in additional_conf_dict.items(): + vim_data['config'][k] = v + except Exception as e: + # TODO return error on json.loads exception + print e result = client.vim_create(vim_data) # TODO 'vim:show', to_redirect=True, vim_id=vim_id return __response_handler(request, result, 'vim:list', to_redirect=True)