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.

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

fix(sun-mgmt): the default plink command was not applied #5369

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions src/apps/salesforce/restapi/custom/api.pm
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ sub request_api {
$self->{output}->option_exit();
}
if ($self->{http}->get_code() != 200) {
$self->{output}->add_option_msg(short_msg => "Connection issue: " . $decoded->{message});
$self->{output}->add_option_msg(short_msg => "Connection issue: " . defined($decoded->{message}) ? $decoded->{message} : '');
$self->{output}->option_exit();
}

Expand All @@ -125,27 +125,27 @@ __END__

=head1 NAME

SFDC API boilerplate
Monitor SFDC API boilerplate

=head1 SYNOPSIS

Get informations from SFDC API
Get information from SFDC API

=head1 REST API OPTIONS

=over 8

=item B<--hostname>

Set hostname to query (default: 'api.status.salesforce.com')
Define the hostname to query (default: C<api.status.salesforce.com>)

=item B<--timeout>

Set HTTP timeout in seconds (default: '10').
Define the HTTP timeout in seconds (default: '10').

=item B<--api-version>

API version (default: 'v1').
Define the API version (default: 'v1').

=back

Expand Down
14 changes: 7 additions & 7 deletions src/hardware/server/sun/mgmt_cards/mode/showfaults.pm
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ sub check_options {
command => $self->{option_results}->{command_plink}
);

$self->{option_results}->{command} = 'plink'
if (!defined($self->{option_results}->{command}) || $self->{option_results}->{command} eq '');
$self->{option_results}->{command_plink} = 'plink'
if (!defined($self->{option_results}->{command_plink}) || $self->{option_results}->{command_plink} eq '');
}

sub run {
Expand Down Expand Up @@ -132,25 +132,25 @@ __END__

=head1 MODE

Check Sun 'T1xxx', 'T2xxx' Hardware (through ALOM4v).
Check Sun C<T1xxx>, C<T2xxx> management cards hardware (using C<ALOM4v>).

=over 8

=item B<--hostname>

Hostname to query.
Define the hostname to query.

=item B<--username>

ssh username.
Define the ssh username.

=item B<--password>

ssh password.
Define the ssh password.

=item B<--command-plink>

Plink command (default: plink). Use to set a path.
Define the C<plink> command (default: C<plink>).

=item B<--timeout>

Expand Down
20 changes: 10 additions & 10 deletions src/hardware/server/sun/mgmt_cards/mode/showfaulty.pm
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,8 @@ sub check_options {
command => $self->{option_results}->{command_plink}
);

$self->{option_results}->{command} = 'plink'
if (!defined($self->{option_results}->{command}) || $self->{option_results}->{command} eq '');
$self->{option_results}->{command_plink} = 'plink'
if (!defined($self->{option_results}->{command_plink}) || $self->{option_results}->{command_plink} eq '');
}

sub run {
Expand Down Expand Up @@ -185,29 +185,29 @@ __END__

=head1 MODE

Check Sun 'T3-x', 'T4-x' and 'T5xxx' Hardware (through ILOM).
Check Sun C<T3-x>, C<T4-x> and C<T5xxx> management cards hardware (using C<ILOM>).

=over 8

=item B<--hostname>

Hostname to query.
Define the hostname to query.

=item B<--username>

ssh username.
Define the ssh username.

=item B<--password>

ssh password.
Define the ssh password.

=item B<--memory>
=item B<--command-plink>

Returns new errors (retention file is used by the following option).
Define the C<plink> command (default: C<plink>).

=item B<--command-plink>
=item B<--memory>

Plink command (default: plink). Use to set a path.
Returns new errors (retention file is used by the following option).

=item B<--timeout>

Expand Down
5 changes: 3 additions & 2 deletions tests/resources/spellcheck/stopwords.txt
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ hashicorpvault
HPE
Huawei
ifAlias
includeAllDisks
ifDesc
ifName
IMEI
in-bcast
includeAllDisks
in-crc
in-fcserror
in-mcast
Expand Down Expand Up @@ -128,6 +128,7 @@ RRDCached
Sansymphony
SAS
scenarii
SFDC
sfp.temperature
SkyHigh
SNMP
Expand All @@ -144,8 +145,8 @@ Teldat
timeframe
TiMOS
tmnxSasAlarmInputDescription
total-oper-up
total-oper-down
total-oper-up
TrendMicro
tsdb-version
UCD
Expand Down
Loading