fix for bug 3299823: <xcatmaster> gateway support for xcat2nim -t network

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9811 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
ligc 2011-06-16 00:42:45 +00:00
parent da15d75ae4
commit 99943f735b

View File

@ -723,6 +723,15 @@ sub x2n
if ($::objtype{$obj} eq 'node') {
push(@nodes, $obj);
} elsif ($::objtype{$obj} eq 'network') {
if ($::objhash{$obj}{'gateway'} eq '<xcatmaster>') {
$::objhash{$obj}{'gateway'} = xCAT::NetworkUtils->my_ip_in_subnet($::objhash{$obj}{'net'}, $::objhash{$obj}{'mask'});
if(!$::objhash{$obj}{'gateway'}) {
my $rsp;
$rsp->{data}->[0] = "Could not get gateway for network $obj, ...skipping\n";
xCAT::MsgUtils->message("E", $rsp, $callback);
next;
}
}
push(@networks, $obj);
} elsif ($::objtype{$obj} eq 'group') {
push(@groups, $obj);