new django app packagehandler
Change-Id: Ia5014bd979a44cdd52829b9a074b70fe9a5ea101
Signed-off-by: lombardofr <lombardo@everyup.it>
diff --git a/descriptorhandler/template/composer.html b/descriptorhandler/template/composer.html
index 7647151..f0c2e9a 100644
--- a/descriptorhandler/template/composer.html
+++ b/descriptorhandler/template/composer.html
@@ -24,7 +24,6 @@
{% block breadcrumb_body %}
{{ block.super }}
- <li><a href="{% url 'projects:descriptors:list_descriptors' descriptor_type=type %}">{{ type|upper }} Descriptors</a></li>
<li><a href="#"><i class="fa fa-sitemap"></i> {{ type|upper }} Composer</a></li>
{% endblock %}
diff --git a/descriptorhandler/template/descriptor_new.html b/descriptorhandler/template/descriptor_new.html
deleted file mode 100644
index 2551f30..0000000
--- a/descriptorhandler/template/descriptor_new.html
+++ /dev/null
@@ -1,67 +0,0 @@
-{% extends "/descriptor_view_base.html" %}
-
-{% load staticfiles %}
-
-
-{% block title_header_big %}
-{{ block.super }}
-Onboard new {{ descriptor_type }} package
-{% endblock %}
-
-{% block left_sidebar %}
-{% include 'osm/osm_project_left_sidebar.html' %}
-{% endblock %}
-
-{% block breadcrumb_body %}
-{{ block.super }}
-<li><a href="{% url 'projects:open_project' %}">{{project_id}}</a></li>
-<li><a href="{% url 'projects:open_project' %}descriptors/{{descriptor_type}}">{{ descriptor_type }} Descriptors</a></li>
-<li>Create Descriptor</li>
-{% endblock %}
-
-{% block tab_pane_button_list %}
-{{ block.super }}
-<li id="file_li" class="active"><a href="#upload" data-toggle="tab"><i class="fa fa-upload"></i> Onboard Package</a></li>
-{% endblock %}
-
-{% block nav_buttons_list %}
-{{ block.super }}
-<li class="pull-right">
- <button id="cancel" type="button" class="btn btn-block btn-primary btn-sm" onclick="cancel(this.id)"><i
- class="fa fa-times"></i> Cancel
- </button>
-</li>
-{% endblock %}
-
-{% block tab_pane_list %}
-{{ block.super }}
-
-<div class="tab-pane active" id="upload">
-
- <h4>Drag and drop file below</h4>
- <div class="upload-drop-zone" id="drop-zone">
- Just drag and drop files here
- </div>
-</div>
-{% endblock %}
-
-
-{% block resource_block %}
-{{ block.super }}
-
-<script>
- var descr_list_url = '{% url "projects:descriptors:list_descriptors" descriptor_type=descriptor_type%}';
- var csrf_token = '{{csrf_token}}';
- var new_desc_url ="{% url 'projects:descriptors:new_descriptor' descriptor_type=descriptor_type %}"
-
- function cancel(id) {
- window.location.href = descr_list_url
- }
-
-</script>
- <script src="/static/src/projecthandler/onboard_package.js"></script>
-{% endblock %}
-
-{% block footer %}
- {% include "footer.html" %}
-{% endblock %}
diff --git a/descriptorhandler/template/descriptor_view.html b/descriptorhandler/template/descriptor_view.html
index 8a3fd3e..fec5168 100644
--- a/descriptorhandler/template/descriptor_view.html
+++ b/descriptorhandler/template/descriptor_view.html
@@ -16,7 +16,6 @@
{% block breadcrumb_body %}
{{ block.super }}
<li><a href="{% url 'projects:open_project' %}">{{project_id}}</a></li>
-<li><a href="{% url 'projects:descriptors:list_descriptors' descriptor_type=descriptor_type %}">{{ descriptor_type }} Descriptors</a></li>
<li><a>{{descriptor_id}}</a></li>
{% endblock %}
diff --git a/descriptorhandler/template/descriptorlist.html b/descriptorhandler/template/descriptorlist.html
deleted file mode 100644
index bbe8f21..0000000
--- a/descriptorhandler/template/descriptorlist.html
+++ /dev/null
@@ -1,48 +0,0 @@
-{% load staticfiles %}
-{% load get %}
-<div class="col-md-12">
-
- <div class="box">
- <div class="box-header with-border">
- <h3 class="box-title">
- </h3>
- <div class="box-tools">
- <div class="btn-group">
- <button type="button" class="btn btn-default" data-toggle="modal" data-target="#modal_new_package_name_chooser" >
- <i class="fa fa-paint-brush"></i> <span> Compose a new {{ descriptor_type|upper }}</span></button>
- </div>
- </div>
- </div>
- <div class="box-body">
- <table id="descriptors_table" class="table table-bordered table-striped dataTable"
- role="grid">
- <thead>
- <tr role="row">
- <th>Short Name</th>
- <th>Identified</th>
- <th>Description</th>
- <th style="width:10%">Vendor</th>
- <th style="width:5%">Version</th>
- <th style="width:35%">Actions</th>
- </tr>
- </thead>
- <tbody>
-
- </tbody>
-
- </table>
- </div>
- </div>
-</div>
-
-<div class="col-sm-12">
- <div class="box box-solid">
- <div class="box-body">
-
- <div class="upload-drop-zone" id="drop-zone">
- <i class="fa fa-upload"></i> Just drag and drop files here
- </div>
- </div>
- </div>
-</div>
-
diff --git a/descriptorhandler/template/modal/choose_package_name.html b/descriptorhandler/template/modal/choose_package_name.html
index 2211026..fcad340 100644
--- a/descriptorhandler/template/modal/choose_package_name.html
+++ b/descriptorhandler/template/modal/choose_package_name.html
@@ -6,7 +6,7 @@
<span aria-hidden="true">×</span></button>
<h4 class="modal-title">Create new Package</h4>
</div>
- <form id="formCreatePackage" action='{% url "projects:descriptors:create_package_empty" descriptor_type=descriptor_type %}'
+ <form id="formCreatePackage" action='{% url "packages:create_package_empty" package_type=package_type %}'
class="form-horizontal"
method="post" enctype="multipart/form-data">
{% csrf_token %}
diff --git a/descriptorhandler/urls.py b/descriptorhandler/urls.py
index 481211a..893514a 100644
--- a/descriptorhandler/urls.py
+++ b/descriptorhandler/urls.py
@@ -1,4 +1,3 @@
-#
# Copyright 2018 EveryUP Srl
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,17 +11,13 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
+
from django.conf.urls import url
from descriptorhandler import views
urlpatterns = [
- url(r'(?P<descriptor_type>\w+)/list$', views.show_descriptors, name='list_descriptors'),
- url(r'(?P<descriptor_type>\w+)/create', views.create_package_empty, name='create_package_empty'),
url(r'(?P<descriptor_type>\w+)/(?P<descriptor_id>[-\w]+)(/$)', views.edit_descriptor, name='edit_descriptor'),
- url(r'(?P<descriptor_type>\w+)/(?P<descriptor_id>[-\w]+)/delete$', views.delete_descriptor, name='delete_descriptor'),
- url(r'(?P<descriptor_type>\w+)/(?P<descriptor_id>[-\w]+)/clone', views.clone_descriptor, name='clone_descriptor'),
url(r'(?P<descriptor_type>\w+)/(?P<descriptor_id>[-\w]+)/addElement/(?P<element_type>\w+)', views.addElement,
name='addElement'),
url(r'(?P<descriptor_type>\w+)/(?P<descriptor_id>[-\w]+)/removeElement/(?P<element_type>\w+)', views.removeElement,
@@ -31,7 +26,6 @@
name='updateElement'),
url(r'(?P<descriptor_type>\w+)/(?P<descriptor_id>[-\w]+)/action/(?P<action_name>[-\w]+)', views.custom_action,
name='custom_action'),
- url(r'(?P<descriptor_type>\w+)/new$', views.new_descriptor, name='new_descriptor'),
url(r'composer$', views.open_composer, name='open_composer'),
url(r'availablenodes', views.get_available_nodes, name='get_available_nodes'),
]
diff --git a/descriptorhandler/views.py b/descriptorhandler/views.py
index 5824e57..e5728fb 100644
--- a/descriptorhandler/views.py
+++ b/descriptorhandler/views.py
@@ -22,7 +22,6 @@
from django.http import HttpResponse
from django.shortcuts import render, redirect
-
from lib.util import Util
from lib.osm.osmclient.clientv2 import Client
from lib.osm.osm_rdcl_parser import OsmParser
@@ -34,113 +33,8 @@
@login_required
-def show_descriptors(request, descriptor_type=None):
- user = osmutils.get_user(request)
- project_id = user.project_id
- client = Client()
- try:
- if descriptor_type == 'nsd':
- descriptors = client.nsd_list(user.get_token())
- elif descriptor_type == 'vnfd':
- descriptors = client.vnfd_list(user.get_token())
- except Exception as e:
- log.exception(e)
- descriptors = []
-
- url = 'osm/osm_project_descriptors.html'
- return __response_handler(request, {
- 'descriptors': descriptors['data'] if descriptors and descriptors['error'] is False else [],
- 'project_id': project_id,
- 'project_type': 'osm',
- 'descriptor_type': descriptor_type
- }, url)
-
-
-@login_required
-def delete_descriptor(request, descriptor_type=None, descriptor_id=None):
- user = osmutils.get_user(request)
- project_id = user.project_id
- try:
- client = Client()
- if descriptor_type == 'nsd':
- result = client.nsd_delete(user.get_token(), descriptor_id)
- elif descriptor_type == 'vnfd':
- result = client.vnfd_delete(user.get_token(), descriptor_id)
- except Exception as e:
- log.exception(e)
- result = {'error': True, 'data': str(e)}
-
- url = 'osm/osm_project_descriptors.html'
- descriptors = {}
- try:
- if descriptor_type == 'nsd':
- descriptors = client.nsd_list(user.get_token())
- elif descriptor_type == 'vnfd':
- descriptors = client.vnfd_list(user.get_token())
- except Exception as e:
- log.exception(e)
-
- return __response_handler(request, {
- 'descriptors': descriptors['data'] if descriptors and descriptors['error'] is False else [],
- 'project_id': project_id,
- 'project_type': 'osm',
- 'descriptor_type': descriptor_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 create_package_empty(request, descriptor_type=None):
- user = osmutils.get_user(request)
- pkg_name = request.POST.get('name', '')
- try:
- client = Client()
- if descriptor_type == 'nsd':
- result = client.nsd_create_pkg_base(user.get_token(), pkg_name)
- elif descriptor_type == 'vnfd':
- result = client.vnfd_create_pkg_base(user.get_token(), pkg_name)
- else:
- log.debug('Update descriptor: Unknown data type')
- result = {'error': True, 'data': 'Update descriptor: Unknown data type'}
- except Exception as e:
- log.exception(e)
- result = {'error': True, 'data': str(e)}
-
- if result['error'] == True:
- return __response_handler(request, result['data'], url=None,
- status=result['data']['status'] if 'status' in result['data'] else 500)
- else:
- result['data']['type'] = descriptor_type
- return __response_handler(request, result, url=None, status=200)
-
-
-@login_required
-def clone_descriptor(request, descriptor_type=None, descriptor_id=None):
- user = osmutils.get_user(request)
- project_id = user.project_id
- try:
- client = Client()
- if descriptor_type == 'nsd':
- result = client.nsd_clone(user.get_token(), descriptor_id)
- elif descriptor_type == 'vnfd':
- result = client.vnfd_clone(user.get_token(), descriptor_id)
- else:
- log.debug('Update descriptor: Unknown data type')
- result = {'error': True, 'data': 'Update descriptor: Unknown data type'}
- except Exception as e:
- log.exception(e)
- result = {'error': True, 'data': str(e)}
- if result['error'] == True:
- 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 addElement(request, descriptor_type=None, descriptor_id=None, element_type=None):
user = osmutils.get_user(request)
- project_id = user.project_id
client = Client()
if descriptor_type == 'nsd':
descriptor_result = client.nsd_get(user.get_token(), descriptor_id)
@@ -180,7 +74,6 @@
@login_required
def removeElement(request, descriptor_type=None, descriptor_id=None, element_type=None):
user = osmutils.get_user(request)
- project_id = user.project_id
client = Client()
if descriptor_type == 'nsd':
descriptor_result = client.nsd_get(user.get_token(), descriptor_id)
@@ -220,7 +113,6 @@
@login_required
def updateElement(request, descriptor_type=None, descriptor_id=None, element_type=None):
user = osmutils.get_user(request)
- project_id = user.project_id
client = Client()
if descriptor_type == 'nsd':
descriptor_result = client.nsd_get(user.get_token(), descriptor_id)
@@ -258,45 +150,6 @@
return __response_handler(request, result_graph, url=None, status=200)
-@login_required
-def new_descriptor(request, descriptor_type=None):
- user = osmutils.get_user(request)
- project_id = user.project_id
- page = 'descriptor_new.html'
- if request.method == 'GET':
- request_id = request.GET.get('id', '')
-
- return __response_handler(request, {
- 'project_id': project_id,
- 'descriptor_type': descriptor_type,
- 'descriptor_id': request_id,
- }, page)
- elif request.method == 'POST':
- data_type = request.POST.get('type')
- if data_type == "file":
- file_uploaded = request.FILES['file']
-
- try:
- client = Client()
- if descriptor_type == 'nsd':
- result = client.nsd_onboard(user.get_token(), file_uploaded)
- elif descriptor_type == 'vnfd':
- result = client.vnfd_onboard(user.get_token(), file_uploaded)
- else:
- log.debug('Create descriptor: Unknown data type')
- result = {'error': True, 'data': 'Create descriptor: Unknown data type'}
-
- except Exception as e:
- log.exception(e)
- result = {'error': True, 'data': str(e)}
- else:
- result = {'error': True, 'data': 'Create descriptor: Unknown data type'}
-
- 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 edit_descriptor(request, descriptor_id=None, descriptor_type=None):
@@ -359,52 +212,9 @@
'descriptor_strings': {'descriptor_string_yaml': descriptor_string_yaml,
'descriptor_string_json': descriptor_string_json}})
-
-@login_required
-def get_package_files_list(request, descriptor_id, descriptor_type):
- user = osmutils.get_user(request)
- try:
- client = Client()
- if descriptor_type == 'nsd':
- artifacts_res = client.nsd_artifacts(user.get_token(), descriptor_id)
- elif descriptor_type == 'vnfd':
- artifacts_res = client.vnf_packages_artifacts(user.get_token(), descriptor_id)
- else:
- return False
-
- files_list = yaml.load(artifacts_res['data'] if artifacts_res and artifacts_res['error'] is False else [])
- result = {'files': files_list}
- except Exception as e:
- log.exception(e)
- url = 'error.html'
- result = {'error_msg': 'Unknown error.'}
- return __response_handler(request, result)
-
-
-@login_required
-def download_pkg(request, descriptor_id, descriptor_type):
- user = osmutils.get_user(request)
- file_name = "osm_export.tar.gz"
- tar_pkg = None
- try:
- client = Client()
- if descriptor_type == 'nsd':
- tar_pkg = client.get_nsd_pkg(user.get_token(), descriptor_id)
- elif descriptor_type == 'vnfd':
- tar_pkg = client.get_vnfd_pkg(user.get_token(), descriptor_id)
-
- except Exception as e:
- log.exception(e)
-
- response = HttpResponse(content_type="application/tgz")
- response["Content-Disposition"] = "attachment; filename="+ file_name
- response.write(tar_pkg.getvalue())
- return response
-
@login_required
def open_composer(request):
user = osmutils.get_user(request)
- project_id = user.project_id
descriptor_id = request.GET.get('id')
descriptor_type = request.GET.get('type')
result = {}
@@ -435,7 +245,6 @@
return __response_handler(request, result, 'composer.html')
-
def get_available_nodes(request):
user = osmutils.get_user(request)
params = request.GET.dict()
@@ -454,13 +263,11 @@
return __response_handler(request, {'descriptors': result})
-
@login_required
def custom_action(request, descriptor_id=None, descriptor_type=None, action_name=None):
if request.method == 'GET':
return globals()[action_name](request, descriptor_id, descriptor_type)
-
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: