From 66d3dfd4db90508c9a48732cead27318af983372 Mon Sep 17 00:00:00 2001 From: daniceexi Date: Thu, 8 Dec 2011 14:57:37 +0000 Subject: [PATCH] more fix for replacing the getAttribs with getNodeAttribs for regular expression support git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11190 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/blade.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm index 61b6400c1..e761bb72b 100644 --- a/xCAT-server/lib/xcat/plugins/blade.pm +++ b/xCAT-server/lib/xcat/plugins/blade.pm @@ -3218,15 +3218,15 @@ sub getbladecons { my $ent=$mptabhash->{$node}->[0]; #$mptab->getNodeAttribs($node,['mpa', 'id']); if (defined($ent->{mpa})) { $rsp->{node}->[0]->{mm}->[0]=$ent->{mpa}; - if (defined($checkedmpas{$ent->{$mpa}}) or not defined $mpatab) { + if (defined($checkedmpas{$ent->{mpa}}) or not defined $mpatab) { if (defined($mpausers{$ent->{mpa}})) { $rsp->{node}->[0]->{username}=[$mpausers{$ent->{mpa}}]; } else { $rsp->{node}->[0]->{username}=[$user]; } } else { - $checkedmpas{$ent->{$mpa}}=1; - ($tmp)=$mpatab->getAttribs({'mpa'=>$mpa},'username'); + $checkedmpas{$ent->{mpa}}=1; + ($tmp)=$mpatab->getNodeAttribs($ent->{mpa}, ['username']); if (defined($tmp) and defined $tmp->{username}) { $mpausers{$ent->{mpa}}=$tmp->{username}; $rsp->{node}->[0]->{username}=[$tmp->{username}]; @@ -3558,7 +3558,7 @@ sub process_request { my $pass=$bladepass; my $ent; if (defined($mpatab)) { - ($ent)=$mpatab->getAttribs({'mpa'=>$mpa},'username','password'); + ($ent)=$mpatab->getNodeAttribs($mpa, ['username','password']); if (defined($ent->{password})) { $pass = $ent->{password}; } if (defined($ent->{username})) { $user = $ent->{username}; } }