From 584a57ea3c7d29a6729310785c11a861eb08ec06 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 11 Nov 2021 20:49:43 +0100 Subject: [PATCH] calendar event simulator: rename number parameter to iterations in sync with the same option of `systemd-analyze calendar` and number is so generic. Signed-off-by: Thomas Lamprecht --- PVE/API2/Cluster/Jobs.pm | 12 ++++++------ www/manager6/window/ScheduleSimulator.js | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/PVE/API2/Cluster/Jobs.pm b/PVE/API2/Cluster/Jobs.pm index 79a6e85e..263b9d62 100644 --- a/PVE/API2/Cluster/Jobs.pm +++ b/PVE/API2/Cluster/Jobs.pm @@ -47,7 +47,7 @@ __PACKAGE__->register_method({ additionalProperties => 0, properties => { schedule => { - description => "Backup schedule. The format is a subset of `systemd` calendar events.", + description => "Job schedule. The format is a subset of `systemd` calendar events.", type => 'string', format => 'pve-calendar-event', maxLength => 128, }, @@ -56,8 +56,8 @@ __PACKAGE__->register_method({ optional => 1, type => 'integer', }, - number => { - description => "Number of timestamps to return.", + iterations => { + description => "Number of event-iteration to simulate and return.", optional => 1, type => 'integer', minimum => 1, @@ -68,7 +68,7 @@ __PACKAGE__->register_method({ }, returns => { type => 'array', - description => 'Contains the guest objects.', + description => 'An array of the next events since .', items => { type => 'object', properties => { @@ -87,14 +87,14 @@ __PACKAGE__->register_method({ my ($param) = @_; my $starttime = $param->{starttime} // time(); - my $number = $param->{number} // 10; + my $iterations = $param->{iterations} // 10; my $schedule = $param->{schedule}; my $result = []; my $event = PVE::CalendarEvent::parse_calendar_event($schedule); - for (my $count = 0; $count < $number; $count++) { + for (my $count = 0; $count < $iterations; $count++) { my $next = PVE::CalendarEvent::compute_next_event($event, $starttime); push @$result, { timestamp => $next, diff --git a/www/manager6/window/ScheduleSimulator.js b/www/manager6/window/ScheduleSimulator.js index 14b32100..c271f9c3 100644 --- a/www/manager6/window/ScheduleSimulator.js +++ b/www/manager6/window/ScheduleSimulator.js @@ -12,13 +12,13 @@ Ext.define('PVE.window.ScheduleSimulator', { if (!schedule) { return; } - let number = me.lookup('number').getValue() || 10; + let iterations = me.lookup('iterations').getValue() || 10; Proxmox.Utils.API2Request({ url: '/cluster/jobs/schedule-analyze', method: 'GET', params: { schedule, - number, + iterations, }, failure: function(response, opts) { Ext.Msg.alert(gettext('Error'), response.htmlStatus); @@ -71,8 +71,8 @@ Ext.define('PVE.window.ScheduleSimulator', { minValue: 1, maxValue: 100, value: 10, - reference: 'number', - fieldLabel: gettext('Number'), + reference: 'iterations', + fieldLabel: gettext('Iterations'), }, { xtype: 'button',