Commit 9364606d authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Minoor change to the test that use syncvlans; always use on emulab-ops

experiments, even on other testbeds. This is because snmpit -o does
not untrunk ports, and I do not have time to fix this now. Without
this change, the shared nodes holding experiment cannot be changed.
parent 206d4e10
......@@ -201,6 +201,7 @@ my $special = ($pid eq "testbed" || $pid eq "tbres" || $pid eq "geni" ||
$pid eq "emulab-ops" || $pid eq "utahstud" ||
$pid eq "ResiliNets" || $pid eq "gec8tutorial");
my $newsetup = $special;
my $syncvlans = ($pid eq "emulab-ops" || ($MAINSITE && $special));
#
# Print starting message.
......@@ -962,7 +963,7 @@ sub doSwapin($) {
my @same = ();
my $ret;
if ($ELABINELAB || !$MAINSITE || !$special) {
if ($ELABINELAB || !$syncvlans) {
$ret = Lan->CompareVlansWithSwitches($experiment, \@diff, \@same);
}
else {
......@@ -974,7 +975,7 @@ sub doSwapin($) {
"Failed to compare old vlans");
return 1;
}
if ($ELABINELAB || !$MAINSITE || !$special) {
if ($ELABINELAB || !$syncvlans) {
if (@diff) {
print "Removing obsolete vlans @diff\n";
system("snmpit -f ". join(" ", map("-o $_", @diff)));
......@@ -1304,7 +1305,7 @@ sub doSwapin($) {
# parallel with os_setup (no DB dependencies, etc.)
#
if (!$experiment->skipvlans() &&
($type != MODIFY || ($ELABINELAB || !$MAINSITE || !$special))) {
($type != MODIFY || ($ELABINELAB || !$syncvlans))) {
print "Setting up VLANs.\n";
TBDebugTimeStamp("snmpit started");
if (system("snmpit -t $pid $eid")) {
......
Supports Markdown
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