xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-29 09:13:08 +00:00
Code Issues Releases Wiki Activity

Fix bmcdiscover usage after code review

Browse Source 
- change the bmcpwd option to bmcpasswd
This commit is contained in:
Victor Hu 2016-03-21 15:50:36 -04:00
parent 582b9d68d5
commit d21f29b5bf
3 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/source/guides/admin-guides/references/man1/bmcdiscover.1.rst
View File

@ -19,13 +19,15 @@ SYNOPSIS
********
\ **bmcdiscover**\ [\ **-?**\ |\ **-h**\ |\ **--help**\ ]
\ **bmcdiscover**\ [\ **-? | -h | -**\ **-help**\ ]
\ **bmcdiscover**\ [\ **-v**\ |\ **--version**\ ]
\ **bmcdiscover**\ [\ **-v | -**\ **-version**\ ]
\ **bmcdiscover**\ [\ **-s**\ \ *scan_method*\ ] \ **--range**\ \ *ip_ranges*\ [\ **-z**\ ] [\ **-w**\ ] [\ **-t**\ ]
\ **bmcdiscover**\ [\ **-s**\ \ *scan_method*\ ] \ **-**\ **-range**\ \ *ip_ranges*\ [\ **-z**\ ] [\ **-w**\ ] [\ **-t**\ ]
\ **bmcdiscover**\ [\ **-i**\ |\ **--bmcip**\ ] \ *bmc_ip*\ [\ **-u**\ |\ **--bmcuser**\ ] \ *bmcusername*\ [\ **-p**\ |\ **--bmcpwd**\ ] \ *bmcpassword*\ (\ **-c**\ |\ **--check**\ |\ **--ipsource**\ )
\ **bmcdiscover**\ {\ **-i | -**\ **-bmcip**\ } \ *bmc_ip*\ {\ **-u | -**\ **-bmcuser**\ } \ *bmc_username*\ {\ **-p | -**\ **-bmcpasswd**\ } \ *bmc_password*\ \ **-**\ **-check**\
\ **bmcdiscover**\ {\ **-i | -**\ **-bmcip**\ } \ *bmc_ip*\ {\ **-u | -**\ **-bmcuser**\ } \ *bmc_username*\ {\ **-p | -**\ **-bmcpasswd**\ } \ *bmc_password*\ \ **-**\ **-ipsource**\
***********
@ -90,7 +92,7 @@ OPTIONS
\ **-p|-**\ **-bmcpwd**\
\ **-p|-**\ **-bmcpasswd**\
BMC user password.

6
xCAT-client/pods/man1/bmcdiscover.1.pod
View File

@ -10,7 +10,9 @@ B<bmcdiscover> [B<-v>|B<--version>]
B<bmcdiscover> [B<-s> I<scan_method>] B<--range> I<ip_ranges> [B<-z>] [B<-w>] [B<-t>]
B<bmcdiscover> [B<-i>|B<--bmcip>] I<bmc_ip> [B<-u>|B<--bmcuser>] I<bmcusername> [B<-p>|B<--bmcpwd>] I<bmcpassword> (B<-c>|B<--check>|B<--ipsource>)
B<bmcdiscover> {B<-i>|B<--bmcip>} I<bmc_ip> {B<-u>|B<--bmcuser>} I<bmc_username> {B<-p>|B<--bmcpasswd>} I<bmc_password> B<--check>
B<bmcdiscover> {B<-i>|B<--bmcip>} I<bmc_ip> {B<-u>|B<--bmcuser>} I<bmc_username> {B<-p>|B<--bmcpasswd>} I<bmc_password> B<--ipsource>
=head1 DESCRIPTION
@ -55,7 +57,7 @@ BMC IP address.
BMC user name.
=item B<-p|--bmcpwd>
=item B<-p|--bmcpasswd>
BMC user password.

15
xCAT-server/lib/xcat/plugins/bmcdiscover.pm
View File

@ -110,11 +110,12 @@ sub process_request
sub bmcdiscovery_usage {
my $rsp;
push @{ $rsp->{data} }, "\nbmcdiscover - Discover BMC (Baseboard Management Controller) using the specified scan method\n";
push @{ $rsp->{data} }, "Usage:\tbmcdiscover [-?|-h|--help]";
push @{ $rsp->{data} }, "Usage:";
push @{ $rsp->{data} }, "\tbmcdiscover [-?|-h|--help]";
push @{ $rsp->{data} }, "\tbmcdiscover [-v|--version]";
push @{ $rsp->{data} }, "\tbmcdiscover [-s scan_method] --range ip_range [-z] [-w] [-t]";
push @{ $rsp->{data} }, "\tbmcdiscover [-i|--bmcip] bmc_ip [-u|--bmcuser] bmcusername [-p|--bmcpwd] bmcpassword (-c | --check | --ipsource)";
push @{ $rsp->{data} }, "\nFor more details see bmcdiscover(1)";
push @{ $rsp->{data} }, "\tbmcdiscover {-i|--bmcip} bmc_ip {-u|--bmcuser} bmc_user {-p|--bmcpasswd} bmc_password --check";
push @{ $rsp->{data} }, "\tbmcdiscover {-i|--bmcip} bmc_ip {-u|--bmcuser} bmc_user {-p|--bmcpasswd} bmc_password --ipsource";
xCAT::MsgUtils->message( "I", $rsp, $::CALLBACK );
return 0;
@ -156,9 +157,9 @@ sub bmcdiscovery_processargs {
'bmcip|i=s' => \$::opt_I,
'z' => \$::opt_Z,
'w' => \$::opt_W,
'check|c' => \$::opt_C,
'check' => \$::opt_C,
'bmcuser|u=s' => \$::opt_U,
'bmcpwd|p=s' => \$::opt_P,
'bmcpasswd|p=s' => \$::opt_P,
'ipsource' => \$::opt_S,
'version|v' => \$::opt_v,
't' => \$::opt_T,
@ -257,7 +258,7 @@ sub bmcdiscovery_processargs {
if (!defined($::opt_I)) {
$msg = "The check option requires a BMC IP. Specify the IP using the -i|--bmcip option.";
} elsif (!defined($::opt_P)) {
$msg = "The check option requires a password. Specify the password with the -p|--bmcpwd option.";
$msg = "The check option requires a password. Specify the password with the -p|--bmcpasswd option.";
}
my $rsp = {};
push @{ $rsp->{data} }, "$msg";
@ -280,7 +281,7 @@ sub bmcdiscovery_processargs {
if (!defined($::opt_I)) {
$msg = "The ipsource option requires a BMC IP. Specify the IP using the -i|--bmcip option.";
} elsif (!defined($::opt_P)) {
$msg = "The ipsource option requires a password. Specify the password with the -p|--bmcpwd option.";
$msg = "The ipsource option requires a password. Specify the password with the -p|--bmcpasswd option.";
}
my $rsp = {};
push @{ $rsp->{data} }, "$msg";