From c02fa63c579bb7e7b42e87b338aed2bf66585f61 Mon Sep 17 00:00:00 2001 From: zhaoertao Date: Wed, 16 May 2012 05:48:10 +0000 Subject: [PATCH] fix bug 3500317:FB->update the usage & manpage for hw commands git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@12728 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-client/pods/man1/getmacs.1.pod | 2 +- xCAT-client/pods/man1/lshwconn.1.pod | 6 +++--- xCAT-client/pods/man1/mkhwconn.1.pod | 4 ++-- xCAT-client/pods/man1/rinv.1.pod | 4 ++-- xCAT-client/pods/man1/rmhwconn.1.pod | 4 ++-- xCAT-client/pods/man1/rpower.1.pod | 2 +- xCAT-client/pods/man1/rscan.1.pod | 8 ++++---- xCAT-client/pods/man1/rspconfig.1.pod | 10 +++------- 8 files changed, 18 insertions(+), 22 deletions(-) diff --git a/xCAT-client/pods/man1/getmacs.1.pod b/xCAT-client/pods/man1/getmacs.1.pod index 31d1610ae..18ae4c0da 100644 --- a/xCAT-client/pods/man1/getmacs.1.pod +++ b/xCAT-client/pods/man1/getmacs.1.pod @@ -30,7 +30,7 @@ For PPC (without HMC, using Direct FSP Management) specific: Note: If network adapters are physically assigned to LPARs, getmacs cannot read the MAC addresses unless perform ping test, since there is no HMC command to read them and getmacs has to login to open formware. And if the LPARs has never been activated before, getmacs need to be performed with the option "B<-D>" to get theirs MAC addresses. -For Firebird blade specific: +For IBM Flex Compute Node (Compute Node for short) specific: Note: If "B<-d>" is specified, all the MAC of the blades will be displayed. Otherwise, the number of MAC address that the 'installnic' attribute of the blade specified will be write to mac table. diff --git a/xCAT-client/pods/man1/lshwconn.1.pod b/xCAT-client/pods/man1/lshwconn.1.pod index 9e968b62d..0a31ad0db 100644 --- a/xCAT-client/pods/man1/lshwconn.1.pod +++ b/xCAT-client/pods/man1/lshwconn.1.pod @@ -1,6 +1,6 @@ =head1 NAME -B - Use this command to display the connection status for CEC, Frame and Firebird nodes. +B - Use this command to display the connection status for CEC, Frame and IBM Flex Compute Nodes (Compute Node for short). =head1 SYNOPSIS @@ -18,7 +18,7 @@ B I B<-T> I =head1 DESCRIPTION -This command is used to display the connection status for CEC, Frame and Firebird nodes. +This command is used to display the connection status for CEC, Frame and Compute Nodes. =head1 OPTIONS @@ -34,7 +34,7 @@ Verbose output. =item B<-T> -The tooltype is used to communicate to the CEC/Frame/Firebird. The value could be lpar or fnm. The tooltype value lpar is for xCAT and fnm is for CNM. +The tooltype is used to communicate to the CEC/Frame/Compute Node. The value could be lpar or fnm. The tooltype value lpar is for xCAT and fnm is for CNM. =back diff --git a/xCAT-client/pods/man1/mkhwconn.1.pod b/xCAT-client/pods/man1/mkhwconn.1.pod index c47a62ded..76ecda485 100644 --- a/xCAT-client/pods/man1/mkhwconn.1.pod +++ b/xCAT-client/pods/man1/mkhwconn.1.pod @@ -41,7 +41,7 @@ Note: If a CEC belongs to a frame, which has a BPA installed, this CEC should no For PPC (using Direct FSP Management) specific: -It is used to set up connections for CEC, Frame and Firebird node to Hardware Server on management node (or service node ). It only could be done according to the node definition in xCAT DB. And this command will try to read the user/password from the ppcdirect table (for Firebird, from mpa table) first. If fails, then read them from passwd table. +It is used to set up connections for CEC, Frame and IBM Flex Compute Node (Compute Node for short) to Hardware Server on management node (or service node ). It only could be done according to the node definition in xCAT DB. And this command will try to read the user/password from the ppcdirect table (for Compute Node, from mpa table) first. If fails, then read them from passwd table. Commonly , the username is B. If using the B table, each CEC/Frame and user/password should be stored in B table. If using the B table, the key should be "B" or "B", and the related user/password are stored in B table. When B<--port> is specified, this command will create the connections for CECs/Frames whose side in B table is equal to port value. @@ -127,7 +127,7 @@ To setup the connection between the frame and it's SFP node. This command will a =item 6. -To setup the connection between the Firebird and hardware server: +To setup the connection between the Compute Node and hardware server: mkhwconn blade -t diff --git a/xCAT-client/pods/man1/rinv.1.pod b/xCAT-client/pods/man1/rinv.1.pod index 918e2ad62..dbb0c067c 100644 --- a/xCAT-client/pods/man1/rinv.1.pod +++ b/xCAT-client/pods/man1/rinv.1.pod @@ -20,7 +20,7 @@ B I {B} B I {B [B<-x>]} -=head2 NGP Blade Server Specific: +=head2 IBM Flex System Compute Node Specific: B I {B} @@ -128,7 +128,7 @@ Set the values in the vm table to what vCenter has for the indicated nodes. =item * -To retrieve all information available from blade node4, enter: +To retrieve all information available from blade node5, enter: rinv node5 all diff --git a/xCAT-client/pods/man1/rmhwconn.1.pod b/xCAT-client/pods/man1/rmhwconn.1.pod index 6c37e47ef..34813920e 100644 --- a/xCAT-client/pods/man1/rmhwconn.1.pod +++ b/xCAT-client/pods/man1/rmhwconn.1.pod @@ -30,7 +30,7 @@ Note: If a CEC belongs to a frame with a BPA installed, this CEC cannot be disco For PPC (without HMC, using FSPAPI) specific: -It's used to disconnection CEC, Frame and Firebird nodes from hardware server. +It's used to disconnection CEC, Frame and IBM Flex Compute Nodes (Compute Node for short) from hardware server. For PPC (use HMC as SFP) specific: @@ -85,7 +85,7 @@ To disconnect all CEC nodes in node group cec from their related hardware servic =item 4. -To disconnect all Firebird nodes from there related hardware service: +To disconnect all Compute Nodes from there related hardware service: rmhwconn blade diff --git a/xCAT-client/pods/man1/rpower.1.pod b/xCAT-client/pods/man1/rpower.1.pod index 1e2fdab58..218af559e 100644 --- a/xCAT-client/pods/man1/rpower.1.pod +++ b/xCAT-client/pods/man1/rpower.1.pod @@ -108,7 +108,7 @@ This option is recommended over B. =item B -Power off, then on. For Firebird blade, just reset the blade. +Power off, then on. For IBM Flex Compute Node, just reset the node. =item B diff --git a/xCAT-client/pods/man1/rscan.1.pod b/xCAT-client/pods/man1/rscan.1.pod index 8ac446a29..d663ffa60 100644 --- a/xCAT-client/pods/man1/rscan.1.pod +++ b/xCAT-client/pods/man1/rscan.1.pod @@ -15,7 +15,7 @@ I The rscan command lists hardware information for each node managed by the hardware control points specified in noderange. -For the management module of blade, if the blade server is a NGP power blade, the fsp belongs to the blade server also will be scanned. +For the management module of blade, if the blade server is an IBM Flex System Compute Node (compute node for short), the fsp belongs to the blade server also will be scanned. Note: The first line of the output always contains information about the hardware control point. When using the rscan command to generate output for HMC or IVM hardware control points, it provides the FSPs and BPAs as part of the output. The only exception is the rscan -u flag which provides updates made hardware control point in the xCAT database. @@ -31,7 +31,7 @@ B<-V> Verbose output. B<-u> Updates and then prints out node definitions in the xCAT database for CEC/BPA. It updates the existing nodes that contain the same mtms and serial number for nodes managed by the specified hardware control point. This primarily works with CEC/FSP and frame/BPA nodes when the node name is not the same as the managed system name on hardware control point (HMC), This flag will update the BPA/FSP node name definitions to be listed as the managed system name in the xCAT database. -For the NGP blade server, both the blade server and fsp object of xCAT will be updated if the mpa and slot id are matched to the object which has been defined in the xCAT database. +The Compute Node object of xCAT will be updated if the mpa and slot id are matched to the object which has been defined in the xCAT database. Note: only the matched object will be updated. @@ -201,7 +201,7 @@ Output is similar to: groups=all mgt=zvm -6. To scan the NGP blade center: +6. To scan the Compute Node: I @@ -212,7 +212,7 @@ Output is similar to: blade SN#YL10JH184067 1 789542X 10F752A cmm01 12.0.0.9 blade SN#YL10JH184079 3 789542X 10F697A cmm01 12.0.0.11 -7. To update the NGP blade server: +7. To update the Compute Node: I diff --git a/xCAT-client/pods/man1/rspconfig.1.pod b/xCAT-client/pods/man1/rspconfig.1.pod index c729f37c3..cff463a1d 100644 --- a/xCAT-client/pods/man1/rspconfig.1.pod +++ b/xCAT-client/pods/man1/rspconfig.1.pod @@ -92,7 +92,7 @@ B I B={B<*|name>} B I B<--resetnet> -=head2 NGP Blade Server Specific: +=head2 IBM Flex Compute Node Specific: B I B={B|B} @@ -326,7 +326,7 @@ The subnet mask. For MPA: get or set the MPA network parameters. If '*' is specified, all parameters are read from the xCAT database. -For FSP of NGP blade server: set the network parameters. If '*' is specified, all parameters are read from the xCAT database. If the object node is blade, the 'host' parameter shall not specified. +For IBM Flex Compute Node (Compute Node for short):set the network parameters. If '*' is specified, all parameters are read from the xCAT database. If the object node is blade, the 'host' parameter shall not specified. =item B={[I],[I],[I],[I]|*} @@ -419,13 +419,9 @@ Enter the current time in UTC (Coordinated Universal Time) format. Set the blade or MPA textid. When using '*', the textid used is the node name specified on the command-line. Note that when specifying an actual textid, only a single node can be specified in the noderange. -=item B={I} - -Change the password of the userid B for CMM in NGP environment. - =item B={I} -Change the password of the userid B for CMM in NGP environment. +Change the password of the userid B for CMM. =item B<--resetnet>