Commit 39d458eb authored by Robert Ricci's avatar Robert Ricci

Move the sanity check on the # of VLANs to after the check for e-in-e:

this check fails in that case.
parent b251fb14
......@@ -1196,6 +1196,20 @@ sub doVlansFromTables($@) {
}
my ($stack) = @$stacks;
my @trunkedPorts = getExperimentTrunks($pid,$eid);
$equaltrunking = 1;
foreach my $port (@trunkedPorts) {
$errors += doTrunkEnable($stacks,$port);
}
$equaltrunking = $oEopt;
#
# Hand over to outer boss.
#
if ($ELABINELAB) {
return RemoteDoVlansFromTables(@vlans);
}
#
# Sanity check: make sure that this experiment does not use more VLANs than
# we can put on the stack. Note that we don't try to check how many are
......@@ -1221,20 +1235,6 @@ sub doVlansFromTables($@) {
return 1;
}
my @trunkedPorts = getExperimentTrunks($pid,$eid);
$equaltrunking = 1;
foreach my $port (@trunkedPorts) {
$errors += doTrunkEnable($stacks,$port);
}
$equaltrunking = $oEopt;
#
# Hand over to outer boss.
#
if ($ELABINELAB) {
return RemoteDoVlansFromTables(@vlans);
}
foreach my $vlan (@vlans) {
my @ports = getVlanPorts($vlan);
if ($stack->vlanExists($vlan)) {
......
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