diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml index 17d6c97d7c..bdc63e4a74 100644 --- a/src/sunstone/etc/sunstone-views/admin.yaml +++ b/src/sunstone/etc/sunstone-views/admin.yaml @@ -366,6 +366,7 @@ tabs: vnet_info_tab: true vnet_ar_list_tab: true vnet_leases_tab: true + vnet_sg_list_tab: true table_columns: - 0 # Checkbox - 1 # ID diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml index 091c2ab3a6..ee1db7f2aa 100644 --- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml +++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml @@ -366,6 +366,7 @@ tabs: vnet_info_tab: true vnet_ar_list_tab: true vnet_leases_tab: true + vnet_sg_list_tab: true table_columns: - 0 # Checkbox - 1 # ID diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml index b1c49a2606..f5778dfc30 100644 --- a/src/sunstone/etc/sunstone-views/user.yaml +++ b/src/sunstone/etc/sunstone-views/user.yaml @@ -367,6 +367,7 @@ tabs: vnet_info_tab: true vnet_ar_list_tab: true vnet_leases_tab: true + vnet_sg_list_tab: true table_columns: - 0 # Checkbox - 1 # ID diff --git a/src/sunstone/public/app/app.js b/src/sunstone/public/app/app.js index 8a5ab270f7..eb458a03eb 100644 --- a/src/sunstone/public/app/app.js +++ b/src/sunstone/public/app/app.js @@ -9,7 +9,8 @@ define(function(require) { require('tabs/datastores-tab'), require('tabs/hosts-tab'), require('tabs/vresources-tab'), - require('tabs/images-tab') + require('tabs/images-tab'), + require('tabs/vnets-tab') ]; var _commonDialogs = [ diff --git a/src/sunstone/public/app/tabs/secgroups-tab/datatable.js b/src/sunstone/public/app/tabs/secgroups-tab/datatable.js new file mode 100644 index 0000000000..eb1b7d0e41 --- /dev/null +++ b/src/sunstone/public/app/tabs/secgroups-tab/datatable.js @@ -0,0 +1,83 @@ +define(function(require) { + /* + DEPENDENCIES + */ + + var TabDataTable = require('utils/tab-datatable'); + var SunstoneConfig = require('sunstone-config'); + var Locale = require('utils/locale'); + + /* + CONSTANTS + */ + + var RESOURCE = "SecurityGroup"; + var XML_ROOT = "SECURITY_GROUP"; + var TAB_NAME = require('./tabId'); + + /* + CONSTRUCTOR + */ + + function Table(dataTableId, conf) { + this.conf = conf || {}; + this.tabId = TAB_NAME; + this.dataTableId = dataTableId; + this.resource = RESOURCE; + this.xmlRoot = XML_ROOT; + + this.dataTableOptions = { + "bAutoWidth": false, + "bSortClasses" : false, + "bDeferRender": true, + "aoColumnDefs": [ + {"bSortable": false, "aTargets": ["check"]}, + {"sWidth": "35px", "aTargets": [0]}, + {"bVisible": true, "aTargets": SunstoneConfig.tabTableColumns(TAB_NAME)}, + {"bVisible": false, "aTargets": ['_all']} + ] + }; + + this.columns = [ + Locale.tr("ID"), + Locale.tr("Owner"), + Locale.tr("Group"), + Locale.tr("Name") + ]; + + this.selectOptions = { + "id_index": 1, + "name_index": 4, + "select_resource": Locale.tr("Please select a security group from the list"), + "you_selected": Locale.tr("You selected the following security group:"), + "select_resource_multiple": Locale.tr("Please select one or more security groups from the list"), + "you_selected_multiple": Locale.tr("You selected the following security groups:") + }; + + TabDataTable.call(this); + } + + Table.prototype = Object.create(TabDataTable.prototype); + Table.prototype.constructor = Table; + Table.prototype.elementArray = _elementArray; + + return Table; + + /* + FUNCTION DEFINITIONS + */ + + function _elementArray(element_json) { + var element = element_json[XML_ROOT]; + + return [ + '', + element.ID, + element.UNAME, + element.GNAME, + element.NAME + ]; + } +}); diff --git a/src/sunstone/public/app/tabs/secgroups-tab/tabId.js b/src/sunstone/public/app/tabs/secgroups-tab/tabId.js new file mode 100644 index 0000000000..5e4d1a6662 --- /dev/null +++ b/src/sunstone/public/app/tabs/secgroups-tab/tabId.js @@ -0,0 +1,3 @@ +define(function(require){ + return 'secgroups-tab'; +}); \ No newline at end of file diff --git a/src/sunstone/public/app/tabs/vnets-tab.js b/src/sunstone/public/app/tabs/vnets-tab.js new file mode 100644 index 0000000000..4c08ba3c94 --- /dev/null +++ b/src/sunstone/public/app/tabs/vnets-tab.js @@ -0,0 +1,39 @@ +define(function(require) { + var Locale = require('utils/locale'); + var Buttons = require('./vnets-tab/buttons'); + var Actions = require('./vnets-tab/actions'); + var Table = require('./vnets-tab/datatable'); + + var TAB_ID = require('./vnets-tab/tabId'); + var DATATABLE_ID = "dataTableVNets"; + + var _dialogs = [ + require('./vnets-tab/dialogs/create') + ]; + + var _panels = [ + require('./vnets-tab/panels/info'), + require('./vnets-tab/panels/ar'), + require('./vnets-tab/panels/leases'), + require('./vnets-tab/panels/secgroups') + ]; + + var VNetsTab = { + tabId: TAB_ID, + title: Locale.tr("Virtual Networks"), + tabClass: "subTab", + parentTab: "infra-tab", + listHeader: ' ' + Locale.tr("Virtual Networks"), + infoHeader: ' ' + Locale.tr("Virtual Network"), + subheader: ' '+Locale.tr("TOTAL")+' \ + '+Locale.tr("USED IPs")+'', + resource: 'Network', + buttons: Buttons, + actions: Actions, + dataTable: new Table(DATATABLE_ID, {actions: true, info: true}), + panels: _panels, + dialogs: _dialogs + }; + + return VNetsTab; +}); diff --git a/src/sunstone/public/app/tabs/vnets-tab/actions.js b/src/sunstone/public/app/tabs/vnets-tab/actions.js new file mode 100644 index 0000000000..6f37756328 --- /dev/null +++ b/src/sunstone/public/app/tabs/vnets-tab/actions.js @@ -0,0 +1,357 @@ +define(function(require) { + var Sunstone = require('sunstone'); + var Notifier = require('utils/notifier'); + var Locale = require('utils/locale'); + var DataTable = require('./datatable'); + var OpenNebulaNetwork = require('opennebula/network'); + + var TAB_ID = require('./tabId'); + var CREATE_DIALOG_ID = require('./dialogs/create/dialogId'); + + var _actions = { + "Network.create" : { + type: "create", + call: OpenNebulaNetwork.create, + callback: function(request, response) { + Sunstone.getDialog(CREATE_DIALOG_ID).hide(); + Sunstone.getDialog(CREATE_DIALOG_ID).reset(); + DataTable.addElement(request, response); + }, + error: Notifier.onError, + notify: true + }, + + "Network.create_dialog" : { + type: "custom", + call: function(){ + Sunstone.getDialog(CREATE_DIALOG_ID).show(); + } + }, + + // TODO + /* + "Network.import_dialog" : { + type: "create", + call: function(){ + popUpNetworkImportDialog(); + } + }, + */ + + "Network.list" : { + type: "list", + call: OpenNebulaNetwork.list, + callback: function(request, response) { + Sunstone.getDataTable(TAB_ID).updateView(request, response); + }, + error: Notifier.onError + }, + + "Network.show" : { + type: "single", + call: OpenNebulaNetwork.show, + callback: function(request, response) { + Sunstone.getDataTable(TAB_ID).updateElement(request, response); + if (Sunstone.rightInfoVisible($('#'+TAB_ID))) { + Sunstone.insertPanels(TAB_ID, response); + } + }, + error: Notifier.onError + }, + + "Network.refresh" : { + type: "custom", + call: function() { + var tab = $('#' + TAB_ID); + if (Sunstone.rightInfoVisible(tab)) { + Sunstone.runAction("Network.show", Sunstone.rightInfoResourceId(tab)); + } else { + Sunstone.getDataTable(TAB_ID).waitingNodes(); + Sunstone.runAction("Network.list", {force: true}); + } + }, + error: Notifier.onError + }, + + // TODO: update + /* + "Network.publish" : { + type: "multiple", + call: OpenNebulaNetwork.publish, + callback: function(req) { + Sunstone.runAction("Network.show",req.request.data[0][0]); + }, + elements: vnElements, + error: Notifier.onError + }, + + "Network.unpublish" : { + type: "multiple", + call: OpenNebulaNetwork.unpublish, + callback: function(req) { + Sunstone.runAction("Network.show",req.request.data[0][0]); + }, + elements: vnElements, + error: Notifier.onError + }, + */ + + "Network.delete" : { + type: "multiple", + call : OpenNebulaNetwork.del, + callback : function(request, response) { + Sunstone.getDataTable(TAB_ID).deleteElement(request, response); + }, + elements: function() { + return Sunstone.getDataTable(TAB_ID).elements(); + }, + error : Notifier.onError, + notify:true + }, + + "Network.hold" : { + type: "single", + call: OpenNebulaNetwork.hold, + callback: function(req) { + Sunstone.runAction("Network.show",req.request.data[0][0]); + }, + error: Notifier.onError + }, + + "Network.release" : { + type: "single", + call: OpenNebulaNetwork.release, + callback: function(req) { + Sunstone.runAction("Network.show",req.request.data[0][0]); + }, + error: Notifier.onError + }, + // TODO: update + /* + "Network.add_ar" : { + type: "single", + call: OpenNebulaNetwork.add_ar, + callback: function(req) { + // Reset the wizard + $add_ar_dialog.foundation('reveal', 'close'); + $add_ar_dialog.empty(); + setupAddARDialog(); + + Sunstone.runAction("Network.show",req.request.data[0][0]); + }, + error: Notifier.onError + }, + + "Network.rm_ar" : { + type: "single", + call: OpenNebulaNetwork.rm_ar, + callback: function(req) { + OpenNebula.Helper.clear_cache("VNET"); + Sunstone.runAction("Network.show",req.request.data[0][0]); + }, + error: Notifier.onError + }, + + "Network.update_ar" : { + type: "single", + call: OpenNebulaNetwork.update_ar, + callback: function(req) { + // Reset the wizard + $update_ar_dialog.foundation('reveal', 'close'); + $update_ar_dialog.empty(); + setupUpdateARDialog(); + + Sunstone.runAction("Network.show",req.request.data[0][0]); + }, + error: Notifier.onError + }, + + "Network.reserve_dialog" : { + type: "custom", + call: popUpReserveDialog + }, + + "Network.reserve" : { + type: "single", + call: OpenNebulaNetwork.reserve, + callback: function(req) { + // Reset the wizard + $reserve_dialog.foundation('reveal', 'close'); + $reserve_dialog.empty(); + setupReserveDialog(); + + OpenNebula.Helper.clear_cache("VNET"); + Sunstone.runAction("Network.show",req.request.data[0][0]); + }, + error: Notifier.onError + }, + */ + + "Network.chown" : { + type: "multiple", + call: OpenNebulaNetwork.chown, + callback: function (req) { + Sunstone.runAction("Network.show", req.request.data[0]); + }, + elements: function() { + return Sunstone.getDataTable(TAB_ID).elements(); + }, + error: Notifier.onError, + notify: true + }, + + "Network.chgrp" : { + type: "multiple", + call: OpenNebulaNetwork.chgrp, + callback: function (req) { + Sunstone.runAction("Network.show", req.request.data[0]); + }, + elements: function() { + return Sunstone.getDataTable(TAB_ID).elements(); + }, + error: Notifier.onError, + notify: true + }, + + "Network.chmod" : { + type: "single", + call: OpenNebulaNetwork.chmod, + callback: function (req) { + Sunstone.runAction("Network.show", req.request.data[0]); + }, + elements: function() { + return Sunstone.getDataTable(TAB_ID).elements(); + }, + error: Notifier.onError, + notify: true + }, + + "Network.rename" : { + type: "single", + call: OpenNebulaNetwork.rename, + callback: function(request) { + Sunstone.runAction('Network.show', request.request.data[0][0]); + }, + error: Notifier.onError, + notify: true + }, + + // TODO: update + /* + "Network.update_dialog" : { + type: "custom", + call: function(){ + var selected_nodes = getSelectedNodes(dataTable_vNetworks); + if ( selected_nodes.length != 1 ) { + notifyMessage("Please select one (and just one) Virtual Network to update."); + return false; + } + + var resource_id = ""+selected_nodes[0]; + Sunstone.runAction("Network.show_to_update", resource_id); + } + }, + + "Network.show_to_update" : { + type: "single", + call: OpenNebulaNetwork.show, + callback: function(request, response) { + // TODO: global var, better use jquery .data + vnet_to_update_id = response.VNET.ID; + + Sunstone.popUpFormPanel("create_vnet_form", "vnets-tab", "update", true, function(context){ + fillVNetUpdateFormPanel(response.VNET, context); + + $("#default_sg_warning").hide(); + }); + }, + error: Notifier.onError + }, + */ + + // TODO: update + /* + "Network.update" : { + type: "single", + call: OpenNebulaNetwork.update, + callback: function(request, response){ + $("a[href=back]", $("#vnets-tab")).trigger("click"); + popFormDialog("create_vnet_form", $("#vnets-tab")); + + notifyMessage(tr("Virtual Network updated correctly")); + }, + error: function(request, response){ + popFormDialog("create_vnet_form", $("#vnets-tab")); + + onError(request, response); + } + }, + */ + + "Network.update_template" : { + type: "single", + call: OpenNebulaNetwork.update, + callback: function(request) { + Sunstone.runAction('Network.show',request.request.data[0][0]); + }, + error: Notifier.onError + }, + + // TODO: update + /* + "Network.addtocluster" : { + type: "multiple", + call: function(params){ + var cluster = params.data.extra_param; + var vnet = params.data.id; + + if (cluster == -1){ + OpenNebulaNetwork.show({ + data : { + id: vnet + }, + success: function (request, vn){ + var vn_info = vn.VNET; + + var current_cluster = vn_info.CLUSTER_ID; + + if(current_cluster != -1){ + OpenNebula.Cluster.delvnet({ + data: { + id: current_cluster, + extra_param: vnet + }, + success: function(){ + OpenNebula.Helper.clear_cache("VNET"); + Sunstone.runAction('Network.show',vnet); + }, + error: Notifier.onError + }); + } else { + OpenNebula.Helper.clear_cache("VNET"); + Sunstone.runAction('Network.show',vnet); + } + }, + error: Notifier.onError + }); + } else { + OpenNebula.Cluster.addvnet({ + data: { + id: cluster, + extra_param: vnet + }, + success: function(){ + OpenNebula.Helper.clear_cache("VNET"); + Sunstone.runAction('Network.show',vnet); + }, + error: Notifier.onError + }); + } + }, + elements: vnElements + } + */ + }; + + return _actions; +}) diff --git a/src/sunstone/public/app/tabs/vnets-tab/buttons.js b/src/sunstone/public/app/tabs/vnets-tab/buttons.js new file mode 100644 index 0000000000..d2cf597aa6 --- /dev/null +++ b/src/sunstone/public/app/tabs/vnets-tab/buttons.js @@ -0,0 +1,63 @@ +define(function(require) { + var Locale = require('utils/locale'); + + var VNetButtons = { + "Network.refresh" : { + type: "action", + layout: "refresh", + alwaysActive: true + }, + "Network.create_dialog" : { + type: "create_dialog", + layout: "create" + }, + "Network.import_dialog" : { + type: "create_dialog", + layout: "create", + text: Locale.tr("Import"), + icon: '', + alwaysActive: true + }, + "Network.update_dialog" : { + type: "action", + layout: "main", + text: Locale.tr("Update") + }, + "Network.reserve_dialog" : { + type: "action", + layout: "main", + text: Locale.tr("Reserve"), + custom_classes: "only-right-info reserve-right-info", + }, + "Network.addtocluster" : { + type: "confirm_with_select", + text: Locale.tr("Select cluster"), + layout: "main", + select: "Cluster", + tip: Locale.tr("Select the destination cluster:") + }, + "Network.chown" : { + type: "confirm_with_select", + text: Locale.tr("Change owner"), + layout: "user_select", + select: "User", + tip: Locale.tr("Select the new owner")+":" + }, + + "Network.chgrp" : { + type: "confirm_with_select", + text: Locale.tr("Change group"), + layout: "user_select", + select: "Group", + tip: Locale.tr("Select the new group")+":" + }, + + "Network.delete" : { + type: "confirm", + layout: "del", + text: Locale.tr("Delete") + } + }; + + return VNetButtons; +}) diff --git a/src/sunstone/public/app/tabs/vnets-tab/datatable.js b/src/sunstone/public/app/tabs/vnets-tab/datatable.js new file mode 100644 index 0000000000..e5b7a319c6 --- /dev/null +++ b/src/sunstone/public/app/tabs/vnets-tab/datatable.js @@ -0,0 +1,97 @@ +define(function(require) { + /* + DEPENDENCIES + */ + + var TabDataTable = require('utils/tab-datatable'); + var SunstoneConfig = require('sunstone-config'); + var Locale = require('utils/locale'); + var ProgressBar = require('utils/progress-bar'); + var Utils = require('./utils/common'); + + /* + CONSTANTS + */ + + var RESOURCE = "Network"; + var XML_ROOT = "VNET"; + var TAB_NAME = require('./tabId'); + + /* + CONSTRUCTOR + */ + + function Table(dataTableId, conf) { + this.conf = conf || {}; + this.tabId = TAB_NAME; + this.dataTableId = dataTableId; + this.resource = RESOURCE; + this.xmlRoot = XML_ROOT; + + this.dataTableOptions = { + "bAutoWidth": false, + "bSortClasses" : false, + "bDeferRender": true, + "aoColumnDefs": [ + {"bSortable": false, "aTargets": ["check"]}, + {"sWidth": "35px", "aTargets": [0]}, + {"bVisible": true, "aTargets": SunstoneConfig.tabTableColumns(TAB_NAME)}, + {"bVisible": false, "aTargets": ['_all']} + ] + } + + this.columns = [ + Locale.tr("ID"), + Locale.tr("Owner"), + Locale.tr("Group"), + Locale.tr("Name"), + Locale.tr("Reservation"), + Locale.tr("Cluster"), + Locale.tr("Bridge"), + Locale.tr("Leases"), + Locale.tr("VLAN ID") + ] + + TabDataTable.call(this); + }; + + Table.prototype = Object.create(TabDataTable.prototype); + Table.prototype.constructor = Table; + Table.prototype.elementArray = _elementArray; + + return Table; + + /* + FUNCTION DEFINITIONS + */ + + function _elementArray(element_json) { + var element = element_json[XML_ROOT]; + + // TODO: used by the dashboard + //addresses_vnets = addresses_vnets + parseInt(network.USED_LEASES); + + var total_size = 0; + + var arList = Utils.getARList(element); + + $.each(arList, function(){ + total_size += parseInt(this.SIZE); + }); + + return [ + '', + element.ID, + element.UNAME, + element.GNAME, + element.NAME, + element.PARENT_NETWORK_ID.length ? Locale.tr("Yes") : Locale.tr("No"), + element.CLUSTER.length ? element.CLUSTER : "-", + element.BRIDGE, + ProgressBar.html(element.USED_LEASES, total_size), + element.VLAN_ID.length ? element.VLAN_ID : "-" + ]; + } +}); diff --git a/src/sunstone/public/app/tabs/vnets-tab/dialogs/create.js b/src/sunstone/public/app/tabs/vnets-tab/dialogs/create.js new file mode 100644 index 0000000000..2ba27d292a --- /dev/null +++ b/src/sunstone/public/app/tabs/vnets-tab/dialogs/create.js @@ -0,0 +1,59 @@ +define(function(require) { + /* + DEPENDENCIES + */ + + var BaseDialog = require('utils/dialogs/dialog'); + var TemplateHTML = require('hbs!./create/html'); + var Sunstone = require('sunstone'); + + /* + CONSTANTS + */ + + var DIALOG_ID = require('./create/dialogId'); + + /* + CONSTRUCTOR + */ + + function Dialog() { + this.dialogId = DIALOG_ID; + BaseDialog.call(this); + }; + + Dialog.DIALOG_ID = DIALOG_ID; + Dialog.prototype = Object.create(BaseDialog.prototype); + Dialog.prototype.constructor = Dialog; + Dialog.prototype.html = _html; + Dialog.prototype.onShow = _onShow; + Dialog.prototype.setup = _setup; + + return Dialog; + + /* + FUNCTION DEFINITIONS + */ + + function _html() { + return TemplateHTML({dialogId: this.dialogId}); + } + + function _setup(dialog) { + $('#'+DIALOG_ID+'Form', dialog).submit(_submit); + return false; + } + + function _submit() { + var name = $('#zonename', this).val(); + var endpoint = $("#endpoint", this).val(); + var zoneJSON = {"zone" : {"name" : name, "endpoint" : endpoint}}; + Sunstone.runAction("Zone.create", zoneJSON); + return false; + } + + function _onShow(dialog) { + $("#zonename", dialog).focus(); + return false; + } +}); diff --git a/src/sunstone/public/app/tabs/vnets-tab/dialogs/create/dialogId.js b/src/sunstone/public/app/tabs/vnets-tab/dialogs/create/dialogId.js new file mode 100644 index 0000000000..e63d21c859 --- /dev/null +++ b/src/sunstone/public/app/tabs/vnets-tab/dialogs/create/dialogId.js @@ -0,0 +1,3 @@ +define(function(require){ + return 'createVNetDialog'; +}) \ No newline at end of file diff --git a/src/sunstone/public/app/tabs/vnets-tab/dialogs/create/html.hbs b/src/sunstone/public/app/tabs/vnets-tab/dialogs/create/html.hbs new file mode 100644 index 0000000000..0138955f4b --- /dev/null +++ b/src/sunstone/public/app/tabs/vnets-tab/dialogs/create/html.hbs @@ -0,0 +1,218 @@ +