X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=static%2Fsrc%2Fdescriptorhandler%2Fcontroller.js;h=f127ea7742b58d3f2839e655490a96bb117bd5f1;hb=114c5a12dd39efa0a1aedb9296021e2975340106;hp=6285f829ae038e34358ee28a844958433c0334d8;hpb=a3c5bcf40aaf2b3dc653021c469f062b5c2ebe5a;p=osm%2FLW-UI.git diff --git a/static/src/descriptorhandler/controller.js b/static/src/descriptorhandler/controller.js index 6285f82..f127ea7 100644 --- a/static/src/descriptorhandler/controller.js +++ b/static/src/descriptorhandler/controller.js @@ -51,23 +51,29 @@ TCD3.OsmController = (function (global) { var vnfd_node = (link.source.info.type === 'vnf') ? link.source : link.target; var vld_node = (link.source.info.type === 'ns_vl') ? link.source : link.target; + bootbox.prompt("Please insert the vnfd-connection-point-ref:", function(result){ + if (result){ + data_form.append('csrfmiddlewaretoken', getCookie('csrftoken')); + data_form.append('vnfd-connection-point-ref', result); + data_form.append('member-vnf-index-ref', vnfd_node.info.osm['member-vnf-index']); + data_form.append('vnfd-id-ref', vnfd_node.info.osm['vnfd-id-ref']); + data_form.append('vld_id', vld_node.info.osm['id']); + + $.ajax({ + url: '/projects/descriptors/' + desc_type + '/' + desc_id + '/addElement/' + element_type, + type: 'POST', + data: data_form, + cache: false, + contentType: false, + processData: false, + success: success, + error: error + }); + } - data_form.append('csrfmiddlewaretoken', getCookie('csrftoken')); - data_form.append('vnfd-connection-point-ref', 'cp_temp'); - data_form.append('member-vnf-index-ref', vnfd_node.info.osm['member-vnf-index']); - data_form.append('vnfd-id-ref', vnfd_node.info.osm['vnfd-id-ref']); - data_form.append('vld_id', vld_node.info.osm['id']); - - $.ajax({ - url: '/projects/descriptors/' + desc_type + '/' + desc_id + '/addElement/' + element_type, - type: 'POST', - data: data_form, - cache: false, - contentType: false, - processData: false, - success: success, - error: error }); + + } else if (desc_type === 'vnfd') { if (['vdu', 'cp'].indexOf(link.source.info.type) > -1 && ['vdu', 'cp'].indexOf(link.target.info.type) > -1) { @@ -78,6 +84,7 @@ TCD3.OsmController = (function (global) { data_form.append('csrfmiddlewaretoken', getCookie('csrftoken')); data_form.append('vdu_id', vdu_node.info.osm.id); data_form.append('external-connection-point-ref', cp_node.info.osm.name); + data_form.append('name', "eth_" + generateUID()); $.ajax({ url: '/projects/descriptors/' + desc_type + '/' + desc_id + '/addElement/interface', type: 'POST', @@ -203,17 +210,13 @@ TCD3.OsmController = (function (global) { var desc_type = getUrlParameter('type'); if (desc_type === 'nsd') { - var element_type = 'cp'; + var element_type = 'ns_cp'; var data_form = new FormData(); - - var vnfd_node = (link.source.info.type === 'vnf') ? link.source : link.target; - var vld_node = (link.source.info.type === 'ns_vl') ? link.source : link.target; - + var ns_cp = (link.source.info.type === 'ns_cp') ? link.source : link.target; data_form.append('csrfmiddlewaretoken', getCookie('csrftoken')); - data_form.append('vnfd-connection-point-ref', 'cp_temp'); - data_form.append('member-vnf-index-ref', vnfd_node.info.osm['member-vnf-index']); - data_form.append('vnfd-id-ref', vnfd_node.info.osm['vnfd-id-ref']); - data_form.append('vld_id', vld_node.info.osm['id']); + data_form.append('member-vnf-index-ref', ns_cp.info.osm['member-vnf-index-ref']); + data_form.append('vnfd-id-ref', ns_cp.info.osm['vnfd-id-ref']); + data_form.append('vld_id', ns_cp.info.osm['vld_id']); $.ajax({ url: '/projects/descriptors/' + desc_type + '/' + desc_id + '/removeElement/' + element_type,