From 9b1e93367a9cadb06812ba80b13567c71ec1cce2 Mon Sep 17 00:00:00 2001 From: zhaoertao Date: Fri, 5 Aug 2011 09:17:27 +0000 Subject: [PATCH] fix bugs 3386473, update manpages git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10234 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-client/pods/man1/lshwconn.1.pod | 16 +++++----- xCAT-client/pods/man1/mkhwconn.1.pod | 44 ++++++++++++++-------------- xCAT-client/pods/man1/rmhwconn.1.pod | 20 ++++++------- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/xCAT-client/pods/man1/lshwconn.1.pod b/xCAT-client/pods/man1/lshwconn.1.pod index 56de2333b..6e958831e 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 FSP and BPA nodes. +B - Use this command to display the connection status for CEC and Frame nodes. =head1 SYNOPSIS @@ -18,7 +18,7 @@ B I B<-T> I =head1 DESCRIPTION -This command is used to display the connection status for FSP and BPA node. +This command is used to display the connection status for CEC and Frame node. =head1 OPTIONS @@ -34,7 +34,7 @@ Verbose output. =item B<-T> -The tooltype is used to communicate to the FSP/BPA. 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. The value could be lpar or fnm. The tooltype value lpar is for xCAT and fnm is for CNM. =back @@ -51,9 +51,9 @@ The tooltype is used to communicate to the FSP/BPA. The value could be lpar or f =item 1. -To display connection status for all FSP nodes in node group fsp: +To display connection status for all CEC nodes in node group CEC: - lshwconn fsp + lshwconn cec Output is similar to: @@ -62,7 +62,7 @@ Output is similar to: =item 2. -To display connection status for BPA node frame1: +To display connection status for Frame node frame1: lshwconn frame1 @@ -73,9 +73,9 @@ Output is similar to: =item 3. -To display connection status for all FSP nodes in node group fsp to hardware server, and using lpar tooltype: +To display connection status for all CEC nodes in node group CEC to hardware server, and using lpar tooltype: - lshwconn fsp -T lpar + lshwconn cec -T lpar Output is similar to: diff --git a/xCAT-client/pods/man1/mkhwconn.1.pod b/xCAT-client/pods/man1/mkhwconn.1.pod index 481a3b64c..bc0e0ef34 100644 --- a/xCAT-client/pods/man1/mkhwconn.1.pod +++ b/xCAT-client/pods/man1/mkhwconn.1.pod @@ -1,6 +1,6 @@ =head1 NAME -B - Sets up connections for FSP and BPA nodes to HMC nodes or hardware server. +B - Sets up connections for CEC and Frame nodes to HMC nodes or hardware server. =head1 SYNOPSIS @@ -24,26 +24,26 @@ B I B<-t> [B<-T tooltype>] [B<--port> I] For PPC (with HMC) specific: -This command is used to set up connections for FSP and BPA nodes to HMC nodes. (If the connection already exists, it will not break it.) -This command is useful when you have multiple HMCs, each of which will manage a subset of the FSPs/BPAs. Use B to tell -each HMC which FSPs/BPAs it should manage. When using this, you should turn off the self-discovery on each HMC. You also need -to put all the HMCs and all the BPAs on a single flat service network. +This command is used to set up connections for CEC and Frame nodes to HMC nodes. (If the connection already exists, it will not break it.) +This command is useful when you have multiple HMCs, each of which will manage a subset of the CECs/Frames. Use B to tell +each HMC which CECs/Frames it should manage. When using this, you should turn off the self-discovery on each HMC. You also need +to put all the HMCs and all the Frames on a single flat service network. -When B<-t> is specified, this command reads the connection information from the xCAT ppc table (e.g. the parent attribute), and read the user/password from the ppcdirect table. Then this command will assign FSP nodes and BPA nodes to HMC nodes. +When B<-t> is specified, this command reads the connection information from the xCAT ppc table (e.g. the parent attribute), and read the user/password from the ppcdirect table. Then this command will assign CEC nodes and Frame nodes to HMC nodes. -When B<-p> is specified, this command gets the connection information from command line arguments. If B<-P> is not specified, the default password for FSP and BPA nodes is used. +When B<-p> is specified, this command gets the connection information from command line arguments. If B<-P> is not specified, the default password for CEC and Frame nodes is used. The flag B<-s> is used to make the connection between the frame and its Service focal point(HMC). Makehwconn will also set the connections between the CECs within this Frame and the HMC. The sfp of the frame/CEC can either be defined in ppc table beforehand or specified in command line after the flag -s. If the user use mkhwconn noderange -s HMC_name, it will not only make the connections but also set the sfp attributes for these nodes in PPC table. -In any case, before running this command, the FSP and BPA nodes need be defined with correct nodetype.nodetype value (fsp or bpa) and nodehm.mgt value (hmc). +In any case, before running this command, the CEC and Frame nodes need be defined with correct nodetype.nodetype value (cec or frame) and nodehm.mgt value (hmc). -Note: If a CEC (FSP) belongs to a frame, which has a BPA installed, this CEC should not be assigned to an HMC individually. Instead, the whole frame (BPA) should be assigned to the HMC. +Note: If a CEC belongs to a frame, which has a BPA installed, this CEC should not be assigned to an HMC individually. Instead, the whole frame should be assigned to the HMC. For PPC (using Direct FSP Management) specific: -It is used to set up connections for FSP and BPA 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 firstly. If fails, then read them from passwd table. Commonly , the username is B. If using the B table, each FSP/BPA 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. +It is used to set up connections for CEC and Frame 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 firstly. 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 FSPs/BPAs whose side in B table is equal to port value. +When B<--port> is specified, this command will create the connections for CECs/Frames whose side in B table is equal to port value. =head1 OPTIONS @@ -55,7 +55,7 @@ Display usage message. =item B<-t> -Read connection information from xCAT DB (ppc and ppcdirect tables). Use this option if you need to connect multiple FSPs/BPAs +Read connection information from xCAT DB (ppc and ppcdirect tables). Use this option if you need to connect multiple CECs/Frames to multiple HMCs in a single command. =item B<-p> @@ -64,15 +64,15 @@ The HMC node name. Only one HMC nodes can be specified by this flag. To setup co =item B<-P> -The password of HMC based FSP/BPA login user(Default user name is 'HMC'). This flag is optional. +The password of HMC based CEC/Frame login user(Default user name is 'HMC'). This flag is optional. =item B<-T> -The tooltype is used to communicate to the FSP/BPA. The value could be B or B. The tooltype value B is for xCAT and B is for CNM. The default value is "B". +The tooltype is used to communicate to the CEC/Frame. The value could be B or B. The tooltype value B is for xCAT and B is for CNM. The default value is "B". =item B<--port> -The port value specify which side will be used to create the connection to the FSP/BPA. The value could be "B<0>" or "B<1>". If this port value is not specfied in the command, it will use the default value "B<0>". If the port value is "B<0>", in the vpd table, the side column should be B and B; If the port value is "B<1>", the side column should be B and B. When making hardware connection between fsp/bpa and HMC, the port is used to specify the fsp/bpa port of the cec/frame. +The port value specify which side will be used to create the connection to the CEC/Frame. The value could be "B<0>" or "B<1>". If this port value is not specfied in the command, it will use the default value "B<0>". If the port value is "B<0>", in the vpd table, the side column should be B and B; If the port value is "B<1>", the side column should be B and B. When making hardware connection between CEC/Frame and HMC, the port is used to specify the fsp/bpa port of the cec/frame. =item B<-s> @@ -96,21 +96,21 @@ Verbose output. =item 1. -To setup the connection for all FSP nodes in node group fsp to HMC node, according to the definition in xCAT DB: +To setup the connection for all CEC nodes in node group cec to HMC node, according to the definition in xCAT DB: - mkhwconn fsp -t + mkhwconn cec -t =item 2. -To setup the connection for BPA nodes in node group frame_grp1 to HMC node hmc1, with password 'abc123': +To setup the connection for Frame nodes in node group frame to HMC node hmc1, with password 'abc123': - mkhwconn frame_grp1 -p hmc1 -P abc123 + mkhwconn frame -p hmc1 -P abc123 =item 3. -To setup the connections for all FSP nodes in node group fsp to hardware server, and the tooltype value is lpar: +To setup the connections for all CEC nodes in node group cec to hardware server, and the tooltype value is lpar: - mkhwconn fsp -t -T lpar + mkhwconn cec -t -T lpar =item 4. @@ -122,7 +122,7 @@ To setup the connections for all cecs nodes in node group cec to hardware server To setup the connection between the frame and it's SFP node. This command will also set the connections between the CECs within this frame and their SFP node. User need to define HMC_name in the database in advance, but no need to set the sfp attribute for these node, xCAT will set the HMC_name as ppc.sfp for these nodes. The CECs within this frame should have the same sfp attribute as the frame. - mkhwconn fsp -s HMC_name -P HMC_passwd + mkhwconn cec -s HMC_name -P HMC_passwd =back diff --git a/xCAT-client/pods/man1/rmhwconn.1.pod b/xCAT-client/pods/man1/rmhwconn.1.pod index 8125cc059..d0e2a731b 100644 --- a/xCAT-client/pods/man1/rmhwconn.1.pod +++ b/xCAT-client/pods/man1/rmhwconn.1.pod @@ -1,6 +1,6 @@ =head1 NAME -B - Use this command to remove connections from FSP and BPA nodes to HMC nodes. +B - Use this command to remove connections from CEC and Frame nodes to HMC nodes. =head1 SYNOPSIS @@ -20,13 +20,13 @@ B I B<-T> I For PPC (with HMC) specific: -This command is used to disconnect FSP and BPA nodes from HMC nodes, according to the connection information defined in ppc talbe in xCAT DB. +This command is used to disconnect CEC and Frame nodes from HMC nodes, according to the connection information defined in ppc talbe in xCAT DB. -Note: If a CEC (FSP node represents) belongs to a frame with a BPA installed, this CEC cannot be disconnected individually. Instead, the whole frame (BPA node represents) should be disconnected. +Note: If a CEC belongs to a frame with a BPA installed, this CEC cannot be disconnected individually. Instead, the whole frame should be disconnected. For PPC (without HMC, using FSPAPI) specific: -It's used to disconnection FSP and BPA nodes from hardware server. +It's used to disconnection CEC and Frame nodes from hardware server. =head1 OPTIONS @@ -42,7 +42,7 @@ Verbose output. =item B<-T> -The tooltype is used to communicate to the FSP/BPA. The value could be B or B. The tooltype value B is for xCAT and B is for CNM. +The tooltype is used to communicate to the CEC/Frame. The value could be B or B. The tooltype value B is for xCAT and B is for CNM. =back @@ -59,21 +59,21 @@ The tooltype is used to communicate to the FSP/BPA. The value could be B o =item 1. -To disconnect all FSP nodes in node group fsp from their HMC nodes: +To disconnect all CEC nodes in node group cec from their HMC nodes: - rmhwconn fsp + rmhwconn cec =item 2. -To remove the connection for BPA node frame1: +To remove the connection for Frame node frame1: rmhwconn frame1 =item 3. -To disconnect all FSP nodes in node group fsp from their related hardware serveri, using lpar tooltype: +To disconnect all CEC nodes in node group cec from their related hardware serveri, using lpar tooltype: - rmhwconn fsp -T lpar + rmhwconn cec -T lpar =back