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

Grouped /^(mm|rsa)$/ in regexp

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@1102 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
sakolish 2008-04-16 18:14:31 +00:00
parent ff1fc8d598
commit bc7f030660
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
xCAT-server-2.0/lib/xcat/plugins/lsslp.pm
View File

@ -954,7 +954,7 @@ sub xCATdB {
lc($type),$name,$id,$model,$serial,$name,$prof,$frame,$ips );
xCAT::PPCdb::add_ppc( $type, [$values] );
}
elsif ( $type =~ /^HMC|IVM$/ ) {
elsif ( $type =~ /^(HMC|IVM)$/ ) {
my $model = @$data[1];
my $serial = @$data[2];
my $ips = @$data[3];
@ -1017,7 +1017,7 @@ sub xCATdB {
$type,$name,$cageid,$model,$serial,$server,$prof,$frame,$ips );
xCAT::PPCdb::add_ppc( "fsp", [$values] );
}
elsif ( $type =~ /^RSA|MM$/ ) {
elsif ( $type =~ /^(RSA|MM)$/ ) {
xCAT::PPCdb::add_systemX( $type, $data );
}
}
@ -1060,8 +1060,8 @@ sub format_stanza {
$d = "$type,all";
} elsif ( /^mgt$/ ) {
$d = $mgt{$type};
} elsif ( /^id|mpa$/ ) {
if ( $type =~ /^mm|rsa$/ ) {
} elsif ( /^(id|mpa)$/ ) {
if ( $type =~ /^(mm|rsa)$/ ) {
$d = (/^id$/) ? "0" : $name;
} else {
next;
@ -1110,8 +1110,8 @@ sub format_xml {
$d = "$type,all";
} elsif ( /^mgt$/ ) {
$d = $mgt{$type};
} elsif ( /^id|mpa$/ ) {
if ( $type =~ /^mm|rsa$/ ) {
} elsif ( /^(id|mpa)$/ ) {
if ( $type =~ /^(mm|rsa)$/ ) {
$d = (/^id$/) ? "0" : $name;
} else {
next;