From aef0928099e74e1c8ec884231b5d85ec87a7aba2 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Mon, 6 Feb 2017 16:41:42 -0600
Subject: [PATCH] refactor: Convert Hikvision discovery to yaml (#5781)

---
 includes/definitions/hikvision.yaml     | 2 ++
 includes/discovery/os/hikvision.inc.php | 7 -------
 tests/OSDiscoveryTest.php               | 1 -
 tests/snmpsim/hikvision.snmprec         | 2 ++
 tests/snmpsim/hikvision1.snmprec        | 1 -
 5 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100644 includes/discovery/os/hikvision.inc.php
 delete mode 100644 tests/snmpsim/hikvision1.snmprec

diff --git a/includes/definitions/hikvision.yaml b/includes/definitions/hikvision.yaml
index c077c1f498..b3e4d77463 100644
--- a/includes/definitions/hikvision.yaml
+++ b/includes/definitions/hikvision.yaml
@@ -4,3 +4,5 @@ type: network
 icon: hikvision
 over:
     - { graph: device_uptime, text: 'Device Uptime' }
+discovery:
+    - sysObjectId: .1.3.6.1.4.1.50001
diff --git a/includes/discovery/os/hikvision.inc.php b/includes/discovery/os/hikvision.inc.php
deleted file mode 100644
index fcc45998f0..0000000000
--- a/includes/discovery/os/hikvision.inc.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-if (str_contains(snmp_get($device, '.1.3.6.1.4.1.39165.1.6.0', '-Oqv', ''), 'Hikvision')) {
-    $os = 'hikvision';
-} elseif (starts_with($sysDescr, 'Hikvision company products')) {
-    $os = 'hikvision';
-}
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index 0e868d92ad..408f7d4ec5 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -701,7 +701,6 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
     public function testHikvision()
     {
         $this->checkOS('hikvision');
-        $this->checkOS('hikvision', 'hikvision1');
     }
 
     public function testHp3par()
diff --git a/tests/snmpsim/hikvision.snmprec b/tests/snmpsim/hikvision.snmprec
index dcb99fa432..5f8ece5079 100644
--- a/tests/snmpsim/hikvision.snmprec
+++ b/tests/snmpsim/hikvision.snmprec
@@ -1 +1,3 @@
+1.3.6.1.2.1.1.1.0|4|Hikvision company products
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.50001
 1.3.6.1.4.1.39165.1.6.0|4|Hikvision
diff --git a/tests/snmpsim/hikvision1.snmprec b/tests/snmpsim/hikvision1.snmprec
deleted file mode 100644
index 9e2479b61a..0000000000
--- a/tests/snmpsim/hikvision1.snmprec
+++ /dev/null
@@ -1 +0,0 @@
-1.3.6.1.2.1.1.1.0|4|Hikvision company products