shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2024-12-25 23:21:29 +03:00
Code Releases Wiki Activity

F #5033. Sched actions in service template (#725)

Browse Source 
Co-authored-by: Jorge Lobo <jlobo@opennebula.systems>
This commit is contained in:
Jorge Miguel Lobo Escalona 2021-01-28 19:55:42 +01:00 committed by GitHub
parent 8c1e8d3688
commit 37098d157c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 364 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/sunstone/public/app/tabs/oneflow-services-tab/form-panels/update/update.js
View File

@ -23,8 +23,8 @@ define(function(require) {
var Sunstone = require("sunstone");
var Locale = require("utils/locale");
var Tips = require("utils/tips");
var OpenNebulaAction = require('opennebula/action');
var OpenNebula = require('opennebula');
var OpenNebulaAction = require("opennebula/action");
var OpenNebula = require("opennebula");
var UserInputs = require("utils/user-inputs");
var Notifier = require("utils/notifier");
/*
@ -40,7 +40,7 @@ define(function(require) {
var FORM_PANEL_ID = require("./formPanelId");
var TAB_ID = require("../../tabId");
var vm_group = "VM_GROUP";
var classButton = 'small button leases right radius';
var classButton = "small button leases right radius";
/*
CONSTRUCTOR
@ -78,19 +78,19 @@ define(function(require) {
function _html() {
var values_hbs = {
'formPanelId': this.formPanelId,
'userInputsHTML': UserInputs.html(),
"formPanelId": this.formPanelId,
"userInputsHTML": UserInputs.html(),
};
if(config && config.system_config && config.system_config.leases){
values_hbs.userInputsCharters = $("<div/>").append(
$("<div/>",{style:"display:inline-block;clear:both;width:100%"}).append(
$("<button />", {class: classButton, id:"addCharters"}).append(
$("<i/>", {class: 'fa fa-clock'})
$("<i/>", {class: "fa fa-clock"})
)
).add(
$("<table/>", {class: "service-charters"})
)
).prop('outerHTML');
).prop("outerHTML");
}
return TemplateHTML(values_hbs);
}
@ -114,7 +114,7 @@ define(function(require) {
if (this.action != "update") return;
var that = this;
var description = $('#description', context).val();
var description = $("#description", context).val();
var roles = [];
var json_template = {};
@ -134,20 +134,20 @@ define(function(require) {
response.DOCUMENT.TEMPLATE.BODY
) {
var body = response.DOCUMENT.TEMPLATE.BODY;
if (body.roles){
$('.role_content', context).each(function() {
$(".role_content", context).each(function() {
var role_id = $(this).attr("role_id");
var role_info = that.roleTabObjects[role_id].retrieve($(this));
role_info['cardinality'] = parseInt(role_info.cardinality, 10);
role_info['cooldown'] = parseInt(role_info.cooldown, 10);
role_info['vm_template'] = parseInt(role_info.vm_template, 10);
role_info['last_vmname'] = body.roles[role_id].last_vmname;
role_info['nodes'] = body.roles[role_id].nodes;
role_info['state'] = body.roles[role_id].state;
role_info["cardinality"] = parseInt(role_info.cardinality, 10);
role_info["cooldown"] = parseInt(role_info.cooldown, 10);
role_info["vm_template"] = parseInt(role_info.vm_template, 10);
role_info["last_vmname"] = body.roles[role_id].last_vmname;
role_info["nodes"] = body.roles[role_id].nodes;
role_info["state"] = body.roles[role_id].state;
roles.push(role_info);
});
@ -160,9 +160,9 @@ define(function(require) {
Object.assign(ret, body, json_template);
Sunstone.runAction("Service.update",that.resourceId, JSON.stringify(ret));
}
}
}
});
return false;
}
});

344
src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create.js
View File

@ -18,31 +18,38 @@ define(function(require) {
/*
DEPENDENCIES
*/
var Notifier = require('utils/notifier');
var Notifier = require("utils/notifier");
// require('foundation.tab');
var BaseFormPanel = require('utils/form-panels/form-panel');
var Sunstone = require('sunstone');
var BaseFormPanel = require("utils/form-panels/form-panel");
var Sunstone = require("sunstone");
var OpenNebulaAction = require("opennebula/action");
var Locale = require('utils/locale');
var Tips = require('utils/tips');
var RoleTab = require('tabs/oneflow-templates-tab/utils/role-tab');
var TemplateUtils = require('utils/template-utils');
var UserInputs = require('utils/user-inputs');
var Locale = require("utils/locale");
var Tips = require("utils/tips");
var RoleTab = require("tabs/oneflow-templates-tab/utils/role-tab");
var TemplateUtils = require("utils/template-utils");
var UserInputs = require("utils/user-inputs");
var ScheduleActions = require("utils/schedule_action");
var Leases = require("utils/leases");
/*
TEMPLATES
*/
var TemplateWizardHTML = require('hbs!./create/wizard');
var TemplateAdvancedHTML = require('hbs!./create/advanced');
var TemplateWizardHTML = require("hbs!./create/wizard");
var TemplateAdvancedHTML = require("hbs!./create/advanced");
/*
CONSTANTS
*/
var FORM_PANEL_ID = require('./create/formPanelId');
var TAB_ID = require('../tabId');
var FORM_PANEL_ID = require("./create/formPanelId");
var TAB_ID = require("../tabId");
var RESOURCE = "service_create";
var CREATE = true;
var actions = ScheduleActions.defaultActions;
function clear(){
CREATE = true;
}
/*
CONSTRUCTOR
*/
@ -51,15 +58,15 @@ define(function(require) {
this.formPanelId = FORM_PANEL_ID;
this.tabId = TAB_ID;
this.actions = {
'create': {
'title': Locale.tr("Create Service Template"),
'buttonText': Locale.tr("Create"),
'resetButton': true
"create": {
"title": Locale.tr("Create Service Template"),
"buttonText": Locale.tr("Create"),
"resetButton": true
},
'update': {
'title': Locale.tr("Update Service Template"),
'buttonText': Locale.tr("Update"),
'resetButton': false
"update": {
"title": Locale.tr("Update Service Template"),
"buttonText": Locale.tr("Update"),
"resetButton": false
}
};
@ -86,27 +93,111 @@ define(function(require) {
function _htmlWizard() {
return TemplateWizardHTML({
'formPanelId': this.formPanelId,
'userInputsHTML': UserInputs.html(),
"formPanelId": this.formPanelId,
"userInputsHTML": UserInputs.html(),
});
}
function _htmlAdvanced() {
return TemplateAdvancedHTML({
'formPanelId': this.formPanelId
"formPanelId": this.formPanelId
});
}
function renderCreateForm(context) {
if(CREATE){
ScheduleActions.htmlNewAction(actions, context, RESOURCE);
ScheduleActions.setup(context);
CREATE=false;
}
}
function sched_actions_events(context){
$(".edit_action_x").off("click").on("click", function(e){
e.preventDefault();
var id = $(this).attr("data_id");
if(id && id.length){
contextRow = $(this).closest("tr.tr_action");
renderCreateForm(context);
$("#edit_"+RESOURCE+"_action_json").show().attr("data_id", id);
$("#add_"+RESOURCE+"_action_json").hide();
ScheduleActions.fill($(this),context);
sched_actions_events(context);
}
});
$("#add_scheduling_"+RESOURCE+"_action").off("click");
$("#add_scheduling_"+RESOURCE+"_action").on("click", function(e){
e.preventDefault();
renderCreateForm(context);
$("#edit_"+RESOURCE+"_action_json").hide();
$("#add_"+RESOURCE+"_action_json").show();
sched_actions_events(context);
});
$(".remove_action_x").off("click").on("click", function(){
$(this).parents("tr").remove();
sched_actions_events(context);
});
$("#add_"+RESOURCE+"_action_json").off("click").on("click", function(){
var sched_action = ScheduleActions.retrieveNewAction(context);
if (sched_action) {
$("#no_actions_tr", context).remove();
$("#sched_"+RESOURCE+"_actions_body").prepend(ScheduleActions.fromJSONtoActionsTable(sched_action));
}
$("#input_sched_action_form").remove();
sched_actions_events(context);
clear();
return false;
});
$("#edit_"+RESOURCE+"_action_json").off("click").on("click", function(e){
e.preventDefault();
var id = $(this).attr("data_id");
if(id && id.length && contextRow){
$(".wickedpicker").hide();
var sched_action = ScheduleActions.retrieveNewAction(context);
if (sched_action != false) {
sched_action.ID = id;
contextRow.replaceWith(ScheduleActions.fromJSONtoActionsTable(sched_action));
contextRow = undefined;
$("#input_sched_action_form").remove();
}
sched_actions_events(context);
clear();
}
return false;
});
}
function _setup(context) {
clear();
this.networksType = [
{ value: 'template_id', text: 'Create', select: 'vntemplates', extra: true },
{ value: 'reserve_from', text: 'Reserve', select: 'networks', extra: true },
{ value: 'id', text: 'Existing', select: 'networks', extra: false },
]
{ value: "template_id", text: "Create", select: "vntemplates", extra: true },
{ value: "reserve_from", text: "Reserve", select: "networks", extra: true },
{ value: "id", text: "Existing", select: "networks", extra: false },
];
this.roleTabObjects = {};
this.numberOfNetworks = 0;
var that = this;
//this render a schedule action form
$(".service_schedule_actions").append(ScheduleActions.htmlTable(RESOURCE, Leases.html()));
//this are actions of Leases button
var objLeases = $.extend(true, {}, that);
objLeases.resource = "template";
objLeases.__proto__ = FormPanel.prototype;
Leases.actions(objLeases,"","", function(){
sched_actions_events(context);
});
//end of render a schedule action form
// this is a logic to add, remove and edit schedule_action
sched_actions_events(context);
// end of logic to add, remove and edit schedule_action
$(".add_service_network", context).unbind("click");
$(".add_service_network", context).bind("click", function() {
var nic_index = that.numberOfNetworks;
@ -114,34 +205,34 @@ define(function(require) {
$(".service_networks tbody").append(
'<tr id="network'+nic_index+'">\
"<tr id=\"network"+nic_index+"\">\
<td>\
<input checked="" type="checkbox" name="service_network_mandatory'+nic_index+'"\
class="switch input service_network_mandatory slaac" id="service_network_mandatory'+nic_index+'" hidden="">\
<label class="switch-paddle" for="service_network_mandatory'+nic_index+'" style="cursor: pointer;"></label>\
<input checked=\"\" type=\"checkbox\" name=\"service_network_mandatory"+nic_index+"\"\
class=\"switch input service_network_mandatory slaac\" id=\"service_network_mandatory"+nic_index+"\" hidden=\"\">\
<label class=\"switch-paddle\" for=\"service_network_mandatory"+nic_index+"\" style=\"cursor: pointer;\"></label>\
</td>\
<td>\
<input class="service_network_name" type="text" data-index="'+nic_index+'" required />\
<small class="form-error"><br/>'+Locale.tr("Can only contain alphanumeric and underscore characters, and be unique")+'</small>\
<input class=\"service_network_name\" type=\"text\" data-index=\""+nic_index+"\" required />\
<small class=\"form-error\"><br/>"+Locale.tr("Can only contain alphanumeric and underscore characters, and be unique")+"</small>\
</td>\
<td>\
<textarea class="service_network_description" />\
<textarea class=\"service_network_description\" />\
</td>\
<td>\
<select class="service_network_type" required></select>\
<select class=\"service_network_type\" required></select>\
</td>\
<td>\
<select class="service_network_id">\
<option value=" "></option>\
<select class=\"service_network_id\">\
<option value=\" \"></option>\
</select>\
</td>\
<td>\
<input disabled class="service_network_extra" type="text" />\
<input disabled class=\"service_network_extra\" type=\"text\" />\
</td>\
<td style="text-align: right;">\
<a href="#"><i class="fas fa-times-circle remove-tab" data-index="'+nic_index+'"></i></a>\
<td style=\"text-align: right;\">\
<a href=\"#\"><i class=\"fas fa-times-circle remove-tab\" data-index=\""+nic_index+"\"></i></a>\
</td>\
</tr>');
</tr>");
that.networksType.map(function(type) {
$(".service_network_type", "tr#network"+nic_index).append($("<option/>", {
@ -155,43 +246,43 @@ define(function(require) {
var otherNames = $("input.service_network_name").not($(this)).map(function() {
return $(this).val();
}).get().join("|");
$(this).attr("pattern", "^(?!(" + otherNames + ")$)(^\\w+$)");
_redo_service_networks_selector(context, that);
});
$(".service_network_type", "tr#network"+nic_index).unbind("change");
$(".service_network_type", "tr#network"+nic_index).bind("change", function(){
var selectedType = $(this).val()
var serviceNetwork = $(this).closest('tr')
var selectedType = $(this).val();
var serviceNetwork = $(this).closest("tr");
var data = _get_networks()
var data = _get_networks();
// 1. if val = reserve/existing or create
$(".service_network_id", serviceNetwork).empty().append($("<option/>").text(""))
$(".service_network_id", serviceNetwork).empty().append($("<option/>").text(""));
// 2. create and fill selector
var type = that.networksType.find(function(type) { return type.value === selectedType })
var type = that.networksType.find(function(type) { return type.value === selectedType; });
// 3. append selector after type
type && data[type.select].map(function(net) {
$(".service_network_id", serviceNetwork).append($("<option/>", {
"value": net.ID
}).text(net.NAME))
})
}).text(net.NAME));
});
// 4. append extra after selector if reserve/create
var disabled = type ? !type.extra : true;
!disabled && $(".service_network_extra", serviceNetwork).empty();
$(".service_network_extra", serviceNetwork).prop('disabled', disabled);
!disabled && $(".service_network_extra", serviceNetwork).empty();
$(".service_network_extra", serviceNetwork).prop("disabled", disabled);
});
$("i.remove-tab", "tr#network"+nic_index).unbind("click");
$("i.remove-tab", "tr#network"+nic_index).bind("click", function(){
var tr = $(this).closest('tr');
var tr = $(this).closest("tr");
tr.remove();
_redo_service_networks_selector(context, that, $(this).data("index"));
});
@ -242,11 +333,11 @@ define(function(require) {
$(tab_id+" .parent_roles_body", context).html(str);
$.each(selected_parents, function(){
$(tab_id+" .parent_roles_body #"+this, context).attr('checked', true);
$(tab_id+" .parent_roles_body #"+this, context).attr("checked", true);
});
});
Foundation.reflow(context, 'tabs');
Foundation.reflow(context, "tabs");
Tips.setup(context);
UserInputs.setup(context);
@ -255,13 +346,13 @@ define(function(require) {
function _submitWizard(context) {
var that = this;
var name = $('input[name="service_name"]', context).val();
var description = $('#description', context).val();
var deployment = $('select[name="deployment"]', context).val();
var shutdown_action_service = $('select[name="shutdown_action_service"]', context).val();
var ready_status_gate = $('input[name="ready_status_gate"]', context).prop("checked");
var automatic_deletion = $('input[name="automatic_deletion"]', context).prop("checked");
var scheduleActions = ScheduleActions.retrieve(context);
var name = $("input[name=\"service_name\"]", context).val();
var description = $("#description", context).val();
var deployment = $("select[name=\"deployment\"]", context).val();
var shutdown_action_service = $("select[name=\"shutdown_action_service\"]", context).val();
var ready_status_gate = $("input[name=\"ready_status_gate\"]", context).prop("checked");
var automatic_deletion = $("input[name=\"automatic_deletion\"]", context).prop("checked");
var custom_attrs = {};
var network_attrs = {};
@ -272,12 +363,12 @@ define(function(require) {
var row = $(this);
var attr_name = $(".service_network_name", row).val();
if (attr_name) {
var attr_mandatory = $(".service_network_mandatory", row).prop('checked') ? 'M' : 'O';
var attr_desc = ($(".service_network_description", row).val() || '');
var attr_type = $(".service_network_type", row).val() || '';
var attr_id = $(".service_network_id", row).val() || '';
var type = that.networksType.find(function(type) { return type.value === attr_type })
var attr_extra = type.extra ? (':' + ($(".service_network_extra", row).val() || '')) : '';
var attr_mandatory = $(".service_network_mandatory", row).prop("checked") ? "M" : "O";
var attr_desc = ($(".service_network_description", row).val() || "");
var attr_type = $(".service_network_type", row).val() || "";
var attr_id = $(".service_network_id", row).val() || "";
var type = that.networksType.find(function(type) { return type.value === attr_type; });
var attr_extra = type.extra ? (":" + ($(".service_network_extra", row).val() || "")) : "";
network_attrs[attr_name] = attr_mandatory + "|" + attr_network + "|" + attr_desc + "| |" + attr_type + ":" + attr_id + attr_extra;
}
});
@ -285,16 +376,28 @@ define(function(require) {
var userInputsJSON = UserInputs.retrieve(context);
$.each(userInputsJSON, function(key, value){
var name = key.toUpperCase();
custom_attrs[name] = value
custom_attrs[name] = value;
});
var roles = [];
$('.role_content', context).each(function() {
$(".role_content", context).each(function() {
var role_id = $(this).attr("role_id");
roles.push( that.roleTabObjects[role_id].retrieve($(this)) );
});
//this var is for validate if the request is a PUT or POST. PD: check why the update is a POST
var post = true;
//if exist schedule_actions add scheduleAction to each role
if(scheduleActions && scheduleActions.length){
post = false;
roles = roles.map(role => {
role.vm_template_contents = ScheduleActions.parseToRequestString(scheduleActions);
return role;
});
}
var json_template = {
name: name,
deployment: deployment,
@ -306,32 +409,32 @@ define(function(require) {
//add networks in post body
if (!$.isEmptyObject(network_attrs)){
json_template['networks'] = network_attrs;
json_template["networks"] = network_attrs;
}
//add custom attributes in post body
if (!$.isEmptyObject(custom_attrs)){
json_template['custom_attrs'] = custom_attrs;
json_template["custom_attrs"] = custom_attrs;
}
if (shutdown_action_service){
json_template['shutdown_action'] = shutdown_action_service;
json_template["shutdown_action"] = shutdown_action_service;
}
// add labels
var currentInfo = Sunstone.getElementRightInfo(TAB_ID)
var currentInfo = Sunstone.getElementRightInfo(TAB_ID);
if (
currentInfo &&
currentInfo.TEMPLATE &&
currentInfo.TEMPLATE.BODY &&
currentInfo.TEMPLATE.BODY.labels
) {
json_template['labels'] = currentInfo.TEMPLATE.BODY.labels
json_template["labels"] = currentInfo.TEMPLATE.BODY.labels;
}
var new_template = {};
$.extend(true, new_template, that.old_template, json_template);
clear();
if (this.action == "create") {
Sunstone.runAction("ServiceTemplate.create", new_template );
return false;
@ -343,7 +446,7 @@ define(function(require) {
}
function _submitAdvanced(context) {
var templateStr = $('textarea#template', context).val();
var templateStr = $("textarea#template", context).val();
if (this.action == "create") {
Sunstone.runAction("ServiceTemplate.create", JSON.parse(templateStr) );
return false;
@ -356,7 +459,7 @@ define(function(require) {
function _onShow(context) {
var that = this;
$('.role_content', context).each(function() {
$(".role_content", context).each(function() {
var role_id = $(this).attr("role_id");
that.roleTabObjects[role_id].onShow();
});
@ -375,8 +478,21 @@ define(function(require) {
this.resourceId = element.ID;
this.old_template = element.TEMPLATE.BODY;
//fill schedule actions
if(this.old_template && this.old_template.roles && this.old_template.roles[0] && this.old_template.roles[0].vm_template_contents){
var vm_template_contents = TemplateUtils.stringToTemplate(this.old_template.roles[0].vm_template_contents);
if(vm_template_contents && vm_template_contents.SCHED_ACTION){
var arraySchedActions = Array.isArray(vm_template_contents.SCHED_ACTION)? vm_template_contents.SCHED_ACTION : [vm_template_contents.SCHED_ACTION];
arraySchedActions.forEach(function(schedAction){
$("#no_actions_tr", context).remove();
$("#sched_"+RESOURCE+"_actions_body").prepend(ScheduleActions.fromJSONtoActionsTable(schedAction));
});
sched_actions_events(context);
}
}
// Populates the Avanced mode Tab
$('#template', context).val(JSON.stringify(element.TEMPLATE.BODY, null, " "));
$("#template", context).val(JSON.stringify(element.TEMPLATE.BODY, null, " "));
$("#service_name", context).attr("disabled", "disabled");
@ -384,7 +500,7 @@ define(function(require) {
$("#description", context).val(element.TEMPLATE.BODY.description);
$('select[name="deployment"]', context).val(element.TEMPLATE.BODY.deployment);
$("select[name=\"deployment\"]", context).val(element.TEMPLATE.BODY.deployment);
$("select[name='shutdown_action_service']", context).val(element.TEMPLATE.BODY.shutdown_action);
$("input[name='ready_status_gate']", context).prop("checked",element.TEMPLATE.BODY.ready_status_gate || false);
$("input[name='automatic_deletion']", context).prop("checked",element.TEMPLATE.BODY.automatic_deletion || false);
@ -392,28 +508,28 @@ define(function(require) {
$(".service_networks i.remove-tab", context).trigger("click");
//fill form networks
if ( ! $.isEmptyObject( element.TEMPLATE.BODY['networks'] ) ) {
if ( ! $.isEmptyObject( element.TEMPLATE.BODY["networks"] ) ) {
$("div#network_configuration a.accordion_advanced_toggle", context).trigger("click");
$.each(element.TEMPLATE.BODY['networks'], function(key, attr){
$.each(element.TEMPLATE.BODY["networks"], function(key, attr){
// 0 mandatory; 1 network; 2 description; 3 empty; 4 info_network;
var parts = attr.split("|");
// 0 type; 1 id; 3(optional) extra
var info = parts.slice(-1)[0].split(":");
var attrs = {
"name": key,
"mandatory": parts[0] === 'M' ? true : false,
"mandatory": parts[0] === "M" ? true : false,
"network": parts[1],
"description": parts[2],
"empty": parts[3],
"type": info[0],
"id": info[1],
"extra": info.slice(2).join(''),
"extra": info.slice(2).join(""),
};
if (parts[1] === "network") {
$(".add_service_network", context).trigger("click");
var tr = $(".service_networks tbody > tr", context).last();
$(".service_network_mandatory", tr).prop('checked', attrs.mandatory).change();
$(".service_network_mandatory", tr).prop("checked", attrs.mandatory).change();
$(".service_network_name", tr).val(attrs.name).change();
$(".service_network_description", tr).val(attrs.description).change();
$(".service_network_type", tr).val(attrs.type).change();
@ -424,7 +540,7 @@ define(function(require) {
}
//fill form custom attributes
var custom_attrs = element.TEMPLATE.BODY['custom_attrs']
var custom_attrs = element.TEMPLATE.BODY["custom_attrs"];
if (! $.isEmptyObject(custom_attrs)) {
$("div#custom_attr_values a.accordion_advanced_toggle", context).trigger("click");
UserInputs.fill(context, {"USER_INPUTS": custom_attrs});
@ -447,7 +563,7 @@ define(function(require) {
$("#tf_btn_roles", context).click();
var role_context = $('.role_content', context).last();
var role_context = $(".role_content", context).last();
var role_id = $(role_context).attr("role_id");
that.roleTabObjects[role_id].fill(role_context, value, network_names);
@ -456,7 +572,7 @@ define(function(require) {
//_redo_service_networks_selector(context, that);
$.each(element.TEMPLATE.BODY.roles, function(index, value){
var role_context = $('.role_content', context)[index];
var role_context = $(".role_content", context)[index];
var str = "";
$.each(roles_names, function(){
@ -474,7 +590,7 @@ define(function(require) {
if (value.parents) {
$.each(value.parents, function(index, value){
$(".parent_roles_body #"+this, role_context).attr('checked', true);
$(".parent_roles_body #"+this, role_context).attr("checked", true);
});
}
});
@ -483,7 +599,7 @@ define(function(require) {
//----------------------------------------------------------------------------
function _redo_service_networks_selector(dialog, template, nicToDelete){
$('#roles_tabs_content .role_content', dialog).each(function(){
$("#roles_tabs_content .role_content", dialog).each(function(){
_redo_service_networks_selector_role(dialog, this, template, nicToDelete);
});
}
@ -503,17 +619,17 @@ define(function(require) {
}
});
var role_tab_id = $(role_section).attr('id');
var role_tab_id = $(role_section).attr("id");
var str = "";
$(".service_networks .service_network_name", dialog).each(function(){
var index = $(this).data('index');
var index = $(this).data("index");
var name = $(this).val();
var regexp = new RegExp($(this).attr("pattern"), "gi");
var checked = checked_networks[index];
var wasChecked = checked ? 'checked="checked"' : '';
var wasAlias = checked && checked["alias"] ? 'checked="checked"' : '';
var canBeAlias = !checked ? 'disabled="disabled"' : '';
var wasChecked = checked ? "checked=\"checked\"" : "";
var wasAlias = checked && checked["alias"] ? "checked=\"checked\"" : "";
var canBeAlias = !checked ? "disabled=\"disabled\"" : "";
// Condition 1: Be unique
// Condition 2: Can only contain alphanumeric and underscore characters
@ -565,15 +681,15 @@ define(function(require) {
function _add_role_tab(role_id, dialog) {
var that = this;
var html_role_id = 'role' + role_id;
var html_role_id = "role" + role_id;
var role_tab = new RoleTab(html_role_id);
that.roleTabObjects[role_id] = role_tab;
// Append the new div containing the tab and add the tab to the list
var role_section = $('<div id="'+html_role_id+'Tab" class="tabs-panel role_content wizard_internal_tab" role_id="'+role_id+'">'+
var role_section = $("<div id=\""+html_role_id+"Tab\" class=\"tabs-panel role_content wizard_internal_tab\" role_id=\""+role_id+"\">"+
role_tab.html() +
'</div>').appendTo($("#roles_tabs_content", dialog));
"</div>").appendTo($("#roles_tabs_content", dialog));
_redo_service_networks_selector_role(dialog, role_section, that);
@ -596,14 +712,14 @@ define(function(require) {
// close icon: removing the tab on click
a.on("click", "i.remove-tab", function() {
var target = $(this).parent().attr("href");
var li = $(this).closest('li');
var ul = $(this).closest('ul');
var li = $(this).closest("li");
var ul = $(this).closest("ul");
var content = $(target);
var role_id = content.attr("role_id");
li.remove();
content.remove();
if (li.hasClass('is-active')) {
$('a', ul.children('li').last()).click();
if (li.hasClass("is-active")) {
$("a", ul.children("li").last()).click();
}
delete that.roleTabObjects[role_id];
_redo_service_networks_selector(dialog, that);
@ -620,7 +736,7 @@ define(function(require) {
networks = OpenNebulaAction.cache("VNET");
}
networks = networks ? networks.data : [];
var vntemplates = OpenNebulaAction.cache("VNTEMPLATE");
if (vntemplates === undefined) {
Sunstone.runAction("VNTemplate.list");
@ -635,10 +751,10 @@ define(function(require) {
return ({
ID: net.VNET.ID,
NAME: net.VNET.NAME || "vnet-"+net.VNET.ID
})
})
});
});
}
// Get network templates list
if (vntemplates) {
var data = Array.isArray(vntemplates) ? vntemplates : [];
@ -646,10 +762,10 @@ define(function(require) {
return ({
ID: temp.VNTEMPLATE.ID,
NAME: temp.VNTEMPLATE.NAME || "vntemplate-"+template.VNTEMPLATE.ID
})
})
});
});
}
return ({ networks: networks, vntemplates: vntemplates })
return ({ networks: networks, vntemplates: vntemplates });
}
});

7
src/sunstone/public/app/tabs/oneflow-templates-tab/form-panels/create/wizard.hbs
View File

@ -69,6 +69,13 @@
{{{userInputsHTML}}}
{{/advancedSection}}
</div>
{{#advancedSection (tr "Service Scheduled Actions") }}
<div class="row">
<input type="text" id="registration_time" name="registration_time" class="hide">
<div class="large-12 columns service_schedule_actions">
</div>
</div>
{{/advancedSection}}
{{#advancedSection (tr "Advanced service parameters") }}
<div class="row">
<div class="service_template_param st_man medium-6 columns">

22
src/sunstone/public/app/tabs/templates-tab/form-panels/create/wizard-tabs/actions.js
View File

@ -78,27 +78,7 @@ define(function(require) {
CREATE = true;
}
var that = this;
var actions = [
"terminate",
"terminate-hard",
"hold",
"release",
"stop",
"suspend",
"resume",
"reboot",
"reboot-hard",
"poweroff",
"poweroff-hard",
"undeploy",
"undeploy-hard",
"snapshot-create",
"snapshot-delete",
"snapshot-revert",
"disk-snapshot-create",
"disk-snapshot-delete",
"disk-snapshot-revert"
];
var actions = ScheduleActions.defaultActions;
function renderCreateForm() {
if(CREATE){
ScheduleActions.htmlNewAction(actions, context, "temp");

30
src/sunstone/public/app/tabs/templates-tab/form-panels/instantiate.js
View File

@ -51,7 +51,7 @@ define(function(require) {
var FORM_PANEL_ID = require("./instantiate/formPanelId");
var TAB_ID = require("../tabId");
var RESOURCE = 'inst';
var RESOURCE = "inst";
var CREATE = true;
var contextRow;
@ -90,7 +90,7 @@ define(function(require) {
/*
FUNCTION DEFINITIONS
*/
function _html() {
return TemplateHTML({
"formPanelId": this.formPanelId
@ -101,27 +101,7 @@ define(function(require) {
if(!CREATE){
CREATE = true;
}
var actions = [
"terminate",
"terminate-hard",
"hold",
"release",
"stop",
"suspend",
"resume",
"reboot",
"reboot-hard",
"poweroff",
"poweroff-hard",
"undeploy",
"undeploy-hard",
"snapshot-create",
"snapshot-delete",
"snapshot-revert",
"disk-snapshot-create",
"disk-snapshot-delete",
"disk-snapshot-revert"
];
var actions = ScheduleActions.defaultActions;
var that = this;
var objLeases = $.extend(true, {}, that);
objLeases.resource = "template";
@ -407,7 +387,7 @@ define(function(require) {
capacityContext = $(".capacityContext" + template_id, context);
$.extend(tmp_json, CapacityInputs.retrieveChanges(capacityContext));
var topology = {}
var topology = {};
if (tmp_json && tmp_json.CORES){
topology.CORES = tmp_json["CORES"];
@ -702,7 +682,7 @@ define(function(require) {
if (hosts_table) {
var selected_hosts = hosts_table.retrieveResourceTableSelect();
$.each(selected_hosts, function(index, hostId) {
req_string.push("ID=\"" + hostId + "\"");
});

32
src/sunstone/public/app/tabs/vms-tab/panels/actions.js
View File

@ -35,7 +35,7 @@ define(function(require) {
var TAB_ID = require("../tabId");
var PANEL_ID = require("./actions/panelId");
var RESOURCE = "VM";
var RESOURCE_SCHED_ACTIONS = 'vms'
var RESOURCE_SCHED_ACTIONS = "vms";
var XML_ROOT = "VM";
/*
CONSTRUCTOR
@ -95,28 +95,8 @@ define(function(require) {
var CREATE = true;
var that = this;
that.formContext = context;
Leases.actions(that,'vm','update');
var actions = [
"terminate",
"terminate-hard",
"hold",
"release",
"stop",
"suspend",
"resume",
"reboot",
"reboot-hard",
"poweroff",
"poweroff-hard",
"undeploy",
"undeploy-hard",
"snapshot-create",
"snapshot-delete",
"snapshot-revert",
"disk-snapshot-create",
"disk-snapshot-delete",
"disk-snapshot-revert"
];
Leases.actions(that,"vm","update");
var actions = ScheduleActions.defaultActions;
function renderCreateForm(){
if(CREATE){
@ -167,7 +147,7 @@ define(function(require) {
}else{
return action;
}
})
});
}
that.element.USER_TEMPLATE.SCHED_ACTION = sched_actions;
var template_str = TemplateUtils.templateToString(that.element.USER_TEMPLATE);
@ -249,8 +229,8 @@ define(function(require) {
function vmsfromJSONtoActionRow(scheduling_action) {
var done_str = scheduling_action.DONE ? (Humanize.prettyTime(scheduling_action.DONE)) : "";
var message_str = scheduling_action.MESSAGE ? scheduling_action.MESSAGE : "";
var action_id = scheduling_action.ID || '';
var update_sched = '';
var action_id = scheduling_action.ID || "";
var update_sched = "";
if(action_id){
update_sched = "<button id='minus_"+scheduling_action.ID+ "' class='small button btn-warning edit_action_x' data_id='"+action_id+"'><i class='fas fa-edit'></i></button>";
}

77
src/sunstone/public/app/utils/leases.js
View File

@ -18,19 +18,19 @@ define(function(require) {
/*
DEPENDENCIES
*/
var Locale = require('utils/locale');
var Locale = require("utils/locale");
var TemplateUtils = require("utils/template-utils");
var WizardFields = require('utils/wizard-fields');
var Sunstone = require('sunstone');
var WizardFields = require("utils/wizard-fields");
var Sunstone = require("sunstone");
var ScheduleActions = require("utils/schedule_action");
var notifier = require("utils/notifier");
/*
CONSTANTS
*/
var classButton = 'small button leases right radius';
var idElementSchedActions = '#sched_temp_actions_body, #sched_inst_actions_body';
var classButton = "small button leases right radius";
var idElementSchedActions = "#sched_temp_actions_body, #sched_inst_actions_body, #sched_service_create_actions_body";
/*
CONSTRUCTOR
@ -47,37 +47,43 @@ define(function(require) {
function _html(){
if(
config &&
config.system_config &&
config.system_config.leases &&
(config.system_config.leases.suspense || config.system_config.leases.terminate)
config &&
config.system_config &&
config.system_config.leases &&
(config.system_config.leases.suspend || config.system_config.leases.terminate)
){
return $("<button />", {class: classButton, type:"button"}).append(
$("<i/>", {class: 'fa fa-clock'})
).prop('outerHTML');
$("<i/>", {class: "fa fa-clock"})
).prop("outerHTML");
}
}
function parseVarToJqueryClass(constant){
return "."+constant.replace(/ /g, '.');
return "."+constant.replace(/ /g, ".");
}
function _actions(form, res, act){
function _actions(form, res, act, callback){
if(
form &&
form.constructor &&
form.constructor.name &&
(form.constructor.name === 'FormPanel' || form.constructor.name === 'Panel') &&
config &&
config.system_config &&
(form.constructor.name === "FormPanel" || form.constructor.name === "Panel") &&
config &&
config.system_config &&
config.system_config.leases
){
form.formContext.off("click", parseVarToJqueryClass(classButton))
form.formContext.off("click", parseVarToJqueryClass(classButton));
form.formContext.on("click", parseVarToJqueryClass(classButton), function(e){
e.preventDefault();
var confLeases = config.system_config.leases;
var confLeasesKeys = Object.keys(confLeases);
var type = form.constructor.name;
var resource = null;
var action = null;
var template = null;
var id = null;
var showLeaseMessage = function(){
notifier.notifyCustom(Locale.tr("Added scheduled actions"),"");
};
@ -94,6 +100,9 @@ define(function(require) {
};
last = schedActionTime;
$(idElementSchedActions).prepend(ScheduleActions.fromJSONtoActionsTable(newAction));
if(typeof callback === "function"){
callback();
}
pass = true;
}
});
@ -102,29 +111,23 @@ define(function(require) {
}
};
var type = form.constructor.name;
var resource = null;
var action = null;
var template = null;
var id = null;
switch (type) {
case 'FormPanel':
case "FormPanel":
resource = form.resource || null;
action = form.action || null;
template = ( form.jsonTemplate ?
form.jsonTemplate
:
template = ( form.jsonTemplate ?
form.jsonTemplate
:
(
form.wizardElement ?
WizardFields.retrieve(form.wizardElement)
:
form.wizardElement ?
WizardFields.retrieve(form.wizardElement)
:
null
)
);
id = form.resourceId || null;
break;
case 'Panel':
case "Panel":
resource = res || null;
action = act || null;
template = (form.element && form.element.USER_TEMPLATE? form.element.USER_TEMPLATE : null );
@ -145,7 +148,7 @@ define(function(require) {
var index = (
template && template.SCHED_ACTION ?
(Array.isArray(template.SCHED_ACTION)? template.SCHED_ACTION.length : 1)
:
:
0
);
var last = 0;
@ -163,10 +166,10 @@ define(function(require) {
}
});
template.SCHED_ACTION = (
template.SCHED_ACTION?
(Array.isArray(template.SCHED_ACTION)? template.SCHED_ACTION.concat(newSchedActions) : [template.SCHED_ACTION].concat(newSchedActions))
:
newSchedActions
template.SCHED_ACTION?
(Array.isArray(template.SCHED_ACTION)? template.SCHED_ACTION.concat(newSchedActions) : [template.SCHED_ACTION].concat(newSchedActions))
:
newSchedActions
);
template = TemplateUtils.templateToString(template);
Sunstone.runAction("VM.update_template", id, template);

77
src/sunstone/public/app/utils/schedule_action.js
View File

@ -1,3 +1,4 @@
/* eslint-disable quotes */
/* -------------------------------------------------------------------------- */
/* Copyright 2002-2020, OpenNebula Project, OpenNebula Systems */
/* */
@ -51,13 +52,13 @@ define(function (require) {
var year = d.getFullYear();
var hour = d.getHours();
var minutes = d.getMinutes();
if (hour.length < 2)
if (hour.length < 2)
hour = '0' + hour;
if (minutes.length < 2)
if (minutes.length < 2)
minutes = '0' + minutes;
if (month.length < 2)
if (month.length < 2)
month = '0' + month;
if (day.length < 2)
if (day.length < 2)
day = '0' + day;
var date = [];
switch (type) {
@ -100,7 +101,7 @@ define(function (require) {
e.stopPropagation();
$(".wickedpicker").hide();
}).on("keypress",function(e){
e.preventDefault();
e.preventDefault();
return false;
}).datepicker(options_date_picker);
@ -134,7 +135,7 @@ define(function (require) {
function _htmlNewAction(actions, context, res) {
$("tr.periodic.create, tr#no_relative_time_form").remove();
this.res = res
this.res = res;
var options = "";
var that = this;
$.each(actions, function (key, action) {
@ -287,12 +288,14 @@ define(function (require) {
$("#end_value_" + value, context).attr("value", min);
$("#end_value_" + value, context).prop("disabled", false);
});
try {
context.on("focusout", "#time_input", function () {
$("#time_input").removeAttr("data-invalid");
$("#time_input").removeAttr("class");
});
} catch (error) {
context.on("focusout", "#time_input", function () {
$("#time_input").removeAttr("data-invalid");
$("#time_input").removeAttr("class");
});
}
}
function _fill(element, context){
@ -308,7 +311,7 @@ define(function (require) {
if(key!=='ARGS' && !valuesForRelative.includes(key)){
relative = false;
}
})
});
if(dataJSON.ACTION){
$("#select_new_action").val(dataJSON.ACTION).change();
@ -410,7 +413,7 @@ define(function (require) {
if(days[dataValue]){
$(days[dataValue]).prop("checked", true);
}
})
});
}
break;
case '1':
@ -480,7 +483,7 @@ define(function (require) {
$(".non-periodic").removeClass("hide");
$("#relative_time_form").addClass("hide");
$("#no_relative_time_form").removeClass("hide");
}
function _resetRepeatValues(){
@ -654,22 +657,22 @@ define(function (require) {
function validateScheduleInputsEmpty(action, snap_name, snap_id, disk_id){
switch (action) {
case 'snapshot-create':
rtn = snap_name.length<=0
rtn = snap_name.length<=0;
break;
case 'snapshot-revert':
rtn = snap_id.length<=0
rtn = snap_id.length<=0;
break;
case 'snapshot-delete':
rtn = snap_id.length<=0
rtn = snap_id.length<=0;
break;
case 'disk-snapshot-create':
rtn = snap_name.length<=0 || disk_id.length<=0
rtn = snap_name.length<=0 || disk_id.length<=0;
break;
case 'disk-snapshot-revert':
rtn = snap_id.length<=0 || disk_id.length<=0
rtn = snap_id.length<=0 || disk_id.length<=0;
break;
case 'disk-snapshot-delete':
rtn = snap_id.length<=0 || disk_id.length<=0
rtn = snap_id.length<=0 || disk_id.length<=0;
break;
default:
rtn = false;
@ -813,6 +816,36 @@ define(function (require) {
return date_string[2] + "-" + date_string[1] + "-" + date_string[0];
}
function parseToRequestString(data){
var rtn = "";
if(data){
rtn = TemplateUtils.templateToString({SCHED_ACTION: data});
}
return rtn;
}
var defaultActions = [
"terminate",
"terminate-hard",
"hold",
"release",
"stop",
"suspend",
"resume",
"reboot",
"reboot-hard",
"poweroff",
"poweroff-hard",
"undeploy",
"undeploy-hard",
"snapshot-create",
"snapshot-delete",
"snapshot-revert",
"disk-snapshot-create",
"disk-snapshot-delete",
"disk-snapshot-revert"
];
return {
"fromJSONtoActionRow": _fromJSONtoActionRow,
"fromJSONtoActionsTable": _fromJSONtoActionsTable,
@ -823,6 +856,8 @@ define(function (require) {
"retrieve": _retrieve,
"fill": _fill,
"parseTime": _time,
"reset": _reset
"parseToRequestString": parseToRequestString,
"reset": _reset,
"defaultActions": defaultActions
};
});