From f508e8d4a79ce5a49179fc43acaee7c185303f0b Mon Sep 17 00:00:00 2001 From: zhaoertao Date: Wed, 7 Sep 2011 06:45:49 +0000 Subject: [PATCH] delete the 'BSR' item based on the lastest revision git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.6@10458 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/FSPcfg.pm | 22 ++++------------------ perl-xCAT/xCAT/Usage.pm | 1 - 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/perl-xCAT/xCAT/FSPcfg.pm b/perl-xCAT/xCAT/FSPcfg.pm index 8c282f39a..74f95d627 100644 --- a/perl-xCAT/xCAT/FSPcfg.pm +++ b/perl-xCAT/xCAT/FSPcfg.pm @@ -74,8 +74,7 @@ sub parse_args { "cec_off_policy", "resetnet", "sysname", - "pending_power_on_side", - "BSR" + "pending_power_on_side" ); my @frame = ( "frame", @@ -234,7 +233,7 @@ sub parse_args { $request->{method} = "resetnet"; return( \%opt ); } - if(exists($cmds{sysname}) or exists($cmds{pending_power_on_side}) or exists($cmds{BSR})) { + if(exists($cmds{sysname}) or exists($cmds{pending_power_on_side})) { $request->{hcp} = $request->{hwtype} eq 'frame' ? "bpa":"fsp"; $request->{method} = "do_fspapi_function"; return (\%opt); @@ -309,9 +308,6 @@ sub parse_option { return ("Invalid pending_power_on_side param '$value'"); } } - if ($command eq 'BSR') { - return ("BSR value can not be set"); - } return undef; } sub check_node_info { @@ -349,11 +345,6 @@ my %fspapi_action = ( frame => "set_ipl_param" } }, - BSR => { - query => { - cec => "get_cec_bsr" - } - } ); sub do_process_query_res { my $name = shift; @@ -376,11 +367,6 @@ sub do_process_query_res { return "Error"; } } - } elsif ($cmd =~ /^BSR$/) { - my @values = split(/\n/, @$res[1]); - foreach my $v (@values) { - push @$result, [$name, $v, '0']; - } } return undef; } @@ -436,7 +422,7 @@ sub do_set { my $action = $fspapi_action{$cmd}{set}{@$d[4]}; my $para = &do_set_get_para($name, $cmd, $value); my $values = xCAT::FSPUtils::fsp_api_action($name, $d, $action, 0, $para); -# print Dumper($values); + #print Dumper($values); &do_process_set_res($name, $cmd, \@result, $values); #my $res = &do_process_set_res($name, $cmd, \@result, $values); #if (defined($res)) { @@ -453,7 +439,7 @@ sub do_fspapi_function { my @ret = (); my $res; my $args = $request->{arg}; - my @fspapi_array = qw/sysname pending_power_on_side BSR/; + my @fspapi_array = qw/sysname pending_power_on_side/; my $invalid_node = &check_node_info($hash); if (defined($invalid_node)) { return ([[$invalid_node, "Node must be CEC or Frame", '1']]); diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm index 3ca710b96..c7169feaf 100644 --- a/perl-xCAT/xCAT/Usage.pm +++ b/perl-xCAT/xCAT/Usage.pm @@ -141,7 +141,6 @@ my %usage = ( rspconfig [cec_off_policy] rspconfig [cec_off_policy=] rspconfig --resetnet - rspconfig [BSR] BPA/Frame (using Direct FSP Management)specific: rspconfig HMC_passwd= rspconfig admin_passwd=