Commit 2f4c200c authored by Weibin Sun's avatar Weibin Sun
Browse files

one more time of merge with early diffs

parent 435447b1
......@@ -2,7 +2,7 @@
#
# EMULAB-LGPL
# Copyright (c) 2000-2009 University of Utah and the Flux Group.
# Copyright (c) 2000-2009, 2011 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -110,7 +110,11 @@ sub new($$$;$) {
$self->{MIN_VLAN} = $options->{'min_vlan'};
$self->{MAX_VLAN} = $options->{'max_vlan'};
if (($self->{MAX_VLAN} > 1024) && ($self->{MIN_VLAN} < 1000)) {
#
# Temporary removal by Leigh.
#
if (0 &&
($self->{MAX_VLAN} > 1024) && ($self->{MIN_VLAN} < 1000)) {
warn "ERROR: Some Cisco switches forbid creation of user vlans ".
"with 1000 < vlan number <= 1024\n";
return undef;
......
......@@ -17,7 +17,7 @@ use Exporter;
getTestSwitches getControlSwitches getSwitchesInStack
getSwitchesInStacks
getVlanPorts
getExperimentTrunks setVlanTag setVlanStack
getExperimentTrunks setVlanStack
getExperimentVlans getDeviceNames getDeviceType
getInterfaceSettings mapPortsToDevices getSwitchPrimaryStack
getSwitchStacks getStacksForSwitches
......
......@@ -597,7 +597,7 @@ sub createVlan($$$$;$$$) {
sub findDeviceVlans($@) {
my $self = shift;
my @vlan_ids = @_;
my ($count, $device, $devicename) = (scalar(@vlan_ids));
my ($device, $devicename);
my %mapping = ();
#
# Each value in the mapping is:
......
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