From dd73c0c9bdfb085085fd6345e8ab9c5440e5e77a Mon Sep 17 00:00:00 2001 From: lombardof Date: Wed, 9 May 2018 10:46:49 +0200 Subject: [PATCH] ssh-key and config in NS create modal Change-Id: Id03b474f0b07d8819c9fefa346221a6c6fc61cc8 Signed-off-by: lombardof --- instancehandler/template/instance_list.html | 21 ++-- .../template/modal/instance_create.html | 72 +++++++----- instancehandler/views.py | 33 ++++-- .../osm/descriptor/descriptorlist.html | 2 +- .../project/osm/osm_project_descriptors.html | 69 +---------- static/src/instancehandler/instance_create.js | 66 +++++++++++ static/src/projecthandler/descriptorslist.js | 111 +++++++----------- static/src/vimhandler/vim_create.js | 0 8 files changed, 194 insertions(+), 180 deletions(-) create mode 100644 static/src/instancehandler/instance_create.js create mode 100644 static/src/vimhandler/vim_create.js diff --git a/instancehandler/template/instance_list.html b/instancehandler/template/instance_list.html index 1b0868d..54ac016 100644 --- a/instancehandler/template/instance_list.html +++ b/instancehandler/template/instance_list.html @@ -12,6 +12,7 @@ + {% endblock %} {% block title_header_big %} {{ block.super }} @@ -36,12 +37,16 @@

Instances

- +
@@ -122,14 +127,15 @@ -{% include 'modal/instance_show.html' %} -{% include 'modal/instance_new_action.html' %} + {% include 'modal/instance_create.html' %} + {% include 'modal/instance_show.html' %} + {% include 'modal/instance_new_action.html' %} {% endblock %} {% block resource_block %} {{ block.super }} - + @@ -144,6 +150,7 @@ + {% endblock %} diff --git a/instancehandler/template/modal/instance_create.html b/instancehandler/template/modal/instance_create.html index c40ecb2..ffbce47 100644 --- a/instancehandler/template/modal/instance_create.html +++ b/instancehandler/template/modal/instance_create.html @@ -1,53 +1,69 @@ ' - $('#files_list_tbody').append(template) - } - $('#modal_files_list').modal('show'); - } - {% endblock %} {% block footer %} diff --git a/static/src/instancehandler/instance_create.js b/static/src/instancehandler/instance_create.js new file mode 100644 index 0000000..55fb512 --- /dev/null +++ b/static/src/instancehandler/instance_create.js @@ -0,0 +1,66 @@ +/* + Copyright 2018 CNIT - Consorzio Nazionale Interuniversitario per le Telecomunicazioni + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an BASIS, + 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. +*/ + + +function openModalCreateNS(args) { + + // load vim account list + select2_groups = $('#vimAccountId').select2({ + placeholder: 'Select VIM', + ajax: { + url: args.vim_list_url, + dataType: 'json', + processResults: function (data) { + vims = []; + if (data['datacenters']) { + for (d in data['datacenters']) { + var datacenter = data['datacenters'][d]; + vims.push({id: datacenter['_id'], text: datacenter['name']}) + } + } + + return { + results: vims + }; + } + } + }); + /* + // load nsd list + select2_groups = $('#nsdId').select2({ + placeholder: 'Select NSD', + ajax: { + url: args.nsd_list_url, + dataType: 'json', + processResults: function (data) { + nsd_list = []; + if (data['nsd_list']) { + for (d in data['nsd_list']) { + var nsd = data['nsd_list'][d]; + nsd_list.push({id: nsd['_id'], text: nsd['name']}) + } + } + + return { + results: nsd_list + }; + } + } + }); + */ + $('#nsdId').val(args.descriptor_id); + $('#modal_new_instance').modal('show'); +} \ No newline at end of file diff --git a/static/src/projecthandler/descriptorslist.js b/static/src/projecthandler/descriptorslist.js index 4a5975a..5a803da 100644 --- a/static/src/projecthandler/descriptorslist.js +++ b/static/src/projecthandler/descriptorslist.js @@ -1,69 +1,42 @@ - -function startFromAgent(start) { - - - if (start == 'exist'){ - $('#div_new_agent').hide(); - $('#div_available_agent').show(); - } - else if (start == 'new'){ - $('#div_available_agent').hide(); - $('#div_new_agent').show(); - } - - $('.required').prop('required', function(){ - return $(this).is(':visible'); - }); - -} -/* -function InvalidGitUrl(textbox) { - console.log('InvalidGitUrl', textbox,textbox.value == '' ,textbox.validity.typeMismatch) - if (textbox.value === '') { - textbox.setCustomValidity('Required git URL'); - } - else if (textbox.validity.typeMismatch){ - textbox.setCustomValidity('please enter a valid git URL'); - - } - else { - textbox.setCustomValidity('please enter a valid git URL'); - } - return true; -} -*/ -function startFromRepo(start) { - - - if (start == 'exist'){ - $('#div_new_repo').hide(); - $('#div_available_repo').show(); - } - else if (start == 'new'){ - $('#div_available_repo').hide(); - $('#div_new_repo').show(); - } - - $('.required').prop('required', function(){ - return $(this).is(':visible'); - }); - -} - -$(document).ready(function () { - $("#startButtonsSelect :input").change(function () { - console.log("select") - startFromAgent(this.value); - }); - $("#push_start_buttons_select :input").change(function () { - console.log("select") - startFromRepo(this.value); - }); - - // Bind events - $("form").submit(function(e) { - console.log("on submit form") - $("#start_new_deployment").button('loading'); - }); - -}); \ No newline at end of file + function deletePackage(project_id, descriptor_type, package_id) { + bootbox.confirm("Are you sure want to delete?", function (result) { + if (result) { + location.href = '/projects/' + project_id + '/descriptors/' + descriptor_type + '/' + package_id + '/delete' + } + }) + } + + + + function openPackageContentList(project_id, type, pkg_id) { + var dialog = bootbox.dialog({ + message: '
Loading...
', + closeButton: true + }); + $.ajax({ + url: '/projects/' + project_id + '/descriptors/' + type + '/' + pkg_id + '/action/get_package_files_list', + type: 'GET', + dataType: "json", + contentType: "application/json;charset=utf-8", + success: function (result) { + //$('#modal_show_vim_body').empty(); + dialog.modal('hide'); + build_file_list("Files in " + pkg_id, result.files); + }, + error: function (result) { + dialog.modal('hide'); + bootbox.alert("An error occurred while retrieving the package content."); + } + }); + } + + + function build_file_list(title, list) { + $('#files_list_tbody').find('tr:gt(0)').remove(); + $('#files_list_tbody_title').text(title) + for (var i in list) { + var template = '' + $('#files_list_tbody').append(template) + } + $('#modal_files_list').modal('show'); + } \ No newline at end of file diff --git a/static/src/vimhandler/vim_create.js b/static/src/vimhandler/vim_create.js new file mode 100644 index 0000000..e69de29 -- 2.17.1
{% if descriptor_type == "nsd" %} - + {% endif %} diff --git a/projecthandler/template/project/osm/osm_project_descriptors.html b/projecthandler/template/project/osm/osm_project_descriptors.html index 30ea76a..27872b2 100644 --- a/projecthandler/template/project/osm/osm_project_descriptors.html +++ b/projecthandler/template/project/osm/osm_project_descriptors.html @@ -46,74 +46,9 @@ {% block resource_block %} {{ block.super }} - + - function openModalCreateNS(project_id, descriptor_type, descriptor_id) { - select2_groups = $('#vimAccountId').select2({ - placeholder: 'Select VIM', - ajax: { - url: '{% url "vim:list" %}', - dataType: 'json', - processResults: function (data) { - vims = []; - if (data['datacenters']){ - for(d in data['datacenters']){ - var datacenter = data['datacenters'][d]; - vims.push({id: datacenter['_id'], text: datacenter['name']}) - } - } - - return { - results: vims - }; - } - } - }); - $('#nsdId').val(descriptor_id); - $('#modal_new_instance').modal('show'); - } - - function openPackageContentList(project_id, type, pkg_id) { - var dialog = bootbox.dialog({ - message: '
Loading...
', - closeButton: true - }); - $.ajax({ - url: '/projects/' + project_id + '/descriptors/' + type + '/' + pkg_id + '/action/get_package_files_list', - type: 'GET', - dataType: "json", - contentType: "application/json;charset=utf-8", - success: function (result) { - //$('#modal_show_vim_body').empty(); - console.log(result) - dialog.modal('hide'); - build_file_list("Files in " + pkg_id, result.files); - }, - error: function (result) { - dialog.modal('hide'); - bootbox.alert("An error occurred while retrieving the package content."); - } - }); - } - - - function build_file_list(title, list) { - $('#files_list_tbody').find('tr:gt(0)').remove(); - $('#files_list_tbody_title').text(title) - for (var i in list) { - var template = '
-' + list[i] + '
-' + list[i] + '