diff --git a/src/sunstone/public/app/app.js b/src/sunstone/public/app/app.js
index bb11a19f05..7eaf01b426 100644
--- a/src/sunstone/public/app/app.js
+++ b/src/sunstone/public/app/app.js
@@ -6,6 +6,7 @@ define(function(require) {
var _tabs = [
require('tabs/system-tab'),
require('tabs/users-tab'),
+ require('tabs/groups-tab'),
require('tabs/vresources-tab'),
require('tabs/images-tab'),
require('tabs/infra-tab'),
diff --git a/src/sunstone/public/app/opennebula/group.js b/src/sunstone/public/app/opennebula/group.js
index 5baa61bb94..8eda253dfd 100644
--- a/src/sunstone/public/app/opennebula/group.js
+++ b/src/sunstone/public/app/opennebula/group.js
@@ -1,4 +1,7 @@
define(function(require) {
+
+ var Quota = require('utils/quota');
+
var OpenNebulaAction = require('./action');
var OpenNebulaHelper = require('./helper');
var OpenNebulaError = require('./error');
@@ -26,12 +29,24 @@ define(function(require) {
data: {timeout: timeout},
dataType: "json",
success: function(response) {
- // Get the default group quotas
- //TODO default_group_quotas = Quotas.default_quotas(response.GROUP_POOL.DEFAULT_GROUP_QUOTAS);
+ var list = OpenNebulaHelper.pool(RESOURCE, response);
- var list = OpenNebulaHelper.pool(RESOURCE, response)
+ Quota.setDefaultGroupQuotas(
+ Quota.default_quotas(response.GROUP_POOL.DEFAULT_GROUP_QUOTAS));
+
+ // Inject the VM quota. This info is returned separately in the
+ // pool info call, but the elementArray expects it inside the GROUP,
+ // as it is returned by the individual info call
var quotas_hash = OpenNebulaHelper.pool_hash_processing(
- 'GROUP_POOL', 'QUOTAS', response);
+ 'GROUP_POOL', 'QUOTAS', response);
+
+ $.each(list,function(){
+ var q = quotas_hash[this[RESOURCE].ID];
+
+ if (q != undefined) {
+ this[RESOURCE].VM_QUOTA = q.QUOTAS.VM_QUOTA;
+ }
+ });
return callback ?
callback(request, list, quotas_hash) : null;
diff --git a/src/sunstone/public/app/tabs/groups-tab.js b/src/sunstone/public/app/tabs/groups-tab.js
new file mode 100644
index 0000000000..d5199518ac
--- /dev/null
+++ b/src/sunstone/public/app/tabs/groups-tab.js
@@ -0,0 +1,36 @@
+define(function(require) {
+ var Locale = require('utils/locale');
+ var Buttons = require('./groups-tab/buttons');
+ var Actions = require('./groups-tab/actions');
+ var Table = require('./groups-tab/datatable');
+
+ var TAB_ID = require('./groups-tab/tabId');
+ var DATATABLE_ID = "dataTableGroups";
+
+ var _dialogs = [
+ ];
+
+ var _panels = [
+ require('./groups-tab/panels/info')
+ ];
+
+ var Tab = {
+ tabId: TAB_ID,
+ title: Locale.tr("Groups"),
+ tabClass: "subTab",
+ parentTab: "system-tab",
+ listHeader: ' '+Locale.tr("Groups"),
+ infoHeader: ' '+Locale.tr("Group"),
+ subheader: '\
+ '+Locale.tr("TOTAL")+' \
+ ',
+ resource: 'Group',
+ 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/groups-tab/actions.js b/src/sunstone/public/app/tabs/groups-tab/actions.js
new file mode 100644
index 0000000000..64f590ba41
--- /dev/null
+++ b/src/sunstone/public/app/tabs/groups-tab/actions.js
@@ -0,0 +1,166 @@
+define(function(require) {
+ var Sunstone = require('sunstone');
+ var Notifier = require('utils/notifier');
+ var Locale = require('utils/locale');
+ var DataTable = require('./datatable');
+ var OpenNebulaGroup = require('opennebula/group');
+
+ var TAB_ID = require('./tabId');
+ // TODO
+ //var CREATE_DIALOG_ID = require('./dialogs/create/dialogId');
+
+ var _actions = {
+ "Group.create" : {
+ type: "create",
+ call: OpenNebulaGroup.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
+ },
+
+ "Group.create_dialog" : {
+ type: "custom",
+ call: function() {
+ Sunstone.getDialog(CREATE_DIALOG_ID).show();
+ }
+ },
+
+ "Group.list" : {
+ type: "list",
+ call: OpenNebulaGroup.list,
+ callback: function(request, response) {
+ Sunstone.getDataTable(TAB_ID).updateView(request, response);
+ },
+ error: Notifier.onError
+ },
+
+ "Group.show" : {
+ type: "single",
+ call: OpenNebulaGroup.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
+ },
+
+ "Group.refresh" : {
+ type: "custom",
+ call: function() {
+ var tab = $('#' + TAB_ID);
+ if (Sunstone.rightInfoVisible(tab)) {
+ Sunstone.runAction("Group.show", Sunstone.rightInfoResourceId(tab));
+ } else {
+ Sunstone.getDataTable(TAB_ID).waitingNodes();
+ Sunstone.runAction("Group.list", {force: true});
+ }
+ },
+ error: Notifier.onError
+ },
+
+ "Group.update_template" : {
+ type: "single",
+ call: OpenNebulaGroup.update,
+ callback: function(request) {
+ Sunstone.runAction('Group.show',request.request.data[0][0]);
+ },
+ error: Notifier.onError
+ },
+
+ /* TODO
+ "Group.update_dialog" : {
+ type: "single",
+ call: initUpdateGroupDialog
+ },
+
+ "Group.show_to_update" : {
+ type: "single",
+ call: OpenNebula.Group.show,
+ callback: function(request, response) {
+ popUpUpdateGroupDialog(
+ response.GROUP,
+ $create_group_dialog);
+ },
+ error: onError
+ },
+ */
+
+ "Group.delete" : {
+ type: "multiple",
+ call : OpenNebulaGroup.del,
+ callback : function(request, response) {
+ Sunstone.getDataTable(TAB_ID).deleteElement(request, response);
+ },
+ elements: function() {
+ return Sunstone.getDataTable(TAB_ID).elements();
+ },
+ error: Notifier.onError,
+ },
+
+ /* TODO
+ "Group.fetch_quotas" : {
+ type: "single",
+ call: OpenNebula.Group.show,
+ callback: function (request,response) {
+ populateQuotasDialog(
+ response.GROUP,
+ default_group_quotas,
+ "#group_quotas_dialog",
+ $group_quotas_dialog);
+ },
+ error: onError
+ },
+
+ "Group.quotas_dialog" : {
+ type: "custom",
+ call: popUpGroupQuotasDialog
+ },
+
+ "Group.set_quota" : {
+ type: "multiple",
+ call: OpenNebula.Group.set_quota,
+ elements: groupElements,
+ callback: function(request,response) {
+ Sunstone.runAction('Group.show',request.request.data[0]);
+ },
+ error: onError
+ },
+
+ "Group.accounting" : {
+ type: "monitor",
+ call: OpenNebula.Group.accounting,
+ callback: function(req,response) {
+ var info = req.request.data[0].monitor;
+ //plot_graph(response,'#group_acct_tabTab','group_acct_', info);
+ },
+ error: onError
+ },
+
+ "Group.add_admin" : {
+ type: "single",
+ call : OpenNebula.Group.add_admin,
+ callback : function (req) {
+ Sunstone.runAction('Group.show',req.request.data[0][0]);
+ },
+ error : onError
+ },
+
+ "Group.del_admin" : {
+ type: "single",
+ call : OpenNebula.Group.del_admin,
+ callback : function (req) {
+ Sunstone.runAction('Group.show',req.request.data[0][0]);
+ },
+ error : onError
+ }
+ */
+ };
+
+ return _actions;
+})
diff --git a/src/sunstone/public/app/tabs/groups-tab/buttons.js b/src/sunstone/public/app/tabs/groups-tab/buttons.js
new file mode 100644
index 0000000000..6868a21984
--- /dev/null
+++ b/src/sunstone/public/app/tabs/groups-tab/buttons.js
@@ -0,0 +1,32 @@
+define(function(require) {
+ var Locale = require('utils/locale');
+
+ var Buttons = {
+ "Group.refresh" : {
+ type: "action",
+ layout: "refresh",
+ alwaysActive: true
+ },
+ "Group.create_dialog" : {
+ type: "create_dialog",
+ layout: "create"
+ },
+ "Group.update_dialog" : {
+ type : "action",
+ layout: "main",
+ text : Locale.tr("Update")
+ },
+ "Group.quotas_dialog" : {
+ type : "action",
+ text : Locale.tr("Quotas"),
+ layout: "main"
+ },
+ "Group.delete" : {
+ type: "confirm",
+ text: Locale.tr("Delete"),
+ layout: "del"
+ }
+ };
+
+ return Buttons;
+});
diff --git a/src/sunstone/public/app/tabs/groups-tab/datatable.js b/src/sunstone/public/app/tabs/groups-tab/datatable.js
new file mode 100644
index 0000000000..f67b8191c6
--- /dev/null
+++ b/src/sunstone/public/app/tabs/groups-tab/datatable.js
@@ -0,0 +1,123 @@
+define(function(require) {
+ /*
+ DEPENDENCIES
+ */
+
+ var TabDataTable = require('utils/tab-datatable');
+ var SunstoneConfig = require('sunstone-config');
+ var Locale = require('utils/locale');
+ var Quota = require('utils/quota');
+
+ /*
+ CONSTANTS
+ */
+
+ var RESOURCE = "Group";
+ var XML_ROOT = "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("Name"),
+ Locale.tr("Users"),
+ Locale.tr("VMs"),
+ Locale.tr("Memory"),
+ Locale.tr("CPU")
+ ];
+
+ this.selectOptions = {
+ "id_index": 1,
+ "name_index": 2,
+ "select_resource": Locale.tr("Please select a Group from the list"),
+ "you_selected": Locale.tr("You selected the following Group:"),
+ "select_resource_multiple": Locale.tr("Please select one or more groups from the list"),
+ "you_selected_multiple": Locale.tr("You selected the following 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];
+
+ var users_str = "0";
+
+ if (element.USERS.ID){
+ if ($.isArray(element.USERS.ID)){
+ users_str = element.USERS.ID.length;
+ } else {
+ users_str = "1";
+ }
+ }
+
+ var vms = '- ';
+ var memory = '- ';
+ var cpu = '- ';
+
+ var default_group_quotas = Quota.getDefaultGroupQuotas();
+
+ Quota.initEmptyQuotas(element);
+
+ if (!$.isEmptyObject(element.VM_QUOTA)){
+ vms = Quota.quotaBar(
+ element.VM_QUOTA.VM.VMS_USED,
+ element.VM_QUOTA.VM.VMS,
+ default_group_quotas.VM_QUOTA.VM.VMS);
+
+ memory = Quota.quotaBarMB(
+ element.VM_QUOTA.VM.MEMORY_USED,
+ element.VM_QUOTA.VM.MEMORY,
+ default_group_quotas.VM_QUOTA.VM.MEMORY);
+
+ cpu = Quota.quotaBarFloat(
+ element.VM_QUOTA.VM.CPU_USED,
+ element.VM_QUOTA.VM.CPU,
+ default_group_quotas.VM_QUOTA.VM.CPU);
+ }
+
+ return [
+ ' ',
+ element.ID,
+ element.NAME,
+ users_str,
+ vms,
+ memory,
+ cpu
+ ];
+ }
+});
diff --git a/src/sunstone/public/app/tabs/groups-tab/panels/info.js b/src/sunstone/public/app/tabs/groups-tab/panels/info.js
new file mode 100644
index 0000000000..0efc2286e8
--- /dev/null
+++ b/src/sunstone/public/app/tabs/groups-tab/panels/info.js
@@ -0,0 +1,139 @@
+define(function(require) {
+ /*
+ DEPENDENCIES
+ */
+
+ var TemplateInfo = require('hbs!./info/html');
+ var Locale = require('utils/locale');
+ var ViewsInfo = require('../utils/viewsInfo');
+ var Tips = require('utils/tips');
+
+ /*
+ TEMPLATES
+ */
+
+ var TemplateTable = require('utils/panel/template-table');
+
+ /*
+ CONSTANTS
+ */
+
+ var TAB_ID = require('../tabId');
+ var PANEL_ID = require('./info/panelId');
+ var RESOURCE = "Group";
+ var XML_ROOT = "GROUP";
+
+ /*
+ CONSTRUCTOR
+ */
+
+ function Panel(info) {
+ this.title = Locale.tr("Info");
+ this.icon = "fa-info-circle";
+
+ this.element = info[XML_ROOT];
+
+ return this;
+ }
+
+ Panel.PANEL_ID = PANEL_ID;
+ Panel.prototype.html = _html;
+ Panel.prototype.setup = _setup;
+
+ return Panel;
+
+ /*
+ FUNCTION DEFINITIONS
+ */
+
+ function _html() {
+ var adminViews = _processViews(
+ this.element.TEMPLATE.GROUP_ADMIN_VIEWS,
+ this.element.TEMPLATE.GROUP_ADMIN_DEFAULT_VIEW);
+
+ var userViews = _processViews(
+ this.element.TEMPLATE.SUNSTONE_VIEWS,
+ this.element.TEMPLATE.DEFAULT_VIEW);
+
+ // TODO: simplify interface?
+ var strippedTemplate = $.extend({}, this.element.TEMPLATE);
+ delete strippedTemplate["GROUP_ADMIN_VIEWS"];
+ delete strippedTemplate["SUNSTONE_VIEWS"];
+ delete strippedTemplate["GROUP_ADMIN_DEFAULT_VIEW"];
+ delete strippedTemplate["DEFAULT_VIEW"];
+
+ var templateTableHTML = TemplateTable.html(strippedTemplate, RESOURCE,
+ Locale.tr("Attributes"));
+ //====
+
+ return TemplateInfo({
+ 'element': this.element,
+ 'adminViews': adminViews,
+ 'userViews': userViews,
+ 'templateTableHTML': templateTableHTML
+ });
+ }
+
+ function _setup(context) {
+ var that = this;
+ Tips.setup(context);
+
+ // Template update
+ // TODO: simplify interface?
+ var hiddenKeys = [
+ "GROUP_ADMIN_VIEWS",
+ "SUNSTONE_VIEWS",
+ "GROUP_ADMIN_DEFAULT_VIEW",
+ "DEFAULT_VIEW"];
+
+ var strippedTemplate = $.extend({}, this.element.TEMPLATE);
+
+ $.each(hiddenKeys, function(i, key){
+ delete strippedTemplate[key];
+ });
+
+ var hiddenValues = {};
+
+ $.each(hiddenKeys, function(i, key){
+ if (that.element.TEMPLATE[key] != undefined){
+ hiddenValues[key] = that.element.TEMPLATE[key];
+ }
+ });
+
+ TemplateTable.setup(strippedTemplate, RESOURCE, this.element.ID, context, hiddenValues);
+ //===
+
+ return false;
+ }
+
+ function _processViews(viewsStr, defaultView){
+ var viewsArray = [];
+
+ if (viewsStr){
+ $.each(viewsStr.split(','), function(index, view){
+ var viewElem;
+
+ var knownView = ViewsInfo[view];
+ if (knownView){
+ viewElem = {
+ 'name': knownView.name,
+ 'description': knownView.description
+ };
+ } else {
+ viewElem = {
+ 'name': view,
+ 'description': ''
+ };
+ }
+
+ if (view == defaultView){
+ viewElem.name += ' (' + Locale.tr("default") + ')';
+ }
+
+ viewsArray.push(viewElem);
+ });
+ }
+
+ return viewsArray;
+ }
+});
diff --git a/src/sunstone/public/app/tabs/groups-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/groups-tab/panels/info/html.hbs
new file mode 100644
index 0000000000..388743f53a
--- /dev/null
+++ b/src/sunstone/public/app/tabs/groups-tab/panels/info/html.hbs
@@ -0,0 +1,66 @@
+
+
+
+
+
+ {{tr "Information"}}
+
+
+
+
+ {{tr "ID"}}
+ {{element.ID}}
+
+
+
+ {{tr "Name"}}
+ {{element.NAME}}
+
+
+
+
+
+
+
+ {{#if adminViews}}
+
+
+ {{tr "Group Admins Views"}}
+
+
+ {{#each adminViews}}
+
+
+ {{name}}
+ {{#if description}}
+ {{description}}
+ {{/if}}
+
+
+ {{/each}}
+ {{/if}}
+ {{#if userViews}}
+
+
+ {{tr "Group Users Views"}}
+
+
+ {{#each userViews}}
+
+
+ {{name}}
+ {{#if description}}
+ {{description}}
+ {{/if}}
+
+
+ {{/each}}
+ {{/if}}
+
+
+
+
+
+ {{{templateTableHTML}}}
+
+
\ No newline at end of file
diff --git a/src/sunstone/public/app/tabs/groups-tab/panels/info/panelId.js b/src/sunstone/public/app/tabs/groups-tab/panels/info/panelId.js
new file mode 100644
index 0000000000..01af73a338
--- /dev/null
+++ b/src/sunstone/public/app/tabs/groups-tab/panels/info/panelId.js
@@ -0,0 +1,3 @@
+define(function(require){
+ return 'group_info_tab';
+})
\ No newline at end of file
diff --git a/src/sunstone/public/app/tabs/groups-tab/tabId.js b/src/sunstone/public/app/tabs/groups-tab/tabId.js
new file mode 100644
index 0000000000..080c6fe355
--- /dev/null
+++ b/src/sunstone/public/app/tabs/groups-tab/tabId.js
@@ -0,0 +1,3 @@
+define(function(require){
+ return 'groups-tab';
+});
\ No newline at end of file
diff --git a/src/sunstone/public/app/tabs/groups-tab/utils/viewsInfo.js b/src/sunstone/public/app/tabs/groups-tab/utils/viewsInfo.js
new file mode 100644
index 0000000000..62a4d24a8a
--- /dev/null
+++ b/src/sunstone/public/app/tabs/groups-tab/utils/viewsInfo.js
@@ -0,0 +1,48 @@
+define(function(require) {
+ var Locale = require('utils/locale');
+
+ return {
+ admin : {
+ id: 'admin',
+ name: "Admin",
+ description: Locale.tr("This view provides full control of the cloud"),
+ type: "advanced"
+ },
+ user : {
+ id: 'user',
+ name: "User",
+ description: Locale.tr("In this view users will not be able to manage nor retrieve the hosts and clusters of the cloud. They will be able to see Datastores and Virtual Networks in order to use them when creating a new Image or Virtual Machine, but they will not be able to create new ones."),
+ type: "advanced"
+ },
+ groupadmin : {
+ id: 'groupadmin',
+ name: "Group Admin",
+ description: Locale.tr("This view provides control of all the resources belonging to a group, but with no access to resources outside that group, that is, restricted to the physical and virtual resources of the group. This view features the ability to create new users within the group as well as set and keep track of user quotas."),
+ type: "cloud"
+ },
+ cloud : {
+ id: 'cloud',
+ name: "Cloud",
+ description: Locale.tr("This is a simplified view mainly intended for user that just require a portal where they can provision new virtual machines easily from pre-defined Templates."),
+ type: "cloud"
+ },
+ admin_vcenter : {
+ id: 'admin_vcenter',
+ name: "Admin vCenter",
+ description: Locale.tr("View designed to present the valid operations against a vCenter infrastructure to a cloud administrator"),
+ type: "vcenter"
+ },
+ groupadmin_vcenter : {
+ id: 'groupadmin_vcenter',
+ name: "Group Admin vCenter",
+ description: Locale.tr("View designed to present the valid operations agaist a vCenter infrastructure to a group administrator"),
+ type: "vcenter"
+ },
+ cloud_vcenter : {
+ id: 'cloud_vcenter',
+ name: "Cloud vCenter",
+ description: Locale.tr("View designed to present the valid operations against a vCenter infrastructure to a cloud consumer"),
+ type: "vcenter"
+ }
+ };
+});
\ No newline at end of file
diff --git a/src/sunstone/public/app/utils/quota.js b/src/sunstone/public/app/utils/quota.js
index 9f386d9ecd..99f7bdd645 100644
--- a/src/sunstone/public/app/utils/quota.js
+++ b/src/sunstone/public/app/utils/quota.js
@@ -11,15 +11,24 @@ define(function(require) {
// The default quotas returned by the pool.list method are stored here
var _defaultUserQuotas;
+ var _defaultGroupQuotas;
function _setDefaultUserQuotas(defaultUserQuotas){
_defaultUserQuotas = defaultUserQuotas;
}
+ function _setDefaultGroupQuotas(defaultGroupQuotas){
+ _defaultGroupQuotas = defaultGroupQuotas;
+ }
+
function _getDefaultUserQuotas(defaultUserQuotas){
return _defaultUserQuotas;
}
+ function _getDefaultGroupQuotas(defaultGroupQuotas){
+ return _defaultGroupQuotas;
+ }
+
// Processes the default quotas as returned by OpenNebula, to be easier to
// use in Sunstone
function _default_quotas(default_quotas){
@@ -163,6 +172,8 @@ define(function(require) {
return {
'setDefaultUserQuotas': _setDefaultUserQuotas,
'getDefaultUserQuotas': _getDefaultUserQuotas,
+ 'setDefaultGroupQuotas': _setDefaultGroupQuotas,
+ 'getDefaultGroupQuotas': _getDefaultGroupQuotas,
'initEmptyQuotas': _initEmptyQuotas,
'default_quotas': _default_quotas,
'quotaBar': _quotaBar,