View Issue Details

IDProjectCategoryView StatusLast Update
594RackTablesSNMPpublic2012-09-01 23:55
Reporterasl Assigned Toadoom42  
PrioritynormalSeverityminorReproducibilityhave not tried
Status closedResolutionfixed 
Product Version0.19.13 
Target Version0.20.0Fixed in Version0.20.0 
Summary594: Add of 3 Cisco SG switches
DescriptionPatch adding the following Cisco switches to the SNMP:

- SG300-10
- SG300-52
- SF300-24P
TagsNo tags attached.

Activities

asl

asl

2012-08-23 18:38

reporter   ~0000746

Last edited: 2012-08-24 17:28

- patch against current SVN as of aug 23 2012, 5pm GMT

asl

asl

2012-08-24 18:51

reporter  

diff-rt (4,049 bytes)   
diff --git a/wwwroot/inc/dictionary.php b/wwwroot/inc/dictionary.php
index 1d8d97a..79d7ac1 100644
--- a/wwwroot/inc/dictionary.php
+++ b/wwwroot/inc/dictionary.php
@@ -1842,6 +1842,9 @@ $dictionary = array
 	1757 => array ('chapter_id' => 12, 'dict_value' => 'Cisco%GPASS%UCS 6248 Fabric Interconnect'),
 	1758 => array ('chapter_id' => 12, 'dict_value' => 'Cisco%GPASS%UCS 6296 Fabric Interconnect'),
 	1759 => array ('chapter_id' => 16, 'dict_value' => 'Cisco IOS XR 4.2'),
+	1780 => array ('chapter_id' => 12, 'dict_value' => 'Cisco%GPASS%SG 300-52'),
+	1781 => array ('chapter_id' => 12, 'dict_value' => 'Cisco%GPASS%SF 300-24P'),
+	1782 => array ('chapter_id' => 12, 'dict_value' => 'Cisco%GPASS%SG 300-10'),
 
 # Any new "default" dictionary records must go above this line (i.e., with
 # dict_key code less, than 50000). This is necessary to keep AUTO_INCREMENT
diff --git a/wwwroot/inc/snmp.php b/wwwroot/inc/snmp.php
index 3c99f48..cebb980 100644
--- a/wwwroot/inc/snmp.php
+++ b/wwwroot/inc/snmp.php
@@ -34,12 +34,39 @@ $iftable_processors['generic-g-any-1000T'] = array
 	'try_next_proc' => FALSE,
 );
 
+$iftable_processors['generic-gi-any-1000T'] = array
+(
+	'pattern' => '@^gi(\d+)$@',
+	'replacement' => 'gi\\1',
+	'dict_key' => 24,
+	'label' => 'gi\\1',
+	'try_next_proc' => FALSE,
+);
+
 $iftable_processors['generic-gi-1-to-2-1000T'] = array
 (
 	'pattern' => '@^gi(\d+)$@',
 	'replacement' => 'gi\\1',
 	'dict_key' => 24,
-	'label' => 'G\\1',
+	'label' => 'gi\\1',
+	'try_next_proc' => FALSE,
+);
+
+$iftable_processors['generic-gi-9-to-10-combo-1000SFP'] = array
+(
+	'pattern' => '@^gi(9|10)$@',
+	'replacement' => 'gi\\1',
+	'dict_key' => '4-1077',
+	'label' => 'gi\\1',
+	'try_next_proc' => TRUE,
+);
+
+$iftable_processors['generic-gi-9-to-10-combo-1000T'] = array
+(
+	'pattern' => '@^gi(9|10)$@',
+	'replacement' => 'gi\\1',
+	'dict_key' => '1-24',
+	'label' => 'gi\\1',
 	'try_next_proc' => FALSE,
 );
 
@@ -48,7 +75,7 @@ $iftable_processors['generic-gi-3-to-4-combo-1000SFP'] = array
 	'pattern' => '@^gi(3|4)$@',
 	'replacement' => 'gi\\1',
 	'dict_key' => '4-1077',
-	'label' => 'G\\1',
+	'label' => 'gi\\1',
 	'try_next_proc' => TRUE,
 );
 
@@ -57,7 +84,25 @@ $iftable_processors['generic-gi-3-to-4-combo-1000T'] = array
 	'pattern' => '@^gi(3|4)$@',
 	'replacement' => 'gi\\1',
 	'dict_key' => '1-24',
-	'label' => 'G\\1',
+	'label' => 'gi\\1',
+	'try_next_proc' => FALSE,
+);
+
+$iftable_processors['generic-gi-51-to-52-combo-1000SFP'] = array
+(
+	'pattern' => '@^gi(51|52)$@',
+	'replacement' => 'gi\\1',
+	'dict_key' => '4-1077',
+	'label' => 'gi\\1',
+	'try_next_proc' => TRUE,
+);
+
+$iftable_processors['generic-gi-51-to-52-combo-1000T'] = array
+(
+	'pattern' => '@^gi(51|52)$@',
+	'replacement' => 'gi\\1',
+	'dict_key' => '1-24',
+	'label' => 'gi\\1',
 	'try_next_proc' => FALSE,
 );
 
@@ -1584,6 +1629,44 @@ $known_switches = array // key is system OID w/o "enterprises" prefix
 		),
 		'ifDescrOID' => 'ifName',
 	),
+	'9.6.1.83.52.1' => array
+	(
+		'dict_key' => 1780,
+		'text' => 'SG300-52 52-port Gigabit Managed Switch: 50 RJ-45/10/100/1000 + 2 combo-gig',
+		'processors' => array
+		(
+			'generic-gi-51-to-52-combo-1000SFP',
+			'generic-gi-51-to-52-combo-1000T',
+			'generic-gi-any-1000T',
+		),
+		'ifDescrOID' => 'ifName',
+	),
+	'9.6.1.82.24.2' => array
+	(
+		'dict_key' => 1781,
+		'text' => 'SF300-24P 24-port 10/100 PoE Managed Switch w/Gig Uplinks: 24 RJ-45/10/100 +2 RJ-45/10/100/1000 + 2 combo-gig',
+		'processors' => array
+		(
+			'generic-gi-3-to-4-combo-1000SFP',
+			'generic-gi-3-to-4-combo-1000T',
+			'generic-gi-1-to-2-1000T',
+			'generic-fa-any-100TX',
+		),
+		'ifDescrOID' => 'ifName',
+	),
+
+	'9.6.1.83.10.1' => array
+	(
+		'dict_key' => 1782,
+		'text' => 'SG300-10 10-port Gigabit Managed Switch: 8 RJ-45/10/100/1000 + 2 combo-gig',
+		'processors' => array
+		(
+			'generic-gi-9-to-10-combo-1000SFP',
+			'generic-gi-9-to-10-combo-1000T',
+			'generic-gi-any-1000T',
+		),
+		'ifDescrOID' => 'ifName',
+	),
 	'9.12.3.1.3.719' => array
 	(
 		'dict_key' => 960,
diff-rt (4,049 bytes)   
adoom42

adoom42

2012-09-01 23:55

administrator   ~0000772

Added to 0.20. Thanks for the patch.

Issue History

Date Modified Username Field Change
2012-08-23 18:37 asl New Issue
2012-08-23 18:37 asl Status new => assigned
2012-08-23 18:37 asl Assigned To => adoom42
2012-08-23 18:37 asl File Added: diff-rt
2012-08-23 18:38 asl Note Added: 0000746
2012-08-23 20:16 asl File Added: diff-add-cisco-sg
2012-08-24 17:10 asl File Added: diff-sg300-20120824
2012-08-24 17:18 asl File Deleted: diff-rt
2012-08-24 17:18 asl File Deleted: diff-add-cisco-sg
2012-08-24 17:28 asl File Deleted: diff-sg300-20120824
2012-08-24 17:28 asl Note Edited: 0000746
2012-08-24 18:51 asl File Added: diff-rt
2012-09-01 23:55 adoom42 Note Added: 0000772
2012-09-01 23:55 adoom42 Status assigned => closed
2012-09-01 23:55 adoom42 Resolution open => fixed
2012-09-01 23:55 adoom42 Fixed in Version => 0.20.0
2012-09-01 23:55 adoom42 Target Version => 0.20.0