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

fix multiple nics problem

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@16524 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
creativezj 2013-06-04 05:46:55 +00:00
parent 1e30875be2
commit 0eb9db534b
2 changed files with 20 additions and 12 deletions
xCAT-client/pods/man1
nodeimport.1.pod
xCAT-server/lib/xcat/plugins
profilednodes.pm

4
xCAT-client/pods/man1/nodeimport.1.pod

@ -157,10 +157,6 @@ B<rack=<rack-name>> This is an optional item.
Description: node location info. Specify the rack name which this node will be placed into. If not specify this item, there will be no node location info set for this node. this item must be specified together with height + unit.
B<rack=<rack-name>> This is an optional item.
Description: node location info. Specify the rack name which this node will be placed into. If not specify this item, there will be no node location info set for this node. this item must be specified together with height + unit.
B<chasiss=<chassis-name>> This is an optional item.
Description: node location info, for blade(or PureFlex) only. Specify the chasiss name which this blade will be placed into. this item can not be specified together with rack.

28
xCAT-server/lib/xcat/plugins/profilednodes.pm

@ -1597,13 +1597,7 @@ sub gen_new_hostinfo_string{
foreach (keys %netprofileattr){
# Not generate IP if exists other nics
if (exists $allothernics{$item}->{$_}) {
my $avaiableip = $allothernics{$item}->{$_};
if (exists $allips{$avaiableip}){
return 0, "The specified nicips IP address $avaiableip is already in use.";
}else{
$ipshash{$_} = $avaiableip;
$allips{$avaiableip} = 0;
}
$ipshash{$_} = $allothernics{$item}->{$_};
}
}
@ -2039,7 +2033,25 @@ sub validate_node_entry{
$errmsg .= "Specified slotid $node_entry{$_} is invalid";
}
}elsif ($_ eq "nicips"){
# Support Multi-Nic
# Check Multi-Nic's ip
my $othernics = $node_entry{$_};
foreach my $nic_ips (split(/,/, $othernics)) {
my @nic_and_ips = ();
my $nic = "";
my $nic_ip = "";
if($nic_ips =~ /!/ and $nic_ips !~ /!$/) {
@nic_and_ips = split(/!/, $nic_ips);
$nic_ip = $nic_and_ips[1];
if (exists $allips{$node_entry{$_}}){
$errmsg .= "IP address $nic_ip already exists in the database or in the nodeinfo file.\n";
}elsif((xCAT::NetworkUtils->validate_ip($nic_ip))[0]->[0] ){
$errmsg .= "IP address $nic_ip is invalid. You must use a valid IP address.\n";
}else {
#push the IP into allips list.
$allips{$nic_ip} = 0;
}
}
}
}else{
$errmsg .= "Invalid attribute $_ specified\n";
}