From 9c44b1a80938c547812dbca1cb793446fd9e3c10 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Sat, 15 Apr 2017 01:46:09 -0500
Subject: [PATCH] newdevice: improve IOS-XE detection (#6429)

PPC_LINUX_IOSD or X86_64_LINUX_IOSD means IOS-XE, Drop the X86_64_ as that gives us full coverage.
Drop IOS-XE usage for detection.  Allows us to migrate ios detection to yaml.
---
 includes/definitions/ios.yaml     | 8 ++++++++
 includes/definitions/iosxe.yaml   | 3 +--
 includes/discovery/os/ios.inc.php | 5 -----
 3 files changed, 9 insertions(+), 7 deletions(-)
 delete mode 100644 includes/discovery/os/ios.inc.php

diff --git a/includes/definitions/ios.yaml b/includes/definitions/ios.yaml
index 812f1c884a..a4ebcff2f1 100644
--- a/includes/definitions/ios.yaml
+++ b/includes/definitions/ios.yaml
@@ -8,6 +8,14 @@ over:
     - { graph: device_processor, text: 'CPU Usage' }
     - { graph: device_mempool, text: 'Memory Usage' }
 icon: cisco
+discovery:
+    -
+      sysDescr:
+          - 'Cisco Internetwork Operating System Software'
+          - 'IOS (tm)'
+          - 'Cisco IOS Software'
+          - 'Global Site Selector'
+      sysDescr_regex: '/^((?!LINUX_IOSD).)*$/' #IOS-XE adding more regex will break detection, modify instead
 bad_ifXEntry:
     - cisco1941
     - cisco886Va
diff --git a/includes/definitions/iosxe.yaml b/includes/definitions/iosxe.yaml
index 541f102ab3..746be83dbc 100644
--- a/includes/definitions/iosxe.yaml
+++ b/includes/definitions/iosxe.yaml
@@ -34,5 +34,4 @@ register_mibs:
     ciscoAAASessionMIB: CISCO-AAA-SESSION-MIB
 discovery:
     - sysDescr:
-        - IOS-XE
-        - X86_64_LINUX_IOSD
+        - LINUX_IOSD
diff --git a/includes/discovery/os/ios.inc.php b/includes/discovery/os/ios.inc.php
deleted file mode 100644
index bdbf51f0bc..0000000000
--- a/includes/discovery/os/ios.inc.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-if (str_contains($sysDescr, array('Cisco Internetwork Operating System Software', 'IOS (tm)', 'Cisco IOS Software', 'Global Site Selector')) && !str_contains($sysDescr, array('IOS-XE', 'X86_64_LINUX_IOSD'))) {
-    $os = 'ios';
-}