Commit b3b91531 authored by Leigh B Stoller's avatar Leigh B Stoller

Do not allow an experiment that is sharing its vlan, to be swapped

out. Revisit later.
parent 06ed35d3
...@@ -431,6 +431,9 @@ $robotexp = ...@@ -431,6 +431,9 @@ $robotexp =
TBExptContainsNodeCT($pid,$eid,'motehost') || TBExptContainsNodeCT($pid,$eid,'motehost') ||
TBExptContainsNodeCT($pid,$eid,'powermon'); TBExptContainsNodeCT($pid,$eid,'powermon');
# See below.
my $sharingvlans = $experiment->SharingVlans();
# #
# We have to protect against trying to end an experiment that is currently # We have to protect against trying to end an experiment that is currently
# in the process of being terminated. We use a "wrapper" state (actually # in the process of being terminated. We use a "wrapper" state (actually
...@@ -651,8 +654,7 @@ else { ...@@ -651,8 +654,7 @@ else {
ExitWithStatus(1, ExitWithStatus(1,
"Experiment is sharing vlans; cannot swap or modify!\n") "Experiment is sharing vlans; cannot swap or modify!\n")
if (($inout eq "out" || $inout eq "modify") && if (($inout eq "out" || $inout eq "modify") && $sharingvlans);
$experiment->SharingVlans());
# #
# Check the state for the various operations. # Check the state for the various operations.
......
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