arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

the item of adding flag '-x' to list the raw data (XML format) of the deconfigured resource which got from NETC directly.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10520 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
zhaoertao 2011-09-14 04:39:21 +00:00
parent c49fcfb8a3
commit 879567cab6
3 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
perl-xCAT/xCAT/FSPinv.pm
View File

@ -66,7 +66,7 @@ sub parse_args {
$Getopt::Long::ignorecase = 0;
Getopt::Long::Configure( "bundling" );
if ( !GetOptions( \%opt, qw(V|Verbose) )) {
if ( !GetOptions( \%opt, qw(V|Verbose x) )) {
return( usage() );
}
####################################
@ -89,6 +89,9 @@ sub parse_args {
if ( defined( $ARGV[0] )) {
return(usage( "Invalid Argument: $ARGV[0]" ));
}
if (exists($opt{x}) and $cmd !~ /^deconfig$/) {
return (usage("Option '-x' can't work with '$cmd'"));
}
####################################
# Set method to invoke
####################################
@ -268,10 +271,13 @@ sub deconfig {
$decfg = XMLin($data);
};
if( $@ ) {
push @result,[$name, "Error: there are some unreadable XML data from the firmware. Please check with the data provider.", -1];
push @result,[$name, "Error: there are some unreadable XML data from the firmware. It can't be parsed by 'xcatd'.", -1];
return (\@result);
}
if( exists($request->{opt}->{x})) {
push @result, [$name, "\n".$data, -1];
next;
}
#print "decfg";
#print Dumper($decfg);
my $node = $decfg->{NODE};

3
perl-xCAT/xCAT/Usage.pm
View File

@ -69,7 +69,8 @@ my %usage = (
PPC specific(with HMC):
rinv <noderange> [bus|config|serial|model|firm|all]
PPC specific(using Direct FSP Management):
rinv <noderange> [firm|deconfig]
rinv <noderange> [firm]
rinv <noderange> [deconfig [-x]]
Blade specific:
rinv <noderange> [mtm|serial|mac|bios|diag|mprom|mparom|firm|all]
VMware specific:

23
xCAT-client/pods/man1/rinv.1.pod
View File

@ -16,7 +16,9 @@ B<rinv> I<noderange> {B<bus>|B<config>|B<serial>|B<model>|B<firm>|B<all>}
=head2 PPC (using Direct FSP Management) specific:
B<rinv> I<noderange> {B<firm>|B<deconfig>}
B<rinv> I<noderange> {B<firm>}
B<rinv> I<noderange> {B<deconfig> [B<-x>]}
=head2 Blade specific:
@ -66,6 +68,10 @@ Retrieves firmware versions.
Retrieves deconfigured resources. Deconfigured resources are hw components (cpus, memory, etc.) that have failed so the firmware has automatically turned those components off.
=item B<-x>
To output the information of deconfigured resources in XML format.
=item B<asset>
Retrieves asset tag. Usually it's the MAC address of eth0.
@ -141,6 +147,21 @@ To retrieve all information available from blade node4, enter:
=item *
To output the information of deconfigured resources in XML format for CEC cec01, enter:
rinv cec01 deconfig -x
cec01:
<SYSTEM>
<System_type>IH</System_type>
<NODE>
<Location_code>U78A9.001.0123456-P1</Location_code>
<RID>800</RID>
</NODE>
</SYSTEM>
=item *
To retrieve 'config' information from the HMC-managed LPAR node3, enter:
rinv node3 config