X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=packagehandler%2Fviews.py;h=de9073780d348ec1aeab04a584e365181f1b4565;hb=114c5a12dd39efa0a1aedb9296021e2975340106;hp=9783348bacfdb66416210151179c07e8f75758d9;hpb=e1ed7b27b893b1b66ef1837837debdd30ccc51b4;p=osm%2FLW-UI.git diff --git a/packagehandler/views.py b/packagehandler/views.py index 9783348..de90737 100644 --- a/packagehandler/views.py +++ b/packagehandler/views.py @@ -93,25 +93,11 @@ def delete_package(request, package_type=None, package_id=None): log.exception(e) result = {'error': True, 'data': str(e)} - url = 'package_list.html' - descriptors = {} - try: - if package_type == 'ns': - descriptors = client.nsd_list(user.get_token()) - elif package_type == 'vnf': - descriptors = client.vnfd_list(user.get_token()) - except Exception as e: - log.exception(e) + 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) - return __response_handler(request, { - 'descriptors': descriptors['data'] if descriptors and descriptors['error'] is False else [], - 'project_id': project_id, - 'project_type': 'osm', - 'package_type': package_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) @login_required def clone_package(request, package_type=None, package_id=None):