Commit 06453763 authored by Leigh Stoller's avatar Leigh Stoller

Fix for bug uncovered by DeleteNodes(); when the user has not set the

IPs on the lan and we fill them in, we put those IPs into the manifest,
but we also have to put the netmask in, since without that, the update
operation will get confused.
parent 483f2b8d
......@@ -5259,12 +5259,14 @@ sub SliverWorkAux($)
my $macAddress = undef;
$macAddress = $interface->mac()
if (defined($interface));
my $ipAddress;
my ($ipAddress,$ipMask);
if (defined($vinterface)) {
$ipAddress = $vinterface->IP();
$ipMask = $vinterface->mask();
}
elsif (defined($interface)) {
$ipAddress = $interface->IP();
$ipMask = $interface->mask();
}
# Manifest goes back to the user.
if (GeniXML::IsVersion0($ifaceref)) {
......@@ -5289,6 +5291,9 @@ sub SliverWorkAux($)
}
GeniXML::SetText("address", $child, $ipAddress);
GeniXML::SetText("type", $child, "ipv4");
if (defined($ipMask)) {
GeniXML::SetText("netmask", $child, $ipMask);
}
}
GeniXML::SetText($sliverName, $ifaceref,
$sliver->sliver_urn());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment