xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-30 19:02:27 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4424 from whowutwut/update_bmcdiscover_help

Browse Source 
Update the bmcdiscover man page , remove --check and --ipsource options.
This commit is contained in:
zet809
2017-12-07 14:53:56 +08:00
committed by GitHub
parent e501b26fd0 8df92b9825
commit 244766724f
4 changed files with 4 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,10 +25,6 @@ SYNOPSIS
\ **bmcdiscover**\ [\ **-**\ **-sn**\ \ *SN_nodename*\ ] [\ **-s**\ \ *scan_method*\ ] [\ **-u**\ \ *bmc_user*\ ] [\ **-p**\ \ *bmc_passwd*\ ] [\ **-z**\ ] [\ **-w**\ ] \ **-**\ **-range**\ \ *ip_ranges*\
\ **bmcdiscover**\ \ **-u**\ \ *bmc_user*\ \ **-p**\ \ *bmc_passwd*\ \ **-i**\ \ *bmc_ip*\ \ **-**\ **-check**\
\ **bmcdiscover**\ [\ **-u**\ \ *bmc_user*\ ] [\ **-p**\ \ *bmc_passwd*\ ] \ **-i**\ \ *bmc_ip*\ \ **-**\ **-ipsource**\
***********
DESCRIPTION
@@ -98,18 +94,6 @@ OPTIONS
\ **-**\ **-check**\
Check BMC administrator User/Password.
\ **-**\ **-ipsource**\
Display the BMC IP configuration.
\ **-h|-**\ **-help**\
Display usage message
@@ -187,22 +171,6 @@ Output is similar to:
bmcdiscover -s nmap --range "10.4.22-23.100-254" -w -z
5. To check if the username or password is correct against the BMC:
.. code-block:: perl
bmcdiscover -i 10.4.23.254 -u USERID -p PASSW0RD --check
6. Get BMC IP Address source, DHCP Address or static Address
.. code-block:: perl
bmcdiscover -i 10.4.23.254 -u USERID -p PASSW0RD --ipsource
********
SEE ALSO

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

@@ -10,10 +10,6 @@ B<bmcdiscover> [B<-v>|B<--version>]
B<bmcdiscover> [B<--sn> I<SN_nodename>] [B<-s> I<scan_method>] [B<-u> I<bmc_user>] [B<-p> I<bmc_passwd>] [B<-z>] [B<-w>] B<--range> I<ip_ranges>
B<bmcdiscover> B<-u> I<bmc_user> B<-p> I<bmc_passwd> B<-i> I<bmc_ip> B<--check>
B<bmcdiscover> [B<-u> I<bmc_user>] [B<-p> I<bmc_passwd>] B<-i> I<bmc_ip> B<--ipsource>
=head1 DESCRIPTION
@@ -61,14 +57,6 @@ BMC user name.
BMC user password.
=item B<--check>
Check BMC administrator User/Password.
=item B<--ipsource>
Display the BMC IP configuration.
=item B<-h|--help>
Display usage message
@@ -117,14 +105,6 @@ Output is similar to:
bmcdiscover -s nmap --range "10.4.22-23.100-254" -w -z
5. To check if the username or password is correct against the BMC:
bmcdiscover -i 10.4.23.254 -u USERID -p PASSW0RD --check
6. Get BMC IP Address source, DHCP Address or static Address
bmcdiscover -i 10.4.23.254 -u USERID -p PASSW0RD --ipsource
=head1 SEE ALSO
L<lsslp(1)|lsslp.1>

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

@@ -194,12 +194,6 @@ sub bmcdiscovery_usage {
push @{ $rsp->{data} }, "\tbmcdiscover [-v|--version]";
push @{ $rsp->{data} }, "\tbmcdiscover [--sn <SN_nodename>] [-s scan_method] [-u bmc_user] [-p bmc_passwd] [-z] [-w] --range ip_range\n";
push @{ $rsp->{data} }, "\tCheck BMC administrator User/Password:\n";
push @{ $rsp->{data} }, "\t\tbmcdiscover -u bmc_user -p bmc_password -i bmc_ip --check\n";
push @{ $rsp->{data} }, "\tDisplay the BMC IP configuration:\n";
push @{ $rsp->{data} }, "\t\tbmcdiscover [-u bmc_user] [-p bmc_passwd] -i bmc_ip --ipsource";
xCAT::MsgUtils->message("I", $rsp, $::CALLBACK);
return 0;
}

20
xCAT-test/autotest/testcase/bmcdiscover/cases0
View File

@@ -50,20 +50,14 @@ end
start:bmcdiscover_check_paswd
cmd:bmcdiscover -i $$bmcrange -u $$bmcusername -p $$bmcpasswd --check
check:rc==0
check:output=~Correct ADMINISTRATOR
end
start:bmcdiscover_check_passwd_wrong
cmd:bmcdiscover -i $$bmcrange -u $$bmcusername -p test$$bmcpasswd --check
check:rc==0
check:output=~Invalid username or password | Wrong BMC password
check:rc==1
check:output=~is not supported
end
start:bmcdiscover_get_ipsource
cmd:bmcdiscover -i $$bmcrange -u $$bmcusername -p $$bmcpasswd --ipsource
check:rc==0
check:output=~Static Address
check:rc==1
check:output=~is not supported
end
start:bmcdiscover_range_w
@@ -73,12 +67,6 @@ check:output=~Writing node
check:output=~$$bmcrange,\w*,\w*,$$bmcusername,$$bmcpasswd
end
start:bmcdiscover_range_u_p_i_ipsource
description:check the bmcrange is which type address
cmd:bmcdiscover -i $$bmcrange -u $$bmcusername -p $$bmcpasswd --ipsource
check:rc==0
check:output=~IP Address Source : Static Address
end
start:bmcdiscover_range_z
cmd:bmcdiscover --range $$bmcrange -u $$bmcusername -p $$bmcpasswd -z
check:rc==0