B #4502: Fix service scale action (#4518)

This commit is contained in:
Sergio Betanzos authored and GitHub committed 2020-04-14 11:18:50 +02:00
1 parent 8992e9248b
commit ec183f2b4e
5 files changed
+65 -9

No files matched your search

+20 -1
View File
@@ -183,7 +183,26 @@ define(function(require) {
return params.error ? params.error(request, OpenNebulaError(response)) : null;
}
});
}
},
"scale" : function(params) {
var request = OpenNebulaHelper.request(RESOURCE, "scale", params.data.id);
$.ajax({
url: PATH + "/" + String(params.data.id) + "/scale",
type: "POST",
dataType: "json",
contentType: "application/json; charset=utf-8",
data: JSON.stringify(params.data.extra_param),
success: function(response) {
return params.success ? params.success(request, response) : null;
},
error: function(response) {
response.status === 201
? params.success ? params.success(request, response) : null
: params.error ? params.error(request, OpenNebulaError(response)) : null;
}
});
},
}
return Role;
@@ -34,6 +34,19 @@ define(function(require) {
var _commonActions = new CommonActions(OpenNebulaResource, RESOURCE, TAB_ID,
XML_ROOT, Locale.tr("Service created"));
function roleElement() {
var selected = {};
var dataTable = $('table[id^=datatable_roles]', '#'+TAB_ID+' #'+ROLES_PANEL_ID);
var nodes = $('tbody input.check_item:checked', dataTable);
$.each(nodes, function() {
selected["serviceId"] = $(this).data("id");
selected["roleName"] = $(this).data("name");
});
return selected;
}
function roleElements() {
var selected_nodes = [];
@@ -118,18 +131,31 @@ define(function(require) {
"Role.scale_dialog" : {
type: "custom",
call: function(){
selected = roleElements();
params = roleElement();
if(selected.length == 0){
if(!params.serviceId || !params.roleName) {
Notifier.onError("Select one role");
return;
}
Sunstone.getDialog(SCALE_DIALOG_ID).setParams({roleIds: selected});
Sunstone.getDialog(SCALE_DIALOG_ID).setParams(params);
Sunstone.getDialog(SCALE_DIALOG_ID).reset();
Sunstone.getDialog(SCALE_DIALOG_ID).show();
}
},
"Role.scale" : {
type: "single",
call: OpenNebulaRole.scale,
callback : function() {
Sunstone.getDialog(SCALE_DIALOG_ID).hide();
roleCallback();
},
error: function(request, response) {
Sunstone.getDialog(SCALE_DIALOG_ID).hide();
Notifier.onError(request, response);
},
notify: true
},
"Role.update" : {
type: "multiple",
call: OpenNebulaRole.update,
@@ -85,9 +85,10 @@ define(function(require) {
var obj = {
"force": force,
"cardinality": $("#cardinality", context).val(),
"role_name": that.roleName,
};
Sunstone.runAction('Role.update', that.roleIds, obj);
Sunstone.runAction('Role.scale', that.serviceId, obj);
return false;
})
@@ -102,9 +103,11 @@ define(function(require) {
/**
* @param {object} params
* - params.roleIds : Array of selected role IDs
* - params.serviceId : selected service ID
* - params.roleName : selected role name
*/
function _setParams(params) {
this.roleIds = params.roleIds;
this.serviceId = params.serviceId;
this.roleName = params.roleName;
}
});
@@ -58,7 +58,7 @@
{{#each roleList}}
<tr>
<td hidden>
<input class="check_item" type="checkbox" id="role_{{name}}" name="selected_items" value="{{../element.ID}}/role/{{name}}"/>
<input class="check_item" type="checkbox" id="role_{{name}}" name="selected_items" data-id="{{../element.ID}}" data-name="{{name}}" value="{{../element.ID}}/role/{{name}}"/>
</td>
<td>{{name}}</td>
{{#if ../servicePanel}}
+8
View File
@@ -80,6 +80,14 @@ post '/service/:id/action' do
af_format_response(resp)
end
post '/service/:id/scale' do
client = af_build_client
resp = client.post('/service/' + params[:id] + '/scale', @request_body)
af_format_response(resp)
end
post '/service/:id/role/:role_name/action' do
client = af_build_client