refactor: Watchguard Fireware cleanup (#5015)

librenms · Nov 18, 2016 · c840f99 · c840f99
1 parent d389069
commit c840f99
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 46 deletions.
diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
@@ -1812,16 +1812,6 @@
 $config['os'][$os]['text'] = 'Symbol AP';
 $config['os'][$os]['icon'] = 'symbol';
 
-$os = 'firebox';
-$config['os'][$os]['text']             = 'Watchguard Firebox';
-$config['os'][$os]['type']             = 'firewall';
-$config['os'][$os]['over'][0]['graph'] = 'device_bits';
-$config['os'][$os]['over'][0]['text']  = 'Traffic';
-$config['os'][$os]['over'][1]['graph'] = 'device_processor';
-$config['os'][$os]['over'][1]['text']  = 'CPU Usage';
-$config['os'][$os]['icon']             = 'watchguard';
-$config['os'][$os]['group']            = 'watchguard';
-
 $os = 'fireware';
 $config['os'][$os]['text']             = 'Watchguard Fireware';
 $config['os'][$os]['type']             = 'firewall';

diff --git a/includes/discovery/os/firebox.inc.php b/includes/discovery/os/firebox.inc.php
diff --git a/includes/discovery/os/fireware.inc.php b/includes/discovery/os/fireware.inc.php
@@ -11,6 +11,6 @@
  * the source code distribution for details.
  */
 
-if (starts_with($sysDescr, array('XTM', 'FBX'), true)) {
+if (starts_with($sysObjectId, array('.1.3.6.1.4.1.3097.1.4', '.1.3.6.1.4.1.3097.1.5'))) {
     $os = 'fireware';
 }
diff --git a/includes/discovery/processors/watchguard.inc.php b/includes/discovery/processors/watchguard.inc.php
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
@@ -540,8 +540,8 @@ public function testFiberhome()
 
     public function testFireware()
     {
-        $this->checkOS('fireware', 'fireware-xtm');
-        $this->checkOS('fireware', 'fireware-fbx');
+        $this->checkOS('fireware', 'fireware-m400');
+        $this->checkOS('fireware', 'fireware-xtm26w');
     }
 
     public function testFlareos()
@@ -1378,12 +1378,6 @@ public function testWaas()
         $this->checkOS('waas');
     }
 
-    public function testWatchguard()
-    {
-        $this->checkOS('firebox');
-        $this->checkOS('firebox', 'firebox1');
-    }
-
     public function testWebpower()
     {
         $this->checkOS('webpower');

diff --git a/tests/snmpsim/firebox.snmprec b/tests/snmpsim/firebox.snmprec
diff --git a/tests/snmpsim/firebox1.snmprec b/tests/snmpsim/firebox1.snmprec
diff --git a/tests/snmpsim/fireware-fbx.snmprec b/tests/snmpsim/fireware-fbx.snmprec
diff --git a/tests/snmpsim/fireware-m400.snmprec b/tests/snmpsim/fireware-m400.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|M400
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.3097.1.5.49
diff --git a/tests/snmpsim/fireware-xtm.snmprec b/tests/snmpsim/fireware-xtm.snmprec
diff --git a/tests/snmpsim/fireware-xtm26w.snmprec b/tests/snmpsim/fireware-xtm26w.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|XTM26-W
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.3097.1.5.21