From eb1014a657e4764240ebf471ea7411006fc89cdb Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Mon, 3 Jul 2017 13:43:12 -0500
Subject: [PATCH] device: Updated Gamatronic ups use sysObjectID for os
 discovery (#6940)

---
 includes/definitions/gamatronicups.yaml       | 5 ++++-
 includes/discovery/os/gamatronicups.inc.php   | 7 -------
 mibs/{gamtronic => gamatronic}/GAMATRONIC-MIB | 0
 tests/snmpsim/gamatronicups.snmprec           | 2 ++
 4 files changed, 6 insertions(+), 8 deletions(-)
 delete mode 100644 includes/discovery/os/gamatronicups.inc.php
 rename mibs/{gamtronic => gamatronic}/GAMATRONIC-MIB (100%)

diff --git a/includes/definitions/gamatronicups.yaml b/includes/definitions/gamatronicups.yaml
index 97ba8c3be5..a835a73a0f 100644
--- a/includes/definitions/gamatronicups.yaml
+++ b/includes/definitions/gamatronicups.yaml
@@ -2,4 +2,7 @@ os: gamatronicups
 text: 'Gamatronic UPS Stack'
 type: power
 mib_dir:
-    - gamtronic
+    - gamatronic
+discovery:
+    - sysObjectId:
+      - .1.3.6.1.4.1.6050.5
diff --git a/includes/discovery/os/gamatronicups.inc.php b/includes/discovery/os/gamatronicups.inc.php
deleted file mode 100644
index 955e99b36b..0000000000
--- a/includes/discovery/os/gamatronicups.inc.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if (empty($sysDescr)) {
-    if (snmp_get($device, 'psUnitManufacture.0', '-Oqv', 'GAMATRONIC-MIB', 'gamtronic') == 'Gamatronic') {
-        $os = 'gamatronicups';
-    }
-}
diff --git a/mibs/gamtronic/GAMATRONIC-MIB b/mibs/gamatronic/GAMATRONIC-MIB
similarity index 100%
rename from mibs/gamtronic/GAMATRONIC-MIB
rename to mibs/gamatronic/GAMATRONIC-MIB
diff --git a/tests/snmpsim/gamatronicups.snmprec b/tests/snmpsim/gamatronicups.snmprec
index 160ce08155..4045c6e1a2 100644
--- a/tests/snmpsim/gamatronicups.snmprec
+++ b/tests/snmpsim/gamatronicups.snmprec
@@ -1 +1,3 @@
+1.3.6.1.2.1.1.1.0|4|
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.6050.5
 1.3.6.1.4.1.6050.1.1.2.0|4|Gamatronic