improved ns topology
Change-Id: I6eb1ee664cf52a86b8b723b52c5c6490998a0e63
Signed-off-by: lombardofr <lombardo@everyup.it>
diff --git a/static/src/descriptorhandler/composer.js b/static/src/descriptorhandler/composer.js
new file mode 100644
index 0000000..a21c14f
--- /dev/null
+++ b/static/src/descriptorhandler/composer.js
@@ -0,0 +1,266 @@
+/*
+ Copyright 2018 EveryUP srl
+
+ 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.
+*/
+
+//GraphEditor instance
+var graph_editor = new TCD3.ModelGraphEditor();
+
+var type_view = {
+ "nsd": ["vnf", "ns_vl"],
+ "vnfd": ["vdu", "cp", "vnf_vl", "int_cp"]
+};
+
+var params = {
+ node: {
+ type: type_view[getUrlParameter('type')],
+ group: []
+ },
+ link: {
+ group: [],
+ view: [getUrlParameter('type')]
+ }
+};
+
+$(document).ready(function () {
+
+ graph_editor.addListener("filters_changed", changeFilter);
+ graph_editor.addListener("node:selected", refreshElementInfo);
+ graph_editor.addListener("node:deselected", refreshElementInfo);
+
+ // graph_editor initialization
+ graph_editor.init({
+ width: $('#graph_editor_container').width(),
+ height: $('#graph_editor_container').height(),
+
+ data_url: window.location.href,
+ //desc_id: getUrlParameter('id'),
+ gui_properties: osm_gui_properties,
+ edit_mode: false,
+ behaviorsOnEvents: {
+ viewBased: false,
+ behaviors: buildBehaviorsOnEvents()
+ }
+ });
+ graph_editor.handleFiltersParams(params);
+
+});
+
+
+
+function handleForce(el) {
+ graph_editor.handleForce((el.getAttribute('aria-pressed') === "true"));
+}
+
+function changeFilter(e, c) {
+ if (c && c.link && c.link.view[0]) {
+ updateLegend(c.link.view[0]);
+ }
+ //layerDetails(graph_editor.getCurrentFilters())
+}
+
+function resetFilters() {
+ graph_editor.handleFiltersParams(params);
+}
+
+function buildBehaviorsOnEvents() {
+ var self = this;
+ var contextmenuNodesAction = [
+ {
+ title: 'Explore',
+ action: function (elm, c_node, i) {
+ if (c_node.info.type !== undefined) {
+ var current_layer_nodes = Object.keys(graph_editor.model.layer[graph_editor.getCurrentView()].nodes);
+ if (current_layer_nodes.indexOf(c_node.info.type) >= 0) {
+ if (graph_editor.model.layer[graph_editor.getCurrentView()].nodes[c_node.info.type].expands) {
+ var new_layer = graph_editor.model.layer[graph_editor.getCurrentView()].nodes[c_node.info.type].expands;
+ graph_editor.handleFiltersParams({
+ node: {
+ type: Object.keys(graph_editor.model.layer[new_layer].nodes),
+ group: [c_node.id]
+ },
+ link: {
+ group: [c_node.id],
+ view: [new_layer]
+ }
+ });
+
+ }
+ else {
+ showAlert('This is not an explorable node.')
+ }
+ }
+ }
+ },
+ edit_mode: false
+ }];
+
+ return {
+ 'nodes': contextmenuNodesAction
+ };
+
+}
+
+function refreshElementInfo(event, element) {
+ if (event.type === 'node:selected') {
+ switch (element.info.type) {
+ case 'vnfd':
+ vnfDetails(element.info.osm);
+ break;
+ case 'vdu':
+ vduDetails(element.info.osm);
+ break;
+ case 'int_cp':
+ case 'cp':
+ cpDetails(element.info.osm);
+ break;
+ case 'vnf_vl':
+ case 'ns_vl':
+ vlDetails(element.info.osm);
+ break;
+ }
+ }
+ else if (event.type === 'node:deselected') {
+ layerDetails(graph_editor.getCurrentFilters())
+ }
+}
+
+function layerDetails(filters) {
+ var side = $('#side');
+ var graph_parameters = graph_editor.getGraphParams();
+ var layer_template = '';
+ console.log(graph_parameters)
+ if(graph_parameters['view'] && filters.link.view.length >0 && filters.link.view[0]){
+ if(filters.link.view[0] === 'nsr') {
+ layer_template = getMainSection('NS View');
+ layer_template += getChildrenTable(graph_parameters['view']['nsr']);
+ }
+ else if(filters.link.view[0] === 'vnfr') {
+ layer_template = getMainSection('VNF View');
+ var vnfr_id = filters.link.group[0];
+ layer_template += getChildrenTable(graph_parameters['view']['vnfr'][vnfr_id]);
+ }
+ }
+
+ side.empty();
+ side.append(layer_template)
+}
+
+function updateLegend(view) {
+ var legend = $('#legenda');
+ var nodes = type_view[view];
+ var legend_template = '';
+ var nodes_properties = osm_gui_properties['nodes'];
+ for (var n in nodes){
+ var node = nodes[n];
+ if(nodes_properties[node]){
+ legend_template += '<div class="node">' +
+ '<div class="icon" style="background-color:' + nodes_properties[node].color +'"></div>' +
+ '<div class="name">' +nodes_properties[node].name + '</div></div>';
+ }
+ }
+
+ legend.empty();
+ legend.append(legend_template)
+
+}
+
+var map = {
+ 'ip-address': 'IP', 'vnfd-id': 'Vnfd Id', 'vnfd-ref': 'Vnfd Ref', 'vim-account-id': 'Vim Id',
+ 'member-vnf-index-ref': 'Member index', 'created-time': 'Created', 'id': 'Id', 'mgmt-network': 'Mgmt network',
+ 'name': 'Name', 'type': 'Type', 'vim-network-name': 'Vim network name', 'connection-point-id': 'Cp Id',
+ 'vdu-id-ref': 'Vdu Id', 'nsr-id-ref': 'Nsr Id'
+};
+
+function vnfDetails(vnfr) {
+ var side = $('#side');
+ var vnfr_template = getMainSection('VNF');
+
+ vnfr_template += getChildrenTable(vnfr);
+ side.empty();
+ side.append(vnfr_template)
+}
+
+function vduDetails(vdur) {
+ var side = $('#side');
+ var vdur_template = getMainSectionWithStatus('VDU', vdur['status'] === 'ACTIVE');
+ vdur_template += getChildrenTable(vdur);
+
+ if (vdur['interface'] && vdur['interface'].length > 0) {
+ vdur_template += getSubSection('Interfaces:');
+ vdur_template += '<table class="children">';
+
+ for (var i = 0; i < vdur['interface'].length; ++i) {
+ var interface = vdur['interface'][i];
+ var interface_template = '<tr><td>' + interface['name'] + '</td>'
+ + '<td>IP:' + interface['ip-address'] + '</td>'
+ + '<td>MAC:' + interface['mac-address'] + '</td>';
+ vdur_template += interface_template;
+ }
+ vdur_template += '</table>';
+ }
+
+ side.empty();
+ side.append(vdur_template)
+}
+
+function cpDetails(cp) {
+ var side = $('#side');
+ var cp_template = getMainSection('Connection Point');
+
+ cp_template += getChildrenTable(cp);
+ side.empty();
+ side.append(cp_template);
+}
+
+function vlDetails(vl) {
+ var side = $('#side');
+ var vl_template = getMainSection('Virtual Link');
+
+ vl_template += getChildrenTable(vl);
+ side.empty();
+ side.append(vl_template);
+}
+
+
+function getMainSection(title) {
+ return '<div class="section"><span style="font-weight: 500;">' + title + '</span></div>';
+}
+
+function getSubSection(title) {
+ return '<div class="section"><span>' + title + '</span></div>';
+}
+
+function getMainSectionWithStatus(title, status) {
+ var template = '<div class="section"><span style="font-weight: 500;">' + title + '</span>';
+ if (status)
+ template += '<div class="status active"><span class="indicator"></span> ACTIVE</div>';
+ else
+ template += '<div class="status"><span class="indicator"></span>NO ACTIVE</div>';
+ template += '</div>';
+ return template;
+}
+
+function getChildrenTable(data) {
+ var template = '<table class="children">';
+
+ for (var key in data) {
+ if (typeof data[key] === 'string') {
+ var key_map = (map[key]) ? map[key] : key;
+ template += '<tr><td>' + key_map + '</td><td><input name="'+key+'" class="form-control input-sm" type="text" value="' + data[key] + '"></td></tr>';
+ }
+ }
+ template += '</table>';
+ return template;
+}
\ No newline at end of file
diff --git a/static/src/instancehandler/instance_create.js b/static/src/instancehandler/instance_create.js
index 0bf1dbc..47cba12 100644
--- a/static/src/instancehandler/instance_create.js
+++ b/static/src/instancehandler/instance_create.js
@@ -14,7 +14,6 @@
limitations under the License.
*/
-
function openModalCreateNS(args) {
// load vim account list
select2_groups = $('#vimAccountId').select2({
@@ -63,7 +62,7 @@
}
});
- if(args.descriptor_id){
+ if (args.descriptor_id) {
// Set the value, creating a new option if necessary
if ($('#nsdId').find("option[value='" + args.descriptor_id + "']").length) {
$('#nsdId').val(args.descriptor_id).trigger('change');
diff --git a/static/src/instancehandler/instance_topology_view.js b/static/src/instancehandler/instance_topology_view.js
index 1193b18..99bb986 100644
--- a/static/src/instancehandler/instance_topology_view.js
+++ b/static/src/instancehandler/instance_topology_view.js
@@ -1,6 +1,44 @@
+/*
+ Copyright 2018 EveryUP srl
+
+ 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.
+*/
+
//GraphEditor instance
var graph_editor = new TCD3.ModelGraphEditor();
+var layer_map = {
+ 'nsr': {
+ 'id': 'NS instance id',
+ 'nsdId': 'NSD id',
+ 'name-ref': 'NSD name',
+ 'operational-status': 'Operational status',
+ 'config-status': 'Config status',
+ 'detailed-status': 'Detailed status',
+ 'create-time': 'Creation date',
+ 'instantiate_params' :'Instantiation parameters'
+ },
+ 'vnfr': {
+ 'id': 'VNF instance id',
+ 'vnfd-id': 'NSD id',
+ 'vnfd-ref': 'NSD name',
+ 'member-vnf-index': 'Constituent VNF in the NS',
+ 'ip-address': 'Mgmt IP address',
+ 'vim-account-id': 'VIM id',
+ 'create-time': 'Creation date'
+ }
+};
+
var type_view = {
"nsr": ["vnfr", "ns_vl"],
"vnfr": ["vdur", "cp", "vnf_vl"]
@@ -41,7 +79,6 @@
});
-
function handleForce(el) {
graph_editor.handleForce((el.getAttribute('aria-pressed') === "true"));
}
@@ -119,6 +156,7 @@
}
}
+
function layerDetails(filters) {
var side = $('#side');
var graph_parameters = graph_editor.getGraphParams();
@@ -126,12 +164,35 @@
if(graph_parameters['view'] && filters.link.view.length >0 && filters.link.view[0]){
if(filters.link.view[0] === 'nsr') {
layer_template = getMainSection('NS View');
- layer_template += getChildrenTable(graph_parameters['view']['nsr']);
+ layer_template+= '<table class="children">';
+ for (var key in layer_map['nsr']) {
+ if ( graph_parameters['view']['nsr'][key] ) {
+ var field_value = graph_parameters['view']['nsr'][key];
+ if(key === 'create-time'){
+ field_value = moment.unix(field_value).toISOString();
+ }
+ layer_template += '<tr><td>' + layer_map['nsr'][key] + '</td><td>' + field_value + '</td></tr>';
+ }
+ }
+ layer_template += '</table>';
+ //layer_template += getChildrenTable(graph_parameters['view']['nsr']);
}
else if(filters.link.view[0] === 'vnfr') {
layer_template = getMainSection('VNF View');
var vnfr_id = filters.link.group[0];
- layer_template += getChildrenTable(graph_parameters['view']['vnfr'][vnfr_id]);
+
+ layer_template+= '<table class="children">';
+ var vnfr_data = graph_parameters['view']['vnfr'][vnfr_id];
+ for (var key in layer_map['vnfr']) {
+ if ( vnfr_data[key] ) {
+ var field_value = vnfr_data[key];
+ if(key === 'create-time'){
+ field_value = moment.unix(field_value).toISOString();
+ }
+ layer_template += '<tr><td>' + layer_map['vnfr'][key] + '</td><td>' + field_value + '</td></tr>';
+ }
+ }
+ layer_template += '</table>';
}
}
@@ -159,10 +220,10 @@
}
var map = {
- 'ip-address': 'IP', 'vnfd-id': 'Vnfd Id', 'vnfd-ref': 'Vnfd Ref', 'vim-account-id': 'Vim Id',
+ 'ip-address': 'IP', 'vnfd-id': 'Vnfd Id', 'vnfd-ref': 'Vnfd Ref', 'vim-account-id': 'VIM Id',
'member-vnf-index-ref': 'Member index', 'created-time': 'Created', 'id': 'Id', 'mgmt-network': 'Mgmt network',
'name': 'Name', 'type': 'Type', 'vim-network-name': 'Vim network name', 'connection-point-id': 'Cp Id',
- 'vdu-id-ref': 'Vdu Id', 'nsr-id-ref': 'Nsr Id'
+ 'vdu-id-ref': 'Vdu Id', 'nsr-id-ref': 'Nsr Id', 'vim-id': 'VIM id'
};
function vnfrDetails(vnfr) {
diff --git a/static/src/osm_gui_properties.js b/static/src/osm_gui_properties.js
index 45abaf7..0241b34 100644
--- a/static/src/osm_gui_properties.js
+++ b/static/src/osm_gui_properties.js
@@ -11,7 +11,7 @@
"vnf": {
//"image": "vnf-100.png",
"shape": "square",
- "color": "#54A698",
+ "color": "#605ca8",
"size": 35,
"width": 40,
"height": 20,
@@ -20,8 +20,8 @@
"vdu": {
"shape": "square",
//"color": "#50A7CC",
- "color": "#54A698",
- "size": 30,
+ "color": "#cf1c24",
+ "size": 40,
"width": 40,
"height": 20,
"name": "VDU"
@@ -30,15 +30,15 @@
//"image": "cp-80.png",
"shape": "square",
"color": "#c6b63f",
- "size": 40,
+ "size": 30,
"name": "CP"
},
"int_cp": {
//"image": "cp-80.png",
"shape": "square",
"color": "#e3bfad",
- "size": 40,
- "name": "CP"
+ "size": 15,
+ "name": "intCP"
},
"ns_vl": {
"shape": "triangle",
diff --git a/static/src/projecthandler/composer.js b/static/src/projecthandler/composer.js
index 8e1017a..6b8eae6 100644
--- a/static/src/projecthandler/composer.js
+++ b/static/src/projecthandler/composer.js
@@ -1,3 +1,19 @@
+/*
+ Copyright 2018 EveryUP srl
+
+ 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.
+*/
+
//GraphEditor instance
var graph_editor = new dreamer.ModelGraphEditor();
var selected_vnffgId = null;
diff --git a/static/src/projecthandler/descriptorslist.js b/static/src/projecthandler/descriptorslist.js
index bf31480..5060041 100644
--- a/static/src/projecthandler/descriptorslist.js
+++ b/static/src/projecthandler/descriptorslist.js
@@ -1,3 +1,19 @@
+/*
+ Copyright 2018 EveryUP srl
+
+ 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 deletePackage(descriptor_type, package_id, package_name) {
bootbox.confirm("Are you sure want to delete " + package_name + "?", function (result) {
diff --git a/static/src/projecthandler/new_project.js b/static/src/projecthandler/new_project.js
deleted file mode 100644
index 9ca4c9e..0000000
--- a/static/src/projecthandler/new_project.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * New Project page
- **/
-function handleTypeChoose(type) {
- resetStartFromInputs()
- $('#projectType').val(type);
- $('#startGroup').show();
- $('input[id="scratch"]').prop('checked', true);
- $('#startButtonsSelect label').removeClass("active");
- $('#s-scratch').addClass("active");
- $('#createButton').prop('disabled', false);
- //$('#projectName').val('New_'+type+'_project')
-}
-
-function startFromChoose(start) {
- resetStartFromInputs()
- //resetSelectors();
- var type = $('#select_type').val();
-
- if (start == 'files')
- $('#div-file-upload-' + type).show();
- else if (start == 'example')
- //document.getElementById['#div-example-' + type].style.display = "block";
- $('#div-example-' + type).css("display", "inline");
-
-}
-
-function resetStartFromInputs() {
- $('div[class="start-selector"]').hide();
- $('input[type="file"]').val('');
- $('select[class="example-selector"]').val(null).trigger("change");
-}
-
-$(document).ready(function () {
-
- // init selector
- $(".start-selector").css("display", "inline");
- $('#select_type').select2({
- placeholder: {
- id: '-1',
- text: 'Select an option'
- },
- data: data_type_selector
- });
-
-
- $('#select_type').on("select2:select", function (evt) {
- if (evt) {
- var args = evt.params;
- handleTypeChoose(args.data.value)
- }
- });
-
- if (type_example_files) {
- for (var key in type_example_files) {
- $('select[id="example-' + key + '"]').select2({
- placeholder: {
- id: '-1',
- text: 'Select an option'
- },
- data: type_example_files[key]
- });
- }
-
-
- }
-
-
-
- $("#startButtonsSelect :input").change(function () {
- startFromChoose(this.value);
- });
-
-
-
- $("body").bind("ajaxSend", function (elm, xhr, s) {
- if (s.type == "POST") {
- xhr.setRequestHeader('csrftoken', $('#csrfmiddlewaretoken').val());
- }
- });
-
- $(".start-selector").css("display", "none");
-
-});
\ No newline at end of file
diff --git a/static/src/projecthandler/onboard_package.js b/static/src/projecthandler/onboard_package.js
index c622cad..d18be5b 100644
--- a/static/src/projecthandler/onboard_package.js
+++ b/static/src/projecthandler/onboard_package.js
@@ -1,3 +1,19 @@
+/*
+ Copyright 2018 EveryUP srl
+
+ 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.
+*/
+
var dropZone = document.getElementById('drop-zone');
dropZone.ondrop = function (e) {
e.preventDefault();
diff --git a/static/src/projecthandler/osm/controller.js b/static/src/projecthandler/osm/controller.js
deleted file mode 100644
index e39e332..0000000
--- a/static/src/projecthandler/osm/controller.js
+++ /dev/null
@@ -1,107 +0,0 @@
-if (typeof dreamer === 'undefined') {
- var dreamer = {};
-}
-var level = {}
-
-dreamer.OsmController = (function(global) {
- 'use strict';
-
- var DEBUG = true;
-
- OsmController.prototype.constructor = OsmController;
-
- /**
- * Constructor
- */
- function OsmController() {
-
-
- }
-
-
- OsmController.prototype.addNode = function(graph_editor, node, success, error) {
- log('addNode');
- var data_to_send = {
- 'group_id': node.info.group[0],
- 'element_id': node.id,
- 'element_type': node.info.type,
- 'element_desc_id': node.info.desc_id,
- 'x': node.x,
- 'y': node.y
- };
- new dreamer.GraphRequests().addNode(data_to_send, null, function() {
- if (success)
- success();
- },error);
- };
-
- OsmController.prototype.addLink = function(graph_editor, link, success, error) {
- log('addLink');
- var data_to_send = {
- 'desc_id': link.desc_id,
- 'source': link.source.id,
- 'source_type': link.source.info.type,
- 'target': link.target.id,
- 'target_type': link.target.info.type,
- 'view': link.view,
- 'group': link.group
- };
- new dreamer.GraphRequests().addLink(link, null, function() {
- graph_editor._deselectAllNodes();
-
- if (typeof old_link !== 'undefined' && old_link.length > 0 && old_link[0].index !== 'undefined') {
- graph_editor.parent.removeLink.call(graph_editor, old_link[0].index);
- }
- if (success) {
- success();
- }
- },error);
- };
-
- OsmController.prototype.removeNode = function(graph_editor, node, success, error) {
- log('removeNode');
- var data_to_send = {
- 'group_id': node.info.group[0],
- 'element_id': node.id,
- 'element_type': node.info.type,
- 'element_desc_id': node.info.desc_id,
- };
- new dreamer.GraphRequests().removeNode(data_to_send, null, function() {
- if (success) {
- success();
- }
- },error);
- };
-
- OsmController.prototype.removeLink = function(graph_editor, link, success, error) {
- log('removeLink');
- var data_to_send = {
- 'desc_id': link.desc_id,
- 'source': link.source.id,
- 'source_type': link.source.info.type,
- 'target': link.target.id,
- 'target_type': link.target.info.type,
- 'view': link.view,
- 'group': link.group
- };
- new dreamer.GraphRequests().removeLink(data_to_send, function() {
- if (success) {
- success();
- }
- },error);
- };
-
- /**
- * Log utility
- */
- function log(text) {
- if (DEBUG)
- console.log("::OsmController::", text);
- }
-
- return OsmController;
-}(this));
-
-if (typeof module === 'object') {
- module.exports = dreamer.OsmController;
-}
\ No newline at end of file
diff --git a/static/src/projecthandler/osm/gui_properties.js b/static/src/projecthandler/osm/gui_properties.js
deleted file mode 100644
index 1af3ef4..0000000
--- a/static/src/projecthandler/osm/gui_properties.js
+++ /dev/null
@@ -1,128 +0,0 @@
-//***STEFANO
-var example_gui_properties = {
- "v1" : {
- "default": {
- "shape": "cross",
- "color": "#42f44e",
- "label_color": "black",
- "size": 15
- },
- "nodes": {
- "ns_vl": {
- "image" : "vl-80.png",
- // "shape": "triangle",
- "color": "#196B90",
- "size": 20,
- "name": "VL"
- },
- "ns_cp": {
- "image" : "cp-80.png",
- // "shape": "circle",
- "color": "#F27220",
- "size": 20,
- "name": "CP"
- },
- "vnf": {
- "image": "vnf-100.png",
- // "shape": "square",
- "color": "#54A698",
- "size": 35,
- "name": "VNF"
- },
- "vnf_vl": {
- "shape": "triangle",
- //"color": "#5FC9DB",
- "color": "#196B90",
- "size": 11,
- "name": "IntVL"
- },
- "vnf_ext_cp": {
- "shape": "circle",
- //"#00CC66",
- "color": "#F27220",
- "size": 15,
- "name": "ExtCP"
- },
- "vnf_vdu_cp": {
- "shape": "circle",
- //"color": "#E74C35",
- "color": "#fce0cf",
- "size": 15,
- "name": "VduCP"
- },
- "vnf_vdu": {
- "shape": "square",
- //"color": "#50A7CC",
- "color": "#54A698",
- "size": 18,
- "name": "VDU"
- }
- },
- "graphs": null
-
- },
- "v0" : {
- "default": {
- "shape": "cross",
- "color": "#42f44e",
- "label_color": "black",
- "size": 15
- },
- "nodes": {
- "pippo": {
- "image": "image.png",
- "size": 25
- },
- "ns_vl": {
- "shape": "triangle",
- "color": "#196B90",
- "size": 11,
- "name": "VL"
- },
- "ns_cp": {
- "shape": "circle",
- "color": "#F27220",
- "size": 15,
- "name": "CP"
- },
- "vnf": {
- "shape": "square",
- "color": "#54A698",
- "image": "router.png",
- "size": 40,
- "name": "VNF"
- },
- "vnf_vl": {
- "shape": "triangle",
- //"color": "#5FC9DB",
- "color": "#196B90",
- "size": 11,
- "name": "IntVL"
- },
- "vnf_ext_cp": {
- "shape": "circle",
- //"#00CC66",
- "color": "#F27220",
- "size": 15,
- "name": "ExtCP"
- },
- "vnf_vdu_cp": {
- "shape": "circle",
- //"color": "#E74C35",
- "color": "#fce0cf",
- "size": 15,
- "name": "VduCP"
- },
- "vnf_vdu": {
- "shape": "square",
- //"color": "#50A7CC",
- "color": "#54A698",
- "size": 18,
- "name": "VDU"
- }
- },
- "graphs": null
-
- },
-
-}
\ No newline at end of file
diff --git a/static/src/projecthandler/osm/project_graph.js b/static/src/projecthandler/osm/project_graph.js
deleted file mode 100644
index 5ee3522..0000000
--- a/static/src/projecthandler/osm/project_graph.js
+++ /dev/null
@@ -1,354 +0,0 @@
-//GraphEditor instance
-var graph_editor = new dreamer.ModelGraphEditor();
-var selected_vnffgId = null;
-var show_all = null;
-
-// Enable Drop Action on the Graph
-initDropOnGraph();
-
-
-
-$(document).ready(function() {
- var descriptor_type = getUrlParameter('type') == 'ns' || getUrlParameter('type') == 'nsd' ? 'ns' : 'vnf'
- var allowed_types = descriptor_type == 'ns' ? ['vnf', 'ns_cp', 'ns_vl'] : ['vnf_vl', 'vnf_ext_cp', 'vnf_vdu_cp', 'vnf_vdu'];
- var params = {
- node: {
- type: allowed_types,
- group: [getUrlParameter('id')]
- },
- link: {
- group: [getUrlParameter('id')],
- view: [descriptor_type]
- }
- }
-
- graph_editor.addListener("refresh_graph_parameters", refreshGraphParameters);
-
-
- // graph_editor initialization
- graph_editor.init({
- width: $('#graph_ed_container').width(),
- height: $('#graph_ed_container').height(),
- gui_properties: example_gui_properties,
- filter_base: params,
- behaviorsOnEvents:{
- viewBased: false,
- behaviors: buildBehaviorsOnEvents()
- }
- });
-
- // this will filter in the different views, excluding the node types that are not listed in params
- graph_editor.handleFiltersParams(params);
- graph_editor.addListener("filters_changed", changeFilter);
- graph_editor.addListener("edit_descriptor", openEditorEvent);
-
-});
-
-
-function initDropOnGraph() {
-
- var dropZone = document.getElementById('graph_ed_container');
- dropZone.ondrop = function(e) {
- var group = graph_editor.getCurrentGroup()
- e.preventDefault();
- var nodetype = e.dataTransfer.getData("text/plain");
- if (nodetype) {
- var type_name = graph_editor.getTypeProperty()[nodetype].name;
- if (nodetype == 'vnf') {
- new dreamer.GraphRequests().getUnusedVnf(group, function(vnfs) {
- $('#div_chose_id').hide();
- $('#div_chose_vnf').show();
- $('#input_choose_node_id').val(nodetype + "_" + generateUID());
- $('#selection_chooser_vnf').empty();
- $('#selection_chooser_vnf').append('<option >None</option>');
- $('#modal_chooser_title_add_node').text('Add ' + type_name);
- for (var i in vnfs) {
- $('#selection_chooser_vnf').append('<option id="' + vnfs[i] + '">' + vnfs[i] + '</option>');
- }
- $('#save_choose_node_id').off('click').on('click', function() {
- var choice = $("#selection_chooser_vnf option:selected").text();
- var name = $('#input_choose_node_id').val();
- if (choice == 'None') {
- var node_information = {
- 'id': name,
- 'info': {
- 'type': nodetype,
- 'group': [group]
- },
- 'x': e.layerX,
- 'y': e.layerY
- }
- graph_editor.addNode(node_information, function() {
- $('#modal_choose_node_id').modal('hide');
- }, function(error){
- showAlert(error)
- });
- } else {
- var node_information = {
- 'existing_element': true,
- 'id': choice,
- 'info': {
- 'type': nodetype,
- 'group': [group]
- },
- 'x': e.layerX,
- 'y': e.layerY
- }
- graph_editor.addNode(node_information, function() {
- $('#modal_choose_node_id').modal('hide');
- }, function(error){
- showAlert(error)
- });
- }
-
- });
-
- $('#modal_choose_node_id').modal('show');
- });
-
- } else {
- $('#div_chose_id').show();
- $('#div_chose_vnf').hide();
- $('#input_choose_node_id').val(nodetype + "_" + generateUID());
- $('#modal_chooser_title_add_node').text('Add ' + type_name);
- $('#save_choose_node_id').off('click').on('click', function() {
- var name = $('#input_choose_node_id').val();
- var node_information = {
- 'id': name,
- 'info': {
- 'type': nodetype,
- 'group': [group]
- },
- 'x': e.layerX,
- 'y': e.layerY
- }
- graph_editor.addNode(node_information, function() {
- $('#modal_choose_node_id').modal('hide');
- }, function(error){
- showAlert(error)
- });
- });
- $('#modal_choose_node_id').modal('show');
-
- }
- }
-
- }
-
- dropZone.ondragover = function(ev) {
- console.log("ondragover");
- return false;
- }
-
- dropZone.ondragleave = function() {
- console.log("ondragleave");
- return false;
- }
-}
-
-function handleForce(el) {
- if (el.id == "topology_play") {
- $("#topology_pause").removeClass('active');
- $("#topology_play").addClass('active');
- } else {
- $("#topology_pause").addClass('active');
- $("#topology_play").removeClass('active');
- }
-
- graph_editor.handleForce((el.id == "topology_play") ? true : false);
-
-}
-
-function changeFilter(e, c) {
- var type_property = graph_editor.getTypeProperty();
- if (c.link.view == 'ns') {
- $("#title_header").text("NS Graph Editor")
- $("#vnffg_options").prop("disabled", false);
- graph_editor.refreshGraphParameters();
- } else {
-
- $("#title_header").text("VNF Graph Editor");
- $("#vnffg_box").hide();
- $("#vnffg_options").prop("disabled", true);
- }
-
- new dreamer.GraphRequests().getAvailableNodes({layer: c.link.view[0]}, buildPalette, showAlert);
- updateBredCrumb(c);
-}
-
-var filters = function(e, params) {
- graph_editor.handleFiltersParams(params);
- $('#' + e).nextAll('li').remove();
-}
-
-function updateBredCrumb(filter_parameters){
- var newLi = $("<li id=" + JSON.stringify(graph_editor.getCurrentGroup()) + "><a href='javascript:filters(" + JSON.stringify(graph_editor.getCurrentGroup()) + "," + JSON.stringify(filter_parameters) + ")'>" + graph_editor.getCurrentGroup() + "</a></li>");
- $('#breadcrumb').append(newLi);
-}
-
-
-function openEditor() {
- window.location.href = '/projects/descriptors/' + graph_editor.getCurrentView() + 'd/' + graph_editor.getCurrentGroup();
-}
-
-
-function showChooserModal(title, chooses, callback) {
- console.log('showchooser')
- $('#selection_chooser').empty();
- for (var i in chooses) {
- $('#selection_chooser').append('<option id="' + chooses[i].id + '">' + chooses[i].id + '</option>');
- }
- $('#modal_chooser_title').text(title)
- var self = this;
- $('#save_chooser').off('click').on('click', function() {
- var choice = $("#selection_chooser option:selected").text();
- callback(choice);
-
- });
- $('#modal_create_link_chooser').modal('show');
-
-}
-
-function refreshGraphParameters(e, graphParameters) {
-
- var self = $(this);
- if (graphParameters == null) return;
- var vnffgIds = graphParameters.vnffgIds;
- if (vnffgIds == null) return;
-
- $("#selection_vnffg").empty();
- $("#selection_vnffg").append('<option value="Global">Global</option>')
- for (var i in vnffgIds) {
- var vnffgId = vnffgIds[i]
- var child = $('<option value="' + vnffgId + '">' + vnffgId + '</option>');
- $("#selection_vnffg").append(child)
- }
-}
-
-function changeVnffg(e) {
- var vnffgId = e.value;
- selected_vnffgId = vnffgId;
- show_all_change();
-}
-
-function newVnffg() {
- var group = graph_editor.getCurrentGroup()
- $('#div_chose_id').show();
- $('#div_chose_vnf').hide();
- $('#input_choose_node_id').val("vnffg_" + generateUID());
- $('#modal_chooser_title_add_node').text('Add VNFFG');
- $('#save_choose_node_id').off('click').on('click', function() {
- var name = $('#input_choose_node_id').val();
- var node_information = {
- 'element_id': name,
- 'element_type': "vnffg",
- 'group_id': group,
- }
- console.log(JSON.stringify(node_information))
- new dreamer.GraphRequests().addVnffg(node_information, function(result) {
-
- $('#modal_choose_node_id').modal('hide');
- graph_editor.d3_graph.graph_parameters.vnffgIds.push(node_information.id)
- refreshGraphParameters(null, graph_editor.d3_graph.graph_parameters)
- });
-
-
-
- });
- $('#modal_choose_node_id').modal('show');
-}
-
-function show_all_change(e) {
- if (!selected_vnffgId) return;
- var vnffgId = selected_vnffgId;
- if (e) show_all = e.checked;
- if (show_all) {
- handleVnffgParameter("Global", "invisible");
- handleVnffgParameter(vnffgId, "matted");
- } else {
- handleVnffgParameter("Global", "matted");
- handleVnffgParameter(vnffgId, "invisible");
- }
-}
-
-function clickVnffg() {
- if ($("#vnffg_box").is(':visible'))
- $("#vnffg_box").hide();
- else
- $("#vnffg_box").show();
-
-}
-
-function handleVnffgParameter(vnffgId, class_name) {
-
- if (vnffgId != "Global") {
- selected_vnffgId = vnffgId;
- graph_editor.setNodeClass(class_name, function(d) {
- var result = false;
- if (d.info.group.indexOf(vnffgId) < 0) {
- result = true;
- }
- console.log(result);
- return result;
- });
-
- graph_editor.setLinkClass(class_name, function(d) {
- var result = false;
- if (d.group.indexOf(vnffgId) < 0) {
- result = true;
- }
- console.log(result);
- return result;
- });
-
- } else {
- selected_vnffgId = null;
- graph_editor.setNodeClass(class_name, function(d) {
- var result = false;
- return result;
- });
-
- graph_editor.setLinkClass(class_name, function(d) {
- var result = false;
- return result;
- });
- }
-}
-
-function buildBehaviorsOnEvents(){
- var contextmenuNodesAction = [
- {
- title: 'Show graph',
- action: function (elm, c_node, i) {
- if (c_node.info.type != undefined) {
- var current_layer_nodes = Object.keys(graph_editor.model.layer[graph_editor.getCurrentView()].nodes);
- if (current_layer_nodes.indexOf(c_node.info.type) >= 0) {
- if (graph_editor.model.layer[graph_editor.getCurrentView()].nodes[c_node.info.type].expands) {
- var new_layer = graph_editor.model.layer[graph_editor.getCurrentView()].nodes[c_node.info.type].expands;
- graph_editor.handleFiltersParams({
- node: {
- type: Object.keys(graph_editor.model.layer[new_layer].nodes),
- group: [c_node.id]
- },
- link: {
- group: [c_node.id],
- view: [new_layer]
- }
- });
-
- }
- else{
- showAlert('This is not an explorable node.')
- }
- }
- }
- },
- edit_mode: false
- }];
- var behavioursOnEvents = {
- 'nodes': contextmenuNodesAction,
-
- };
-
- return behavioursOnEvents;
-}
\ No newline at end of file
diff --git a/static/src/sdnctrlhandler/sdn_list.js b/static/src/sdnctrlhandler/sdn_list.js
index 5542825..c410b16 100644
--- a/static/src/sdnctrlhandler/sdn_list.js
+++ b/static/src/sdnctrlhandler/sdn_list.js
@@ -1,3 +1,19 @@
+/*
+ Copyright 2018 EveryUP srl
+
+ 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 deleteSDN(sdn_uuid, name) {
bootbox.confirm("Are you sure want to delete " + name +"?", function (result) {
if (result) {
diff --git a/static/src/userhandler/user_list.js b/static/src/userhandler/user_list.js
index b485e5b..615f118 100644
--- a/static/src/userhandler/user_list.js
+++ b/static/src/userhandler/user_list.js
@@ -1,3 +1,19 @@
+/*
+ Copyright 2018 EveryUP srl
+
+ 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 openModalCreateUser(args) {
select2_groups = $('#projects').select2({