X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=instancehandler%2Fviews.py;h=c9808d65a5a10a0d11b835e7de0e1e05685106f0;hb=refs%2Fchanges%2F49%2F6249%2F4;hp=a5118f639aba19338b8da9c7520002789e0c8cb0;hpb=647aa2ede87d15576912cd590936ab796d2378c5;p=osm%2FLW-UI.git diff --git a/instancehandler/views.py b/instancehandler/views.py index a5118f6..c9808d6 100644 --- a/instancehandler/views.py +++ b/instancehandler/views.py @@ -30,7 +30,9 @@ def list(request, project_id=None, type=None): elif type == 'vnf': result = client.vnf_list() - return __response_handler(request, {'instances': result, 'type': type, 'project_id': project_id}, 'instance_list.html') + result = {'instances': result, 'type': type, 'project_id': project_id} + + return __response_handler(request, result, 'instance_list.html') @login_required @@ -102,9 +104,10 @@ def action(request, project_id=None, instance_id=None, type=None): @login_required def delete(request, project_id=None, instance_id=None, type=None): + force = bool(request.GET.get('force', False)) result = {} client = Client() - result = client.ns_delete(instance_id) + result = client.ns_delete(instance_id, force) print result return __response_handler(request, result, 'projects:instances:list', to_redirect=True, type='ns', project_id=project_id)