From 4ca08f1a95e15bb8a28a2c6103e6f058fab489be Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 24 Apr 2015 13:41:41 +0200 Subject: [PATCH] feature #3748: Add resource attr --- src/sunstone/public/app/opennebula/acl.js | 1 + src/sunstone/public/app/opennebula/cluster.js | 1 + src/sunstone/public/app/opennebula/datastore.js | 1 + src/sunstone/public/app/opennebula/group.js | 3 ++- src/sunstone/public/app/opennebula/host.js | 1 + src/sunstone/public/app/opennebula/image.js | 1 + src/sunstone/public/app/opennebula/marketplace.js | 1 + src/sunstone/public/app/opennebula/network.js | 1 + src/sunstone/public/app/opennebula/role.js | 1 + src/sunstone/public/app/opennebula/service.js | 1 + src/sunstone/public/app/opennebula/servicetemplate.js | 1 + src/sunstone/public/app/opennebula/support.js | 1 + src/sunstone/public/app/opennebula/template.js | 1 + src/sunstone/public/app/opennebula/user.js | 3 ++- src/sunstone/public/app/opennebula/vdc.js | 1 + src/sunstone/public/app/opennebula/vm.js | 1 + src/sunstone/public/app/opennebula/zone.js | 1 + 17 files changed, 19 insertions(+), 2 deletions(-) diff --git a/src/sunstone/public/app/opennebula/acl.js b/src/sunstone/public/app/opennebula/acl.js index cedd537778..b61de12ace 100644 --- a/src/sunstone/public/app/opennebula/acl.js +++ b/src/sunstone/public/app/opennebula/acl.js @@ -4,6 +4,7 @@ define(function(require) { var RESOURCE = "ACL"; var Acl = { + "resource": RESOURCE, "create" : function(params) { OpenNebulaAction.create(params, RESOURCE); }, diff --git a/src/sunstone/public/app/opennebula/cluster.js b/src/sunstone/public/app/opennebula/cluster.js index 2ce636df7e..43598ced69 100644 --- a/src/sunstone/public/app/opennebula/cluster.js +++ b/src/sunstone/public/app/opennebula/cluster.js @@ -4,6 +4,7 @@ define(function(require) { var RESOURCE = "CLUSTER"; var Cluster = { + "resource": RESOURCE, "create" : function(params) { OpenNebulaAction.create(params, RESOURCE); }, diff --git a/src/sunstone/public/app/opennebula/datastore.js b/src/sunstone/public/app/opennebula/datastore.js index f693563c60..04e54aae3e 100644 --- a/src/sunstone/public/app/opennebula/datastore.js +++ b/src/sunstone/public/app/opennebula/datastore.js @@ -5,6 +5,7 @@ define(function(require) { var STATES = ["ON", "OFF"]; var Datastore = { + "resource": RESOURCE, "stateStr": function(stateId) { return STATES[stateId]; }, diff --git a/src/sunstone/public/app/opennebula/group.js b/src/sunstone/public/app/opennebula/group.js index d75e7f9212..5baa61bb94 100644 --- a/src/sunstone/public/app/opennebula/group.js +++ b/src/sunstone/public/app/opennebula/group.js @@ -6,6 +6,7 @@ define(function(require) { var RESOURCE = "GROUP"; var Group = { + "resource": RESOURCE, "create": function(params) { OpenNebulaAction.create(params, RESOURCE); }, @@ -26,7 +27,7 @@ define(function(require) { dataType: "json", success: function(response) { // Get the default group quotas - default_group_quotas = Quotas.default_quotas(response.GROUP_POOL.DEFAULT_GROUP_QUOTAS); + //TODO default_group_quotas = Quotas.default_quotas(response.GROUP_POOL.DEFAULT_GROUP_QUOTAS); var list = OpenNebulaHelper.pool(RESOURCE, response) var quotas_hash = OpenNebulaHelper.pool_hash_processing( diff --git a/src/sunstone/public/app/opennebula/host.js b/src/sunstone/public/app/opennebula/host.js index 02f0b9b525..5a15717c90 100644 --- a/src/sunstone/public/app/opennebula/host.js +++ b/src/sunstone/public/app/opennebula/host.js @@ -4,6 +4,7 @@ define(function(require) { var RESOURCE = "HOST"; var Host = { + "resource": RESOURCE, "create": function(params) { OpenNebulaAction.create(params, RESOURCE); }, diff --git a/src/sunstone/public/app/opennebula/image.js b/src/sunstone/public/app/opennebula/image.js index ffc1017b49..095f9150d9 100644 --- a/src/sunstone/public/app/opennebula/image.js +++ b/src/sunstone/public/app/opennebula/image.js @@ -4,6 +4,7 @@ define(function(require) { var RESOURCE = "IMAGE"; var Image = { + "resource": RESOURCE, "create": function(params) { OpenNebulaAction.create(params, RESOURCE); }, diff --git a/src/sunstone/public/app/opennebula/marketplace.js b/src/sunstone/public/app/opennebula/marketplace.js index 2db560c3d3..4781430618 100644 --- a/src/sunstone/public/app/opennebula/marketplace.js +++ b/src/sunstone/public/app/opennebula/marketplace.js @@ -5,6 +5,7 @@ define(function(require) { var RESOURCE = "MARKETPLACE"; var Marketplace = { + "resource": RESOURCE, "show" : function(params) { params.error = function() { return notifyError("Cannot connect to OpenNebula Marketplace") diff --git a/src/sunstone/public/app/opennebula/network.js b/src/sunstone/public/app/opennebula/network.js index 9c0b1883eb..5f16536c75 100644 --- a/src/sunstone/public/app/opennebula/network.js +++ b/src/sunstone/public/app/opennebula/network.js @@ -4,6 +4,7 @@ define(function(require) { var RESOURCE = "VNET"; var Network = { + "resource": RESOURCE, "create": function(params) { OpenNebulaAction.create(params, RESOURCE); }, diff --git a/src/sunstone/public/app/opennebula/role.js b/src/sunstone/public/app/opennebula/role.js index 6a4de612fa..85e1a72a56 100644 --- a/src/sunstone/public/app/opennebula/role.js +++ b/src/sunstone/public/app/opennebula/role.js @@ -18,6 +18,7 @@ define(function(require) { } var Role = { + "resource": RESOURCE, "state" : function(state_int) { state_int = state_int ? state_int : 0; var state = [ diff --git a/src/sunstone/public/app/opennebula/service.js b/src/sunstone/public/app/opennebula/service.js index a96ce8c303..4dafd16de0 100644 --- a/src/sunstone/public/app/opennebula/service.js +++ b/src/sunstone/public/app/opennebula/service.js @@ -6,6 +6,7 @@ define(function(require) { var CACHE_NAME = 'SERVICE' var Service = { + "resource": RESOURCE, "del": function(params) { params.cache_name = CACHE_NAME; OpenNebulaAction.del(params, RESOURCE, PATH); diff --git a/src/sunstone/public/app/opennebula/servicetemplate.js b/src/sunstone/public/app/opennebula/servicetemplate.js index aeb5f4ef77..b732608111 100644 --- a/src/sunstone/public/app/opennebula/servicetemplate.js +++ b/src/sunstone/public/app/opennebula/servicetemplate.js @@ -6,6 +6,7 @@ define(function(require) { var CACHE_NAME = CACHE_NAME; var ServiceTemplate = { + "resource": RESOURCE, "create": function(params) { params.cache_name = CACHE_NAME; OpenNebulaAction.create(params, RESOURCE, PATH); diff --git a/src/sunstone/public/app/opennebula/support.js b/src/sunstone/public/app/opennebula/support.js index 1d9af89b62..5454379224 100644 --- a/src/sunstone/public/app/opennebula/support.js +++ b/src/sunstone/public/app/opennebula/support.js @@ -6,6 +6,7 @@ define(function(require) { var CACHE_NAME = "REQUEST"; var Support = { + "resource": RESOURCE, "create": function(params) { OpenNebulaAction.create(params, RESOURCE, PATH); }, diff --git a/src/sunstone/public/app/opennebula/template.js b/src/sunstone/public/app/opennebula/template.js index ff3579dcce..ae9cf4e61f 100644 --- a/src/sunstone/public/app/opennebula/template.js +++ b/src/sunstone/public/app/opennebula/template.js @@ -4,6 +4,7 @@ define(function(require) { var RESOURCE = "TEMPLATE"; var Template = { + "resource": RESOURCE, "create" : function(params) { OpenNebulaAction.create(params, RESOURCE); }, diff --git a/src/sunstone/public/app/opennebula/user.js b/src/sunstone/public/app/opennebula/user.js index 73451341a5..add0e7f475 100644 --- a/src/sunstone/public/app/opennebula/user.js +++ b/src/sunstone/public/app/opennebula/user.js @@ -6,6 +6,7 @@ define(function(require) { var RESOURCE = "USER"; var User = { + "resource": RESOURCE, "create": function(params) { OpenNebulaAction.create(params, RESOURCE); }, @@ -25,7 +26,7 @@ define(function(require) { data: {timeout: timeout}, dataType: "json", success: function(response) { - default_user_quotas = Quotas.default_quotas(response.USER_POOL.DEFAULT_USER_QUOTAS); + //TODO default_user_quotas = Quotas.default_quotas(response.USER_POOL.DEFAULT_USER_QUOTAS); var list = OpenNebulaHelper.pool(RESOURCE, response) var quotas_hash = OpenNebulaHelper.pool_hash_processing( diff --git a/src/sunstone/public/app/opennebula/vdc.js b/src/sunstone/public/app/opennebula/vdc.js index f1281d8f3a..7f32b67b87 100644 --- a/src/sunstone/public/app/opennebula/vdc.js +++ b/src/sunstone/public/app/opennebula/vdc.js @@ -4,6 +4,7 @@ define(function(require) { var RESOURCE = "VDC"; var Vdc = { + "resource": RESOURCE, "create" : function(params) { OpenNebulaAction.create(params, RESOURCE); }, diff --git a/src/sunstone/public/app/opennebula/vm.js b/src/sunstone/public/app/opennebula/vm.js index 779d054533..5684a807ce 100644 --- a/src/sunstone/public/app/opennebula/vm.js +++ b/src/sunstone/public/app/opennebula/vm.js @@ -6,6 +6,7 @@ define(function(require) { var RESOURCE = "VM"; var VM = { + "resource": RESOURCE, "state": { "INIT" : 0, "PENDING" : 1, diff --git a/src/sunstone/public/app/opennebula/zone.js b/src/sunstone/public/app/opennebula/zone.js index 52e668e79b..43fe4431ba 100644 --- a/src/sunstone/public/app/opennebula/zone.js +++ b/src/sunstone/public/app/opennebula/zone.js @@ -4,6 +4,7 @@ define(function(require) { var RESOURCE = "ZONE"; var Zone = { + "resource": RESOURCE, "create" : function(params) { OpenNebulaAction.create(params, RESOURCE); },