Commit 7d1f5299 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Remove setVlanTag(); no longer store the tag in the lans table since

it is transient; always use the reserved_vlantags table now.
parent 558dc84b
......@@ -1770,7 +1770,6 @@ sub CreateOneVlan($$$@)
$errors++;
}
else {
setVlanTag($vlanid, $vlan_number);
VLan->RecordVlanInsertion($experiment, $vlanid,$stack->{STACKID});
}
}
......@@ -1842,7 +1841,6 @@ sub doReset($@) {
$errors++;
}
foreach my $vlan (@existant_vlans) {
setVlanTag($vlan, 0);
clearReservedVlanTag($vlan)
if ($opt{C});
VLan->RecordVLanDeletion($vlan);
......
......@@ -17,7 +17,7 @@ use Exporter;
getTestSwitches getControlSwitches getSwitchesInStack
getSwitchesInStacks getVlanIfaces
getVlanPorts convertPortsFromIfaces convertPortFromIface
getExperimentTrunks setVlanTag setVlanStack
getExperimentTrunks setVlanStack
getExperimentVlans getDeviceNames getDeviceType
getInterfaceSettings mapPortsToDevices getSwitchPrimaryStack
getSwitchStacks getStacksForSwitches
......@@ -456,26 +456,6 @@ sub getActualStacksForVlans(@) {
return uniq(@stacks);
}
#
# Update database to store vlan tag.
#
sub setVlanTag ($$) {
my ($vlan_id, $tag) = @_;
# Silently exit if they passed us no VLANs
if (!$vlan_id || !defined($tag)) {
return ();
}
my $vlan = VLan->Lookup($vlan_id);
return ()
if (!defined($vlan));
return ()
if ($vlan->SetTag($tag) != 0);
return 0;
}
#
# Ditto for stack that VLAN exists on
#
......
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