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

FSP/BPA redundancy: fix a mistake

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8766 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle
2011-01-28 15:42:00 +00:00
parent 3e5784c331
commit 8f0ed3fa8d
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2690,23 +2690,24 @@ sub format_stanza {
} elsif ( /^mgt$/ ) {
$d = $mgt{$type};
} elsif ( /^id$/ ) {
if ( $type =~ /^fsp$/ ) {
if ( $type =~ /^(fsp|bpa|cec|frame)$/ ) {
$d = $data[$i++];
} elsif ( $type =~ /^bpa$/ ) {
$i++;
} else {
$i++;
next;
}
$i++;
} elsif ( /^side$/ or /^parent$/ ) {
} elsif ( /^side$/ ) {
if ( $type !~ /^(fsp|bpa)$/ ) {
next;
}
} elsif ( /^otherinterfaces$/ ) {
$d = $ip;
} elsif ( /^parent$/ ) {
if ( $type !~ /^(fsp|bpa|cec)$/ ) {
next;
}
} elsif ( /^otherinterfaces$/ ) {
next;
}
if ( !defined($d) ) {
next;
}
@@ -2768,21 +2769,23 @@ sub format_xml {
} elsif ( /^mgt$/ ) {
$d = $mgt{$type};
} elsif ( /^id$/ ) {
if ( $type =~ /^fsp$/ ) {
if ( $type =~ /^(fsp|bpa|frame|cec)$/ ) {
$d = $data[$i++];
} elsif ( $type =~ /^bpa$/ ) {
$i++;
} else {
$i++;
next;
}
$i++;
} elsif ( /^side$/ or /^parent$/ ) {
if ( $type !~ /^(fsp|bpa)$/ ) {
} elsif ( /^side$/ ) {
if ( $type !~ /^(fsp|bpa|cec|frame)$/ ) {
next;
}
} elsif ( /^otherinterfaces$/ ) {
$d = $ip;
} elsif ( /^parent$/ ) {
if ( $type !~ /^(fsp|bpa|cec)$/ ) {
next;
}
} elsif ( /^otherinterfaces$/ ) {
next;
}
if ( !defined($d) ) {