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

fix for bug 3422448: lsdef -t <type> -h -i attrs_list support

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11659 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ligc 2012-02-21 08:03:15 +00:00
parent c64c5b8025
commit 0456b6ef6c
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xCAT-client/pods/man1/lsdef.1.pod
View File

@ -202,6 +202,13 @@ To list the nodes status and use xcoll to format the output.
lsdef -t node -i status -c | xcoll
=item 16.
To display the description for some specific attributes that could be used
when defining an xCAT node.
lsdef -t node -h -i profile,pprofile
=back
=head1 FILES

30
xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
View File

@ -566,6 +566,12 @@ sub processArgs
my $rsp;
if ($t eq 'site') {
if ($::opt_i)
{
my $tmprsp;
$tmprsp->{data}->[0] = "It is not supported to list the description of some specific site attributes, displaying the description for all site attributes instead.";
xCAT::MsgUtils->message("W", $tmprsp, $::callback);
}
my $schema = xCAT::Table->getTableSchema('site');
my $desc;
@ -581,7 +587,10 @@ sub processArgs
# get the data type definition from Schema.pm
my $datatype = $xCAT::Schema::defspec{$t};
$rsp->{data}->[0] = "The valid attribute names for object type '$t' are:";
if (!$::opt_i)
{
$rsp->{data}->[0] = "The valid attribute names for object type '$t' are:";
}
# get the objkey for this type object (ex. objkey = 'node')
my $objkey = $datatype->{'objkey'};
@ -591,10 +600,27 @@ sub processArgs
my @alreadydone; # the same attr may appear more then once
my @attrlist;
my $outstr = "";
my @dispattrs = ();
my %dispattrhash = ();
if ($::opt_i)
{
@dispattrs = split(/,/, $::opt_i);
foreach my $dattr (@dispattrs)
{
$dispattrhash{$dattr} = 1;
}
}
foreach my $this_attr (@{$datatype->{'attrs'}})
{
my $attr = $this_attr->{attr_name};
# Only display the specified attributes
if ($::opt_i)
{
if (!defined($dispattrhash{$attr}) || !$dispattrhash{$attr})
{
next;
}
}
my $desc = $this_attr->{description};
if (!defined($desc)) {
# description key not there, so go to the corresponding