Purge shark code

tbsetup/snmpit_cisco.pm

@@ -332,10 +332,6 @@ sub convertPortFormat($$@) {
 	return @ports;
     }
 
-    # Shark hack
-    @ports = map {if (/(sh\d+)-\d(:\d)/) { "$1$2" } else { $_ }} @ports;
-    # End shark hack
-
     if ($input == $PORT_FORMAT_IFINDEX) {
 	if ($output == $PORT_FORMAT_MODPORT) {
 	    $self->debug("Converting ifindex to modport\n",2);
@@ -1456,7 +1452,7 @@ sub setVlansOnTrunk($$$$) {
     my ($ifIndex) = $self->convertPortFormat($PORT_FORMAT_IFINDEX,$port);
 
     #
-    # Get the exisisting bitfield for allowed VLANs on the trunk
+    # Get the existing bitfield for allowed VLANs on the trunk
     #
     my $bitfield = snmpitGetFatal($self->{SESS},
 	    ["vlanTrunkPortVlansEnabled",$ifIndex]);

tbsetup/snmpit_foundry.pm

@@ -257,10 +257,6 @@ sub convertPortFormat($$@) {
 	return @ports;
     }
 
-    # Shark hack
-    @ports = map {if (/(sh\d+)-\d(:\d)/) { "$1$2" } else { $_ }} @ports;
-    # End shark hack
-
     if ($input == $PORT_FORMAT_IFINDEX) {
 	if ($output == $PORT_FORMAT_MODPORT) {
 	    $self->debug("Converting ifindex to modport\n",2);

tbsetup/snmpit_lib.pm

@@ -108,7 +108,6 @@ sub ReadTranslationTable {
 	$name = "$_[0]:$_[1]";
 	if ($_[2] != 1) {$name .=$_[2]; }
 	$mac = "$_[3]";
-	if ($name =~ /(sh\d+)(-\d)(:\d)?/ ) { $name = "$1$3"; }
 	$Interfaces{$name} = $mac;
 	$Interfaces{$mac} = $name;
 	print "Interfaces: $mac <==> $name\n" if $debug > 1;

tbsetup/snmpit_nortel.pm

@@ -315,10 +315,6 @@ sub convertPortFormat($$@) {
 	return @ports;
     }
 
-    # Shark hack
-    @ports = map {if (/(sh\d+)-\d(:\d)/) { "$1$2" } else { $_ }} @ports;
-    # End shark hack
-
     if ($input == $PORT_FORMAT_IFINDEX) {
 	if ($output == $PORT_FORMAT_MODPORT) {
 	    $self->debug("Converting ifindex to modport\n",2);