1
0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-22 13:33:52 +03:00

F #5118 Allow SCHEDULED ACTIONS in VM Templates (#469)

This commit is contained in:
Abel Coronado 2017-09-13 09:53:12 +02:00 committed by Ruben S. Montero
parent f1fbc5690a
commit baef40e24a
4 changed files with 208 additions and 54 deletions

View File

@ -26,6 +26,7 @@ define(function(require) {
var UniqueId = require('utils/unique-id');
var Humanize = require('utils/humanize');
var TemplateUtils = require('utils/template-utils');
var Actions = require('utils/actions');
var TemplateHTML = require('hbs!./actions/html');
/*
@ -123,7 +124,7 @@ define(function(require) {
$(this).parents('tr').remove();
$("#add_scheduling_temp_action", context).removeAttr("disabled");
$("#sched_temp_actions_body").append(fromJSONtoActionsTable(sched_action));
$("#sched_temp_actions_body").append(Actions.fromJSONtoActionsTable(sched_action));
return false;
});
@ -154,7 +155,7 @@ define(function(require) {
else if (index2 == 1){
var pretty_time = $(this).text();
pretty_time = pretty_time.split(' ');
var date = convertDate(pretty_time[1]);
var date = Actions.convertDate(pretty_time[1]);
var time_value = date + ' ' + pretty_time[0];
var epoch_str = new Date(time_value);
var time = parseInt(epoch_str.getTime()) / 1000;
@ -170,55 +171,8 @@ define(function(require) {
}
function _fill(context, templateJSON) {
var actions = fromJSONtoActionsTable(templateJSON.SCHED_ACTION);
var actions = Actions.fromJSONtoActionsTable(templateJSON.SCHED_ACTION);
$("#sched_temp_actions_body").append(actions);
delete templateJSON['SCHED_ACTION'];
}
function fromJSONtoActionsTable(actions_array) {
var str = ""
if (!actions_array) {
return "";
}
if (!$.isArray(actions_array)) {
var tmp_array = new Array();
tmp_array[0] = actions_array;
actions_array = tmp_array;
}
if (!actions_array.length) {
return "";
}
$.each(actions_array, function(index, scheduling_action) {
str += fromJSONtoActionRow(scheduling_action);
});
return str;
}
function fromJSONtoActionRow(scheduling_action) {
var time_str = Humanize.prettyTime(scheduling_action.TIME);
var str = "";
str += '<tr class="tr_action">\
<td class="action_row">' + TemplateUtils.htmlEncode(scheduling_action.ACTION) + '</td>\
<td nowrap class="time_row">' + time_str + '</td>\
<td>\
<div>\
<a id="minus" class="remove_action_x" href="#"><i class="fa fa-trash-o"/></a>\
</div>\
</td>\
</tr>';
return str;
}
function convertDate(date_string){
date_string = date_string.split('/');
return date_string[2] + "-" + date_string[1] + "-" + date_string[0];
}
});

View File

@ -38,6 +38,10 @@ define(function(require) {
var Config = require('sunstone-config');
var HostsTable = require('tabs/hosts-tab/datatable');
var DatastoresTable = require('tabs/datastores-tab/datatable');
var Humanize = require('utils/humanize');
var TemplateUtils = require('utils/template-utils');
var UniqueId = require('utils/unique-id');
var Actions = require('utils/actions');
/*
CONSTANTS
@ -116,6 +120,77 @@ define(function(require) {
$("#vm_n_times_disabled", context).hide();
$("#vm_n_times", context).show();
}
context.off('click', '#add_scheduling_inst_action');
context.on('click', '#add_scheduling_inst_action', function() {
$("#add_scheduling_inst_action", context).attr("disabled", "disabled");
$("#scheduling_inst_actions_table").append('<tr>\
<td>\
<select id="select_new_action" class="select_new_action" name="select_action">\
<option value="terminate">' + Locale.tr("terminate") + '</option>\
<option value="terminate-hard">' + Locale.tr("terminate-hard") + '</option>\
<option value="hold">' + Locale.tr("hold") + '</option>\
<option value="release">' + Locale.tr("release") + '</option>\
<option value="stop">' + Locale.tr("stop") + '</option>\
<option value="suspend">' + Locale.tr("suspend") + '</option>\
<option value="resume">' + Locale.tr("resume") + '</option>\
<option value="reboot">' + Locale.tr("reboot") + '</option>\
<option value="reboot-hard">' + Locale.tr("reboot-hard") + '</option>\
<option value="poweroff">' + Locale.tr("poweroff") + '</option>\
<option value="poweroff-hard">' + Locale.tr("poweroff-hard") + '</option>\
<option value="undeploy">' + Locale.tr("undeploy") + '</option>\
<option value="undeploy-hard">' + Locale.tr("undeploy-hard") + '</option>\
<option value="snapshot-create">' + Locale.tr("snapshot-create") + '</option>\
</select>\
</td>\
<td>\
<input id="date_input" type="date" placeholder="2013/12/30"/>\
<input id="time_input" type="time" placeholder="12:30"/>\
</td>\
<td>\
<button id="add_inst_action_json" class="secondary small button radius" >' + Locale.tr("Add") + '</button>\
</td>\
<td colspan=2></td>\
</tr>');
return false;
});
context.off("click", "#add_inst_action_json");
context.on("click" , "#add_inst_action_json", function(){
var date_input_value = $("#date_input", context).val();
var time_input_value = $("#time_input", context).val();
if (date_input_value == "" || time_input_value == ""){
return false;
}
var time_value = date_input_value + ' ' + time_input_value;
var epoch_str = new Date(time_value);
var time = parseInt(epoch_str.getTime()) / 1000;
var new_action = $("#select_new_action", context).val();
var sched_action = {};
sched_action.ACTION = new_action;
sched_action.TIME = time;
$(this).parents('tr').remove();
$("#add_scheduling_inst_action", context).removeAttr("disabled");
$("#sched_inst_actions_body").append(Actions.fromJSONtoActionsTable(sched_action));
return false;
});
context.on("focusout" , "#time_input", function(){
$("#time_input").removeAttr("data-invalid");
$("#time_input").removeAttr("class");
});
context.off("click", ".remove_action_x");
context.on("click", ".remove_action_x", function(){
$(this).parents('tr').remove();
});
}
function _calculateCost(){
@ -245,6 +320,33 @@ define(function(require) {
}
}
var templateJSON = {};
var actionsJSON = [];
$("#scheduling_inst_actions_table tbody tr").each(function(index){
var first = $(this).children("td")[0];
if(!$('select', first).html()){
var actionJSON = {};
actionJSON.ID = index;
$(this).children("td").each(function(index2){
if(index2 == 0)
actionJSON.ACTION = $(this).text();
else if (index2 == 1){
var pretty_time = $(this).text();
pretty_time = pretty_time.split(' ');
var date = Actions.convertDate(pretty_time[1]);
var time_value = date + ' ' + pretty_time[0];
var epoch_str = new Date(time_value);
var time = parseInt(epoch_str.getTime()) / 1000;
actionJSON.TIME = time;
}
});
}
if (!$.isEmptyObject(actionJSON)) {actionsJSON.push(actionJSON)};
});
tmp_json['SCHED_ACTION'] = actionsJSON;
capacityContext = $(".capacityContext" + template_id, context);
$.extend(tmp_json, CapacityInputs.retrieveChanges(capacityContext));
@ -288,8 +390,8 @@ define(function(require) {
}
}
that.hostsTable = new HostsTable('HostsTable' + template_json.VMTEMPLATE.ID, options);
that.datastoresTable = new DatastoresTable('DatastoresTable' + template_json.VMTEMPLATE.ID, options);
that.hostsTable = new HostsTable('HostsTable' + UniqueId.id(), options);
that.datastoresTable = new DatastoresTable('DatastoresTable' + UniqueId.id(), options);
templatesContext.append(
TemplateRowHTML(
@ -302,6 +404,9 @@ define(function(require) {
$(".provision_host_selector" + template_json.VMTEMPLATE.ID, context).data("hostsTable", that.hostsTable);
$(".provision_ds_selector" + template_json.VMTEMPLATE.ID, context).data("dsTable", that.datastoresTable);
var actions = Actions.fromJSONtoActionsTable(template_json.VMTEMPLATE.TEMPLATE.SCHED_ACTION);
$("#sched_inst_actions_body").append(actions);
var selectOptions = {
'selectOptions': {
'select_callback': function(aData, options) {
@ -436,7 +541,6 @@ define(function(require) {
function _onShow(context) {
Sunstone.disableFormPanelSubmit(this.tabId);
$("input.instantiate_pers", context).change();
var templatesContext = $(".list_of_templates", context);
@ -462,5 +566,6 @@ define(function(require) {
$('#SCHED_REQUIREMENTS' + id, context).val(req_string.join(" | "));
$('#SCHED_DS_REQUIREMENTS' + id, context).val(req_ds_string.join(" | "));
};
}
});

View File

@ -109,6 +109,26 @@
</div>
</div>
{{/isFeatureEnabled}}
<div class="row">
<div class="large-12 columns actionContext{{element.ID}}">
<fieldset>
<legend>
<i class="fa fa-globe"></i> {{tr "Actions"}}
</legend>
<table id="scheduling_inst_actions_table" class="info_table dataTable">
<thead>
<tr>
<th> {{tr "Action"}} </th>
<th> {{tr "Time"}} </th>
<th colspan=""> {{tr "Actions"}} </th>
<th><button id="add_scheduling_inst_action" class="button small success right radius"> {{tr "Add action"}} </button></th>
</tr>
</thead>
<tbody id="sched_inst_actions_body"></tbody>
</table>
</fieldset>
</div>
</div>
<div class="row">
<div class="medium-6 small-12 columns vcenterVMFolderContext{{element.ID}}">
<div class="provision_vcenter_vm_folder_selector">

View File

@ -0,0 +1,75 @@
/* -------------------------------------------------------------------------- */
/* Copyright 2002-2017, OpenNebula Project, OpenNebula Systems */
/* */
/* Licensed under the Apache License, Version 2.0 (the "License"); you may */
/* not use this file except in compliance with the License. You may obtain */
/* a copy of the License at */
/* */
/* http://www.apache.org/licenses/LICENSE-2.0 */
/* */
/* Unless required by applicable law or agreed to in writing, software */
/* distributed under the License is distributed on an "AS IS" BASIS, */
/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */
/* See the License for the specific language governing permissions and */
/* limitations under the License. */
/* -------------------------------------------------------------------------- */
define(function(require) {
var Locale = require('utils/locale');
var TemplateUtils = require('utils/template-utils');
var Humanize = require('utils/humanize');
function _fromJSONtoActionsTable(actions_array) {
var str = ""
if (!actions_array) {
return "";
}
if (!$.isArray(actions_array)) {
var tmp_array = new Array();
tmp_array[0] = actions_array;
actions_array = tmp_array;
}
if (!actions_array.length) {
return "";
}
$.each(actions_array, function(index, scheduling_action) {
str += fromJSONtoActionRow(scheduling_action);
});
return str;
}
function fromJSONtoActionRow(scheduling_action) {
var time_str = Humanize.prettyTime(scheduling_action.TIME);
var str = "";
str += '<tr class="tr_action">\
<td class="action_row">' + TemplateUtils.htmlEncode(scheduling_action.ACTION) + '</td>\
<td nowrap class="time_row">' + time_str + '</td>\
<td>\
<div>\
<a id="minus" class="remove_action_x" href="#"><i class="fa fa-trash-o"/></a>\
</div>\
</td>\
</tr>';
return str;
}
function _convertDate(date_string){
date_string = date_string.split('/');
return date_string[2] + "-" + date_string[1] + "-" + date_string[0];
}
return {
'fromJSONtoActionsTable': _fromJSONtoActionsTable,
'convertDate': _convertDate
};
});