Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

as400 fix previous pending request #5373

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

as400 fix previous pending request #5373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/os/as400/connector/custom/api.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ use strict;
use warnings;
use centreon::plugins::http;
use JSON::XS;
use Digest::MD5 qw(md5_hex);

sub new {
my ($class, %options) = @_;
Expand Down Expand Up @@ -153,7 +154,13 @@ sub request_api {
password => $self->{as400_password},
command => $options{command}
};
$post->{args} = $options{args} if (defined($options{args}));
if (defined($options{args})) {
$post->{args} = $options{args};
if (defined($post->{args}->{uuid})) {
$post->{args}->{uuid} = md5_hex($post->{args}->{uuid});
}
}

my $encoded;
eval {
$encoded = encode_json($post);
Expand Down
19 changes: 17 additions & 2 deletions src/os/as400/connector/mode/disks.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,18 @@ sub new {
return $self;
}

sub check_options {
my ($self, %options) = @_;
$self->SUPER::check_options(%options);

$self->{uuid} = '';
foreach ('filter_counters', 'filter_disk_name') {
if (defined($self->{option_results}->{$_}) && $self->{option_results}->{$_} ne '') {
$self->{uuid} .= $self->{option_results}->{$_};
}
}
}

my $map_disk_status = {
0 => 'noUnitControl', 1 => 'active', 2 => 'failed',
3 => 'otherDiskSubFailed', 4 => 'hwFailurePerf', 5 => 'hwFailureOk',
Expand All @@ -178,9 +190,12 @@ my $map_disk_status = {
sub manage_selection {
my ($self, %options) = @_;

my %cmd = (command => 'listDisks');
my %cmd = (command => 'listDisks', args => {});
if (defined($self->{option_results}->{disk_name}) && $self->{option_results}->{disk_name} ne '') {
$cmd{args} = { diskName => $self->{option_results}->{disk_name} };
$cmd{args}->{diskName} = $self->{option_results}->{disk_name};
}
if ($self->{uuid} ne '') {
$cmd{args}->{uuid} = $self->{uuid};
}
my $disks = $options{custom}->request_api(%cmd);

Expand Down
18 changes: 17 additions & 1 deletion src/os/as400/connector/mode/jobs.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,26 @@ sub new {
return $self;
}

sub check_options {
my ($self, %options) = @_;
$self->SUPER::check_options(%options);

$self->{uuid} = '';
foreach ('filter_counters', 'filter_name', 'filter_active_status', 'filter_subsystem') {
if (defined($self->{option_results}->{$_}) && $self->{option_results}->{$_} ne '') {
$self->{uuid} .= $self->{option_results}->{$_};
}
}
}

sub manage_selection {
my ($self, %options) = @_;

my $jobs = $options{custom}->request_api(command => 'listJobs');
my %cmd = (command => 'listJobs', args => {});
if ($self->{uuid} ne '') {
$cmd{args}->{uuid} = $self->{uuid};
}
my $jobs = $options{custom}->request_api(%cmd);

$self->{global} = { total => 0 };
foreach my $entry (@{$jobs->{result}}) {
Expand Down
2 changes: 1 addition & 1 deletion src/os/as400/connector/mode/listdisks.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ sub check_options {
sub manage_selection {
my ($self, %options) = @_;

return $options{custom}->request_api(command => 'listDisks');
return $options{custom}->request_api(command => 'listDisks', args => { uuid => 'svc-discovery' });
}

my $map_disk_status = {
Expand Down
2 changes: 1 addition & 1 deletion src/os/as400/connector/mode/listsubsystems.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ sub check_options {
sub manage_selection {
my ($self, %options) = @_;

return $options{custom}->request_api(command => 'listSubsystems');
return $options{custom}->request_api(command => 'listSubsystems', args => { uuid => 'svc-discovery' });
}

my $map_subsys_status = {
Expand Down
18 changes: 17 additions & 1 deletion src/os/as400/connector/mode/subsystems.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,18 @@ sub new {
return $self;
}

sub check_options {
my ($self, %options) = @_;
$self->SUPER::check_options(%options);

$self->{uuid} = '';
foreach ('filter_counters', 'filter_subsystem_name', 'filter_subsystem_library') {
if (defined($self->{option_results}->{$_}) && $self->{option_results}->{$_} ne '') {
$self->{uuid} .= $self->{option_results}->{$_};
}
}
}

my $map_subsys_status = {
'*ACTIVE' => 'active',
'*ENDING' => 'ending',
Expand All @@ -139,7 +151,11 @@ my $map_subsys_status = {
sub manage_selection {
my ($self, %options) = @_;

my $subsys = $options{custom}->request_api(command => 'listSubsystems');
my %cmd = (command => 'listSubsystems', args => {});
if ($self->{uuid} ne '') {
$cmd{args}->{uuid} = $self->{uuid};
}
my $subsys = $options{custom}->request_api(%cmd);

$self->{global} = { total => 0, active => 0, ending => 0, inactive => 0, restricted => 0, starting => 0 };
$self->{subsys} = {};
Expand Down