mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-18 02:42:54 +09:00
Bug #1336: Fix elements being removed from their current cluster.
(cherry picked from commit d12d3e1401ac280c4bf44589a1f6e43b6c998c31)
This commit is contained in:
1 parent
a9c767c4e9
commit
30a66569ed
4 files changed
+40
-10
No files matched your search
@@ -127,10 +127,9 @@ var cluster_actions = {
|
||||
type: "single",
|
||||
call : OpenNebula.Cluster.delhost,
|
||||
callback : function (req) {
|
||||
//Sunstone.runAction("Cluster.show",req.request.data[0]);
|
||||
Sunstone.runAction("Host.show",req.request.data[0][1].host_id);
|
||||
},
|
||||
error : onError,
|
||||
notify: true
|
||||
error : onError
|
||||
},
|
||||
|
||||
"Cluster.adddatastore" : {
|
||||
@@ -138,7 +137,6 @@ var cluster_actions = {
|
||||
call : OpenNebula.Cluster.adddatastore,
|
||||
callback : function (req) {
|
||||
Sunstone.runAction("Datastore.show",req.request.data[0][1].ds_id);
|
||||
//Sunstone.runAction("Cluster.show",req.request.data[0]);
|
||||
},
|
||||
error : onError,
|
||||
},
|
||||
@@ -147,7 +145,7 @@ var cluster_actions = {
|
||||
type: "single",
|
||||
call : OpenNebula.Cluster.deldatastore,
|
||||
callback : function (req) {
|
||||
//Sunstone.runAction("Cluster.show",req.request.data[0]);
|
||||
Sunstone.runAction("Datastore.show",req.request.data[0][1].ds_id);
|
||||
},
|
||||
error : onError,
|
||||
},
|
||||
@@ -165,10 +163,9 @@ var cluster_actions = {
|
||||
type: "single",
|
||||
call : OpenNebula.Cluster.delvnet,
|
||||
callback : function (req) {
|
||||
//Sunstone.runAction("Cluster.show",req.request.data[0]);
|
||||
Sunstone.runAction("Network.show",req.request.data[0][1].vnet_id);
|
||||
},
|
||||
error : onError,
|
||||
notify: true
|
||||
},
|
||||
|
||||
"Cluster.delete" : {
|
||||
|
||||
@@ -270,7 +270,18 @@ var datastore_actions = {
|
||||
call: function(params){
|
||||
var cluster = params.data.extra_param;
|
||||
var ds = params.data.id;
|
||||
Sunstone.runAction("Cluster.adddatastore",cluster,ds);
|
||||
|
||||
if (cluster == -1){
|
||||
//get cluster name
|
||||
var current_cluster = getValue(ds,1,5,dataTable_datastores);
|
||||
//get cluster id
|
||||
current_cluster = getValue(current_cluster,
|
||||
2,1,dataTable_clusters);
|
||||
if (!current_cluster) return;
|
||||
Sunstone.runAction("Cluster.deldatastore",current_cluster,ds)
|
||||
}
|
||||
else
|
||||
Sunstone.runAction("Cluster.adddatastore",cluster,ds);
|
||||
},
|
||||
elements: datastoreElements,
|
||||
notify:true,
|
||||
|
||||
@@ -275,7 +275,18 @@ var host_actions = {
|
||||
call: function(params){
|
||||
var cluster = params.data.extra_param;
|
||||
var host = params.data.id;
|
||||
Sunstone.runAction("Cluster.addhost",cluster,host);
|
||||
|
||||
if (cluster == -1){
|
||||
//get cluster name
|
||||
var current_cluster = getValue(host,1,3,dataTable_hosts);
|
||||
//get cluster id
|
||||
current_cluster = getValue(current_cluster,
|
||||
2,1,dataTable_clusters);
|
||||
if (!current_cluster) return;
|
||||
Sunstone.runAction("Cluster.delhost",current_cluster,host)
|
||||
}
|
||||
else
|
||||
Sunstone.runAction("Cluster.addhost",cluster,host);
|
||||
},
|
||||
callback: null,
|
||||
elements: hostElements,
|
||||
|
||||
@@ -394,7 +394,18 @@ var vnet_actions = {
|
||||
call: function(params){
|
||||
var cluster = params.data.extra_param;
|
||||
var vnet = params.data.id;
|
||||
Sunstone.runAction("Cluster.addvnet",cluster,vnet);
|
||||
|
||||
if (cluster == -1){
|
||||
//get cluster name
|
||||
var current_cluster = getValue(vnet,1,5,dataTable_vNetworks);
|
||||
//get cluster id
|
||||
current_cluster = getValue(current_cluster,
|
||||
2,1,dataTable_clusters);
|
||||
if (!current_cluster) return;
|
||||
Sunstone.runAction("Cluster.delvnet",current_cluster,vnet)
|
||||
}
|
||||
else
|
||||
Sunstone.runAction("Cluster.addvnet",cluster,vnet);
|
||||
},
|
||||
callback: null,
|
||||
elements: vnElements,
|
||||
|
||||
Reference in new issue
Block a user