one more time of merge with early diffs

tbsetup/snmpit_cisco.pm

@@ -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;

tbsetup/snmpit_lib.pm

@@ -17,7 +17,7 @@ use Exporter;
 		getTestSwitches getControlSwitches getSwitchesInStack
                 getSwitchesInStacks
 		getVlanPorts
-		getExperimentTrunks setVlanTag setVlanStack
+		getExperimentTrunks setVlanStack
 		getExperimentVlans getDeviceNames getDeviceType
 		getInterfaceSettings mapPortsToDevices getSwitchPrimaryStack
 		getSwitchStacks getStacksForSwitches

tbsetup/snmpit_stack.pm

@@ -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: