diff --git a/docs/source/guides/admin-guides/references/man1/bmcdiscover.1.rst b/docs/source/guides/admin-guides/references/man1/bmcdiscover.1.rst index 6fde20bb8..b341c4d92 100644 --- a/docs/source/guides/admin-guides/references/man1/bmcdiscover.1.rst +++ b/docs/source/guides/admin-guides/references/man1/bmcdiscover.1.rst @@ -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 diff --git a/xCAT-client/pods/man1/bmcdiscover.1.pod b/xCAT-client/pods/man1/bmcdiscover.1.pod index fc9ddfe5a..20ffd84b4 100644 --- a/xCAT-client/pods/man1/bmcdiscover.1.pod +++ b/xCAT-client/pods/man1/bmcdiscover.1.pod @@ -10,10 +10,6 @@ B [B<-v>|B<--version>] B [B<--sn> I] [B<-s> I] [B<-u> I] [B<-p> I] [B<-z>] [B<-w>] B<--range> I -B B<-u> I B<-p> I B<-i> I B<--check> - -B [B<-u> I] [B<-p> I] B<-i> I 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 diff --git a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm index 568b8a9d6..0178024b7 100644 --- a/xCAT-server/lib/xcat/plugins/bmcdiscover.pm +++ b/xCAT-server/lib/xcat/plugins/bmcdiscover.pm @@ -194,12 +194,6 @@ sub bmcdiscovery_usage { push @{ $rsp->{data} }, "\tbmcdiscover [-v|--version]"; push @{ $rsp->{data} }, "\tbmcdiscover [--sn ] [-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; } diff --git a/xCAT-test/autotest/testcase/bmcdiscover/cases0 b/xCAT-test/autotest/testcase/bmcdiscover/cases0 index da39b4d41..213ab0921 100644 --- a/xCAT-test/autotest/testcase/bmcdiscover/cases0 +++ b/xCAT-test/autotest/testcase/bmcdiscover/cases0 @@ -51,19 +51,13 @@ 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: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: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