From aceb572065553b67ff882c3e1df7a3c1532dcca7 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Mon, 19 Sep 2016 08:46:19 -0500
Subject: [PATCH] refactor: F5 discovery cleanup

---
 doc/Extensions/MIB-based-polling.md | 12 ++++--------
 includes/discovery/os/f5.inc.php    |  8 +++-----
 tests/OSDiscoveryTest.php           |  5 +++++
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/doc/Extensions/MIB-based-polling.md b/doc/Extensions/MIB-based-polling.md
index 6448624125..7a707ef1eb 100644
--- a/doc/Extensions/MIB-based-polling.md
+++ b/doc/Extensions/MIB-based-polling.md
@@ -158,18 +158,14 @@ You need to add your desired MIBs to `/opt/librenms/mibs` folder. Afterwards you
 
 ```
 <?php
-if (!$os || $os === 'linux') {
-    $f5_sys_parent = '1.3.6.1.4.1.3375.2.1';
-    if (strpos($sysObjectId, $f5_sys_parent)) {
-        $os = 'f5';
-   }
-
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.3375.2.1')) {
+    $os = 'f5';
 }
 
 ### MIB definition as an array 
 $f5_mibs = array(
-                "ltmVirtualServStatEntry" => "F5-BIGIP-LOCAL-MIB",
-        );
+    'ltmVirtualServStatEntry' => 'F5-BIGIP-LOCAL-MIB',
+);
 
 ### Actual registering of the MIB
 register_mibs($device, $f5_mibs, "includes/discovery/os/f5.inc.php");
diff --git a/includes/discovery/os/f5.inc.php b/includes/discovery/os/f5.inc.php
index afb089287a..3a145edd7a 100644
--- a/includes/discovery/os/f5.inc.php
+++ b/includes/discovery/os/f5.inc.php
@@ -1,7 +1,5 @@
 <?php
-if (!$os || $os === 'linux') {
-    $f5_sys_parent = '1.3.6.1.4.1.3375.2.1';
-    if (strpos($sysObjectId, $f5_sys_parent)) {
-        $os = 'f5';
-    }
+
+if (starts_with($sysObjectId, '.1.3.6.1.4.1.3375.2.1')) {
+    $os = 'f5';
 }
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index fa7670a93d..5bc4d4460f 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -126,6 +126,11 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('endian', 'Linux endian');
     }
 
+    public function testF5()
+    {
+        $this->checkOS('f5', 'Linux', '.1.3.6.1.4.1.3375.2.1.3.4.1000');
+    }
+
     public function testLinux()
     {
         $this->checkOS('linux', 'Linux');