Commit 545e72de authored by Leigh B Stoller's avatar Leigh B Stoller

Whenever an experiment is using Vinterfaces, reserve the vlan tags

with snmpit -A before booting nodes.
parent 79af2aa2
...@@ -988,7 +988,7 @@ sub doSwapin($) { ...@@ -988,7 +988,7 @@ sub doSwapin($) {
# that did not boot. # that did not boot.
# #
my $exitcode; my $exitcode;
my $cmd = "$mapper"; my $cmd = "$mapper ";
if (EmulabFeatures->FeatureEnabled("OldMapper", if (EmulabFeatures->FeatureEnabled("OldMapper",
$this_user, $group, $experiment)) { $this_user, $group, $experiment)) {
$cmd = "$wrapper"; $cmd = "$wrapper";
...@@ -1424,7 +1424,7 @@ sub doSwapin($) { ...@@ -1424,7 +1424,7 @@ sub doSwapin($) {
# the tags not being assigned yet. We can do this for all swap # the tags not being assigned yet. We can do this for all swap
# modes since it is harmless; snmpit does the correct thing. # modes since it is harmless; snmpit does the correct thing.
# #
if ($experiment->HasVirtNodes()) { if ($experiment->HasVirtInterfaces()) {
system("$SNMPIT --redirect-err -A $pid $eid"); system("$SNMPIT --redirect-err -A $pid $eid");
if ($?) { if ($?) {
tberror("Failed to reserve VLAN tags."); tberror("Failed to reserve VLAN tags.");
......
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