Commit e9c0f1b1 authored by Leigh Stoller's avatar Leigh Stoller

Skip portvlans when skipvlans is set.

parent 5911d9be
......@@ -1283,14 +1283,16 @@ sub ActionStart($$;$)
$msg .= "Failed to setup shared vlan ports";
goto bad;
}
DebugTimeStamp("syncportvlans");
if ($experiment->SyncPortLans()) {
$bootfailure_code = GENIRESPONSE_SETUPFAILURE_NETWORK();
$msg .= "Failed to add ports to shared vlans";
goto bad;
if (!$experiment->skipvlans()) {
DebugTimeStamp("syncportvlans");
if ($experiment->SyncPortLans()) {
$bootfailure_code = GENIRESPONSE_SETUPFAILURE_NETWORK();
$msg .= "Failed to add ports to shared vlans";
goto bad;
}
DebugTimeStamp("syncportvlans done");
GeniCM::UpdateManifest($slice);
}
DebugTimeStamp("syncportvlans done");
GeniCM::UpdateManifest($slice);
}
$sliver = undef;
......
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