diff --git a/src/sunstone/public/app/app.js b/src/sunstone/public/app/app.js index 285be1b789..44cd31ef37 100644 --- a/src/sunstone/public/app/app.js +++ b/src/sunstone/public/app/app.js @@ -7,6 +7,7 @@ define(function(require) { require('tabs/system-tab'), require('tabs/users-tab'), require('tabs/groups-tab'), + require('tabs/vdcs-tab'), require('tabs/vresources-tab'), require('tabs/images-tab'), require('tabs/infra-tab'), diff --git a/src/sunstone/public/app/tabs/groups-tab/actions.js b/src/sunstone/public/app/tabs/groups-tab/actions.js index 07bd7b6430..bc02d6f9ef 100644 --- a/src/sunstone/public/app/tabs/groups-tab/actions.js +++ b/src/sunstone/public/app/tabs/groups-tab/actions.js @@ -3,8 +3,9 @@ define(function(require) { var Notifier = require('utils/notifier'); var Locale = require('utils/locale'); var DataTable = require('./datatable'); - var OpenNebulaGroup = require('opennebula/group'); + var OpenNebulaResource = require('opennebula/group'); + var RESOURCE = "Group"; var TAB_ID = require('./tabId'); // TODO //var CREATE_DIALOG_ID = require('./dialogs/create/dialogId'); @@ -12,7 +13,7 @@ define(function(require) { var _actions = { "Group.create" : { type: "create", - call: OpenNebulaGroup.create, + call: OpenNebulaResource.create, callback : function(request, response) { Sunstone.getDialog(CREATE_DIALOG_ID).hide(); Sunstone.getDialog(CREATE_DIALOG_ID).reset(); @@ -31,7 +32,7 @@ define(function(require) { "Group.list" : { type: "list", - call: OpenNebulaGroup.list, + call: OpenNebulaResource.list, callback: function(request, response) { Sunstone.getDataTable(TAB_ID).updateView(request, response); }, @@ -40,7 +41,7 @@ define(function(require) { "Group.show" : { type: "single", - call: OpenNebulaGroup.show, + call: OpenNebulaResource.show, callback: function(request, response) { Sunstone.getDataTable(TAB_ID).updateElement(request, response); if (Sunstone.rightInfoVisible($('#'+TAB_ID))) { @@ -55,10 +56,10 @@ define(function(require) { call: function() { var tab = $('#' + TAB_ID); if (Sunstone.rightInfoVisible(tab)) { - Sunstone.runAction("Group.show", Sunstone.rightInfoResourceId(tab)); + Sunstone.runAction(RESOURCE+".show", Sunstone.rightInfoResourceId(tab)); } else { Sunstone.getDataTable(TAB_ID).waitingNodes(); - Sunstone.runAction("Group.list", {force: true}); + Sunstone.runAction(RESOURCE+".list", {force: true}); } }, error: Notifier.onError @@ -66,9 +67,9 @@ define(function(require) { "Group.update_template" : { type: "single", - call: OpenNebulaGroup.update, + call: OpenNebulaResource.update, callback: function(request) { - Sunstone.runAction('Group.show',request.request.data[0][0]); + Sunstone.runAction(RESOURCE+'.show',request.request.data[0][0]); }, error: Notifier.onError }, @@ -93,7 +94,7 @@ define(function(require) { "Group.delete" : { type: "multiple", - call : OpenNebulaGroup.del, + call : OpenNebulaResource.del, callback : function(request, response) { Sunstone.getDataTable(TAB_ID).deleteElement(request, response); }, @@ -125,12 +126,12 @@ define(function(require) { "Group.set_quota" : { type: "multiple", - call: OpenNebulaGroup.set_quota, + call: OpenNebulaResource.set_quota, elements: function() { return Sunstone.getDataTable(TAB_ID).elements(); }, callback: function(request) { - Sunstone.runAction('Group.show',request.request.data[0]); + Sunstone.runAction(RESOURCE+'.show',request.request.data[0]); }, error: Notifier.onError }, @@ -148,18 +149,18 @@ define(function(require) { "Group.add_admin" : { type: "single", - call : OpenNebulaGroup.add_admin, + call : OpenNebulaResource.add_admin, callback : function (req) { - Sunstone.runAction('Group.show',req.request.data[0][0]); + Sunstone.runAction(RESOURCE+'.show',req.request.data[0][0]); }, error: Notifier.onError }, "Group.del_admin" : { type: "single", - call : OpenNebulaGroup.del_admin, + call : OpenNebulaResource.del_admin, callback : function (req) { - Sunstone.runAction('Group.show',req.request.data[0][0]); + Sunstone.runAction(RESOURCE+'.show',req.request.data[0][0]); }, error: Notifier.onError } diff --git a/src/sunstone/public/app/tabs/users-tab/actions.js b/src/sunstone/public/app/tabs/users-tab/actions.js index aa60f12484..05631b962c 100644 --- a/src/sunstone/public/app/tabs/users-tab/actions.js +++ b/src/sunstone/public/app/tabs/users-tab/actions.js @@ -3,8 +3,9 @@ define(function(require) { var Notifier = require('utils/notifier'); var Locale = require('utils/locale'); var DataTable = require('./datatable'); - var OpenNebulaUser = require('opennebula/user'); + var OpenNebulaResource = require('opennebula/user'); + var RESOURCE = "User"; var TAB_ID = require('./tabId'); // TODO //var CREATE_DIALOG_ID = require('./dialogs/create/dialogId'); @@ -12,7 +13,7 @@ define(function(require) { var _actions = { "User.create" : { type: "create", - call: OpenNebulaUser.create, + call: OpenNebulaResource.create, callback : function(request, response) { Sunstone.getDialog(CREATE_DIALOG_ID).hide(); Sunstone.getDialog(CREATE_DIALOG_ID).reset(); @@ -31,7 +32,7 @@ define(function(require) { "User.list" : { type: "list", - call: OpenNebulaUser.list, + call: OpenNebulaResource.list, callback: function(request, response) { Sunstone.getDataTable(TAB_ID).updateView(request, response); }, @@ -43,10 +44,10 @@ define(function(require) { call: function() { var tab = $('#' + TAB_ID); if (Sunstone.rightInfoVisible(tab)) { - Sunstone.runAction("User.show", Sunstone.rightInfoResourceId(tab)); + Sunstone.runAction(RESOURCE+".show", Sunstone.rightInfoResourceId(tab)); } else { Sunstone.getDataTable(TAB_ID).waitingNodes(); - Sunstone.runAction("User.list", {force: true}); + Sunstone.runAction(RESOURCE+".list", {force: true}); } }, error: Notifier.onError @@ -60,16 +61,16 @@ define(function(require) { "User.passwd" : { type: "multiple", - call: OpenNebulaUser.passwd, + call: OpenNebulaResource.passwd, elements: userElements, error: onError }, */ "User.chgrp" : { type: "multiple", - call: OpenNebulaUser.chgrp, + call: OpenNebulaResource.chgrp, callback : function(req){ - Sunstone.runAction("User.show",req.request.data[0][0]); + Sunstone.runAction(RESOURCE+".show",req.request.data[0][0]); }, elements: function() { return Sunstone.getDataTable(TAB_ID).elements(); @@ -79,18 +80,18 @@ define(function(require) { /* TODO "User.addgroup" : { type: "multiple", - call: OpenNebulaUser.addgroup, + call: OpenNebulaResource.addgroup, callback : function(req){ - Sunstone.runAction("User.show",req.request.data[0][0]); + Sunstone.runAction(RESOURCE+".show",req.request.data[0][0]); }, elements : userElements, error: onError }, "User.delgroup" : { type: "multiple", - call: OpenNebulaUser.delgroup, + call: OpenNebulaResource.delgroup, callback : function(req){ - Sunstone.runAction("User.show",req.request.data[0][0]); + Sunstone.runAction(RESOURCE+".show",req.request.data[0][0]); }, elements : userElements, error: onError @@ -101,9 +102,9 @@ define(function(require) { }, "User.chauth" : { type: "multiple", - call: OpenNebulaUser.chauth, + call: OpenNebulaResource.chauth, callback : function(req){ - Sunstone.runAction("User.show",req.request.data[0][0]); + Sunstone.runAction(RESOURCE+".show",req.request.data[0][0]); }, elements: userElements, error: onError @@ -111,7 +112,7 @@ define(function(require) { */ "User.show" : { type: "single", - call: OpenNebulaUser.show, + call: OpenNebulaResource.show, callback: function(request, response) { Sunstone.getDataTable(TAB_ID).updateElement(request, response); if (Sunstone.rightInfoVisible($('#'+TAB_ID))) { @@ -123,7 +124,7 @@ define(function(require) { "User.delete" : { type: "multiple", - call : OpenNebulaUser.del, + call : OpenNebulaResource.del, callback : function(request, response) { Sunstone.getDataTable(TAB_ID).deleteElement(request, response); }, @@ -135,9 +136,9 @@ define(function(require) { "User.update_template" : { type: "single", - call: OpenNebulaUser.update, + call: OpenNebulaResource.update, callback: function(request) { - Sunstone.runAction('User.show',request.request.data[0][0]); + Sunstone.runAction(RESOURCE+'.show',request.request.data[0][0]); }, error: Notifier.onError }, @@ -146,7 +147,7 @@ define(function(require) { "User.fetch_quotas" : { type: "single", - call: OpenNebulaUser.show, + call: OpenNebulaResource.show, callback: function (request,response) { populateQuotasDialog( response.USER, @@ -165,19 +166,19 @@ define(function(require) { "User.set_quota" : { type: "multiple", - call: OpenNebulaUser.set_quota, + call: OpenNebulaResource.set_quota, elements: function() { return Sunstone.getDataTable(TAB_ID).elements(); }, callback: function(request) { - Sunstone.runAction('User.show',request.request.data[0]); + Sunstone.runAction(RESOURCE+'.show',request.request.data[0]); }, error: Notifier.onError }, /* TODO "User.accounting" : { type: "monitor", - call: OpenNebulaUser.accounting, + call: OpenNebulaResource.accounting, callback: function(req,response) { var info = req.request.data[0].monitor; plot_graph(response,'#user_acct_tab','user_acct_', info); diff --git a/src/sunstone/public/app/tabs/vdcs-tab.js b/src/sunstone/public/app/tabs/vdcs-tab.js new file mode 100644 index 0000000000..de96dee645 --- /dev/null +++ b/src/sunstone/public/app/tabs/vdcs-tab.js @@ -0,0 +1,36 @@ +define(function(require) { + var Locale = require('utils/locale'); + var Buttons = require('./vdcs-tab/buttons'); + var Actions = require('./vdcs-tab/actions'); + var Table = require('./vdcs-tab/datatable'); + + var TAB_ID = require('./vdcs-tab/tabId'); + var DATATABLE_ID = "dataTableVDCs"; + + var _dialogs = [ + ]; + + var _panels = [ + //require('./vdcs-tab/panels/info') + ]; + + var Tab = { + tabId: TAB_ID, + title: Locale.tr("VDCs"), + tabClass: "subTab", + parentTab: "system-tab", + listHeader: ' '+Locale.tr("Virtual Data Centers"), + infoHeader: ' '+Locale.tr("Virtual Data Center"), + subheader: '\ + '+Locale.tr("TOTAL")+'\ + ', + resource: 'Vdc', + buttons: Buttons, + actions: Actions, + dataTable: new Table(DATATABLE_ID, {actions: true, info: true}), + panels: _panels, + dialogs: _dialogs + }; + + return Tab; +}); diff --git a/src/sunstone/public/app/tabs/vdcs-tab/actions.js b/src/sunstone/public/app/tabs/vdcs-tab/actions.js new file mode 100644 index 0000000000..4f90a67131 --- /dev/null +++ b/src/sunstone/public/app/tabs/vdcs-tab/actions.js @@ -0,0 +1,306 @@ +define(function(require) { + var Sunstone = require('sunstone'); + var Notifier = require('utils/notifier'); + var Locale = require('utils/locale'); + var DataTable = require('./datatable'); + var OpenNebulaResource = require('opennebula/vdc'); + + var RESOURCE = "Vdc"; + var TAB_ID = require('./tabId'); + // TODO + //var CREATE_DIALOG_ID = require('./dialogs/create/dialogId'); + + var _actions = { + + /* TODO + "Vdc.create" : { + type: "create", + call: OpenNebulaResource.create, + callback: function(request, response) { + $("a[href=back]", $("#vdcs-tab")).trigger("click"); + popFormDialog("create_vdc_form", $("#vdcs-tab")); + + var group_ids = request.request.data[0].group_ids; + $.each(group_ids,function(){ + Sunstone.runAction(RESOURCE+".add_group", + response.VDC.ID, + { group_id : parseInt(this)}); + }); + + var clusters = request.request.data[0].clusters; + $.each(clusters,function(){ + Sunstone.runAction(RESOURCE+".add_cluster", + response.VDC.ID, + this); + }); + + var hosts = request.request.data[0].hosts; + $.each(hosts,function(){ + Sunstone.runAction(RESOURCE+".add_host", + response.VDC.ID, + this); + }); + + var vnets = request.request.data[0].vnets; + $.each(vnets,function(){ + Sunstone.runAction(RESOURCE+".add_vnet", + response.VDC.ID, + this); + }); + + var datastores = request.request.data[0].datastores; + $.each(datastores,function(){ + Sunstone.runAction(RESOURCE+".add_datastore", + response.VDC.ID, + this); + }); + + // TODO: this vdc.show may get the information before the add/del + // actions end, showing "outdated" information + + Sunstone.runAction(RESOURCE+'.show',request.request.data[0][0]); + + addVdcElement(request, response); + notifyCustom(tr("VDC created"), " ID: " + response.VDC.ID, false); + }, + error: Notifier.onError + }, + + "Vdc.create_dialog" : { + type: "custom", + call: function(){ + Sunstone.popUpFormPanel("create_vdc_form", "vdcs-tab", "create", true, function(context){ + refreshGroupTableSelect(context, "vdc_wizard_groups"); + + var zone_ids = []; + + OpenNebula.Zone.list({ + timeout: true, + success: function (request, obj_list){ + $.each(obj_list,function(){ + zone_ids.push(this.ZONE.ID); + + addVdcResourceTab( + "vdc_create_wizard", + this.ZONE.ID, + this.ZONE.NAME, + $("#vdcCreateResourcesTab",context)); + }); + + setupVdcResourceTab("vdc_create_wizard", + $("#vdcCreateResourcesTab",context)); + + context.data("zone_ids", zone_ids); + }, + error: Notifier.onError + }); + + $("input#name",context).focus(); + }); + } + }, + */ + "Vdc.list" : { + type: "list", + call: OpenNebulaResource.list, + callback: function(request, response) { + Sunstone.getDataTable(TAB_ID).updateView(request, response); + }, + error: Notifier.onError + }, + + "Vdc.show" : { + type: "single", + call: OpenNebulaResource.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 + }, + + "Vdc.refresh" : { + type: "custom", + call: function() { + var tab = $('#' + TAB_ID); + if (Sunstone.rightInfoVisible(tab)) { + Sunstone.runAction(RESOURCE+".show", Sunstone.rightInfoResourceId(tab)); + } else { + Sunstone.getDataTable(TAB_ID).waitingNodes(); + Sunstone.runAction(RESOURCE+".list", {force: true}); + } + }, + error: Notifier.onError + }, + + "Vdc.delete" : { + type: "multiple", + call: OpenNebulaResource.del, + callback : function(request, response) { + Sunstone.getDataTable(TAB_ID).deleteElement(request, response); + }, + elements: function() { + return Sunstone.getDataTable(TAB_ID).elements(); + }, + error: Notifier.onError + }, + + "Vdc.rename" : { + type: "single", + call: OpenNebulaResource.rename, + callback: function(request) { + Sunstone.runAction(RESOURCE+'.show',request.request.data[0][0]); + }, + error: Notifier.onError + }, + /* TODO + "Vdc.update_dialog" : { + type: "custom", + call: function(){ + var selected_nodes = getSelectedNodes(dataTable_vdcs); + if ( selected_nodes.length != 1 ) { + notifyMessage("Please select one (and just one) VDC to update."); + return false; + } + + var resource_id = ""+selected_nodes[0]; + Sunstone.runAction(RESOURCE+".show_to_update", resource_id); + } + }, + + "Vdc.show_to_update" : { + type: "single", + call: OpenNebulaResource.show, + callback: function(request, response) { + // TODO: global var, better use jquery .data + vdc_to_update_id = response.VDC.ID; + + Sunstone.popUpFormPanel("create_vdc_form", "vdcs-tab", "update", true, function(context){ + fillVdcUpdateFormPanel(response.VDC, context); + }); + }, + error: Notifier.onError + }, + + "Vdc.update" : { + type: "single", + call: OpenNebulaResource.update, + callback: function(request, response){ + $("a[href=back]", $("#vdcs-tab")).trigger("click"); + popFormDialog("create_vdc_form", $("#vdcs-tab")); + + notifyMessage(tr("VDC updated correctly")); + }, + error: function(request, response){ + popFormDialog("create_vdc_form", $("#vdcs-tab")); + + onError(request, response); + } + }, + */ + + "Vdc.update_template" : { + type: "single", + call: OpenNebulaResource.update, + callback: function(request) { + Sunstone.runAction(RESOURCE+'.show',request.request.data[0][0]); + }, + error: Notifier.onError + }, + /* TODO + "Vdc.add_group" : { + type: "single", + call : OpenNebulaResource.add_group, + callback : function (req) { + //Sunstone.runAction(RESOURCE+'.show',req.request.data[0][0]); + }, + error : Notifier.onError + }, + + "Vdc.del_group" : { + type: "single", + call : OpenNebulaResource.del_group, + callback : function (req) { + //Sunstone.runAction(RESOURCE+'.show',req.request.data[0][0]); + }, + error : Notifier.onError + }, + + "Vdc.add_cluster" : { + type: "single", + call : OpenNebulaResource.add_cluster, + callback : function (req) { + //Sunstone.runAction(RESOURCE+'.show',req.request.data[0][0]); + }, + error : Notifier.onError + }, + + "Vdc.del_cluster" : { + type: "single", + call : OpenNebulaResource.del_cluster, + callback : function (req) { + //Sunstone.runAction(RESOURCE+'.show',req.request.data[0][0]); + }, + error : Notifier.onError + }, + + "Vdc.add_host" : { + type: "single", + call : OpenNebulaResource.add_host, + callback : function (req) { + //Sunstone.runAction(RESOURCE+'.show',req.request.data[0][0]); + }, + error : Notifier.onError + }, + + "Vdc.del_host" : { + type: "single", + call : OpenNebulaResource.del_host, + callback : function (req) { + //Sunstone.runAction(RESOURCE+'.show',req.request.data[0][0]); + }, + error : Notifier.onError + }, + + "Vdc.add_vnet" : { + type: "single", + call : OpenNebulaResource.add_vnet, + callback : function (req) { + //Sunstone.runAction(RESOURCE+'.show',req.request.data[0][0]); + }, + error : Notifier.onError + }, + + "Vdc.del_vnet" : { + type: "single", + call : OpenNebulaResource.del_vnet, + callback : function (req) { + //Sunstone.runAction(RESOURCE+'.show',req.request.data[0][0]); + }, + error : Notifier.onError + }, + + "Vdc.add_datastore" : { + type: "single", + call : OpenNebulaResource.add_datastore, + callback : function (req) { + //Sunstone.runAction(RESOURCE+'.show',req.request.data[0][0]); + }, + error : Notifier.onError + }, + + "Vdc.del_datastore" : { + type: "single", + call : OpenNebulaResource.del_datastore, + callback : function (req) { + //Sunstone.runAction(RESOURCE+'.show',req.request.data[0][0]); + }, + error : Notifier.onError + } + */ + }; + + return _actions; +}) diff --git a/src/sunstone/public/app/tabs/vdcs-tab/buttons.js b/src/sunstone/public/app/tabs/vdcs-tab/buttons.js new file mode 100644 index 0000000000..ab9dc3d138 --- /dev/null +++ b/src/sunstone/public/app/tabs/vdcs-tab/buttons.js @@ -0,0 +1,27 @@ +define(function(require) { + var Locale = require('utils/locale'); + + var Buttons = { + "Vdc.refresh" : { + type: "action", + layout: "refresh", + alwaysActive: true + }, + "Vdc.create_dialog" : { + type: "create_dialog", + layout: "create" + }, + "Vdc.update_dialog" : { + type: "action", + layout: "main", + text: Locale.tr("Update") + }, + "Vdc.delete" : { + type: "confirm", + layout: "del", + text: Locale.tr("Delete") + } + }; + + return Buttons; +}); diff --git a/src/sunstone/public/app/tabs/vdcs-tab/datatable.js b/src/sunstone/public/app/tabs/vdcs-tab/datatable.js new file mode 100644 index 0000000000..2dbeaf8ecb --- /dev/null +++ b/src/sunstone/public/app/tabs/vdcs-tab/datatable.js @@ -0,0 +1,99 @@ +define(function(require) { + /* + DEPENDENCIES + */ + + var TabDataTable = require('utils/tab-datatable'); + var Config = require('sunstone-config'); + var Locale = require('utils/locale'); + + /* + CONSTANTS + */ + + var RESOURCE = "Vdc"; + var XML_ROOT = "VDC"; + 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": Config.tabTableColumns(TAB_NAME)}, + { "bVisible": false, "aTargets": ['_all']} + ] + }; + + this.columns = [ + Locale.tr("ID"), + Locale.tr("Name"), + Locale.tr("Groups"), + Locale.tr("Clusters"), + Locale.tr("Hosts"), + Locale.tr("VNets"), + Locale.tr("Datastores") + ]; + + this.selectOptions = { + "id_index": 1, + "name_index": 2, + "select_resource": Locale.tr("Please select a VDC from the list"), + "you_selected": Locale.tr("You selected the following VDC:"), + "select_resource_multiple": Locale.tr("Please select one or more VDCs from the list"), + "you_selected_multiple": Locale.tr("You selected the following VDCs:") + }; + + 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.NAME, + _lengthOf(element.GROUPS.ID), + _lengthOf(element.CLUSTERS.CLUSTER), + _lengthOf(element.HOSTS.HOST), + _lengthOf(element.VNETS.VNET), + _lengthOf(element.DATASTORES.DATASTORE) + ]; + } + + function _lengthOf(ids){ + var l = 0; + if ($.isArray(ids)) + l = ids.length; + else if (!$.isEmptyObject(ids)) + l = 1; + + return l; + } +}); diff --git a/src/sunstone/public/app/tabs/vdcs-tab/tabId.js b/src/sunstone/public/app/tabs/vdcs-tab/tabId.js new file mode 100644 index 0000000000..d528e4dbfe --- /dev/null +++ b/src/sunstone/public/app/tabs/vdcs-tab/tabId.js @@ -0,0 +1,3 @@ +define(function(require){ + return 'vdcs-tab'; +}); \ No newline at end of file