Commit 8a528029 authored by Mike Hibler's avatar Mike Hibler

Merge remote branch 'origin/master'

parents 43735189 5799b8f1
...@@ -980,21 +980,19 @@ sub Start($$$) ...@@ -980,21 +980,19 @@ sub Start($$$)
print STDERR "$NAMEDSETUP failed\n"; print STDERR "$NAMEDSETUP failed\n";
return -1; return -1;
} }
if ($restart) { my @diff = ();
my @diff = (); my @same = ();
my @same = ();
if (Lan->CompareVlansWithSwitches($experiment, \@diff, \@same)) { if (Lan->CompareVlansWithSwitches($experiment, \@diff, \@same)) {
print STDERR "CompareVlansWithSwitches failed!\n"; print STDERR "CompareVlansWithSwitches failed!\n";
return -1;
}
if (@diff) {
system("$SNMPIT -f ". join(" ", map("-o $_", @diff)));
if ($?) {
print STDERR "Failed to remove obsolete VLANs.\n";
return -1; return -1;
} }
if (@diff) {
system("$SNMPIT -f ". join(" ", map("-o $_", @diff)));
if ($?) {
print STDERR "Failed to remove obsolete VLANs.\n";
return -1;
}
}
} }
system("$SNMPIT -q -t $pid $eid"); system("$SNMPIT -q -t $pid $eid");
if ($?) { if ($?) {
......
...@@ -4032,6 +4032,7 @@ sub CleanupDeadSlice($;$) ...@@ -4032,6 +4032,7 @@ sub CleanupDeadSlice($;$)
{ {
my ($slice, $purge) = @_; my ($slice, $purge) = @_;
require Firewall; require Firewall;
require Lan;
# Default to full purge. # Default to full purge.
$purge = 1 $purge = 1
...@@ -4051,6 +4052,23 @@ sub CleanupDeadSlice($;$) ...@@ -4051,6 +4052,23 @@ sub CleanupDeadSlice($;$)
return -1; return -1;
} }
#
# Remove any stale vlans.
#
my @stale;
if (VLan->StaleVlanList($experiment, \@stale) != 0) {
print STDERR "Failed to get stale VLANs\n";
return -1;
}
if (@stale) {
print STDERR "Removing stale vlans @stale\n";
system("$SNMPIT -f ". join(" ", map("-o $_", @stale)));
if ($?) {
print STDERR "Failed to remove stale VLANs\n";
return -1;
}
}
# #
# A firewalled slice gets special treatment. # A firewalled slice gets special treatment.
# #
......
...@@ -218,10 +218,6 @@ sub Resolve($) ...@@ -218,10 +218,6 @@ sub Resolve($)
if (defined($ticket)) { if (defined($ticket)) {
$blob->{'ticket_urn'} = $ticket->urn(); $blob->{'ticket_urn'} = $ticket->urn();
} }
my $manifest = $aggregate->GetManifest(1);
if (defined($manifest)) {
$blob->{'manifest'} = $manifest;
}
return GeniResponse->Create(GENIRESPONSE_SUCCESS, $blob); return GeniResponse->Create(GENIRESPONSE_SUCCESS, $blob);
} }
if ($type eq "sliver") { if ($type eq "sliver") {
......
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