From 74c7611bcadbfbc705317d8fdc78951241fdd26b Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Mon, 15 May 2017 17:07:14 -0500
Subject: [PATCH] newdevice: Make TiMOS detection more generic, rebrand to
 Nokia (#6645)

Includes all product lines SR, SAS, ESS
---
 html/images/os/nokia.svg        |  1 +
 includes/definitions/timos.yaml | 17 ++++-------------
 2 files changed, 5 insertions(+), 13 deletions(-)
 create mode 100644 html/images/os/nokia.svg

diff --git a/html/images/os/nokia.svg b/html/images/os/nokia.svg
new file mode 100644
index 0000000000..89cdafba88
--- /dev/null
+++ b/html/images/os/nokia.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 800 134.84"><path fill="#1c4598" d="M38.52 133.18H0v-131h66.62l76.43 97.8V2.18h38.52v131H116.3L38.52 33.71v99.47m327.35-40.51c0 18.21-3.22 24.49-8.55 30.51-8.17 8.96-20.06 11.66-42.97 11.66h-65.77c-22.91 0-34.82-2.7-42.98-11.66-5.33-6.02-8.55-12.3-8.55-30.51v-50.5c0-18.2 3.22-24.47 8.55-30.5C213.77 2.7 225.67 0 248.58 0h65.77c22.91 0 34.8 2.7 42.97 11.67 5.33 6.03 8.55 12.3 8.55 30.5v50.5m-53.14 8.98c8.8 0 11.9-.52 14.01-2.44 1.97-1.79 2.84-4.1 2.84-11.8V47.43c0-7.7-.87-9.99-2.84-11.79-2.11-1.93-5.21-2.44-14.01-2.44h-62.54c-8.8 0-11.9.51-14 2.44-1.98 1.8-2.85 4.09-2.85 11.79v39.98c0 7.7.87 10.01 2.85 11.8 2.1 1.92 5.2 2.44 14 2.44h62.54M421.85 2.18v131H381.6v-131h40.25m68 0h53.14l-71.72 61.27 80.89 69.73H495.3l-73.45-68.32 68-62.68m69.73 0h40.26v131h-40.26m193.73 0l-11.91-22.82h-77.89l-11.77 22.81h-44.47L678.62 2.18h50.04l71.34 131h-46.69M677.5 81.91h50.05l-25.03-47.43-25.02 47.43"/></svg>
diff --git a/includes/definitions/timos.yaml b/includes/definitions/timos.yaml
index 30e4cc13f9..76b1f0a79b 100644
--- a/includes/definitions/timos.yaml
+++ b/includes/definitions/timos.yaml
@@ -1,25 +1,16 @@
 os: timos
 group: timos
-text: 'Alcatel-Lucent TiMOS'
+text: 'Nokia SR OS (TiMOS)'
 type: network
 ifXmcbc: 1
 ifname: 1
 over:
     - { graph: device_bits, text: 'Device Traffic' }
-icon: alcatellucent
+icon: nokia
 discovery:
     - sysObjectId:
-        - .1.3.6.1.4.1.6527.1.3
-        - .1.3.6.1.4.1.6527.6.2.1.2.2.
-        - .1.3.6.1.4.1.6527.6.2.1.2.6.
-        - .1.3.6.1.4.1.6527.6.2.1.2.5.
-        - .1.3.6.1.4.1.6527.6.2.1.2.8.
-        - .1.3.6.1.4.1.6527.6.2.1.2.9.
-        - .1.3.6.1.4.1.6527.1.6.1
-        - .1.3.6.1.4.1.6527.1.6.5
-        - .1.3.6.1.4.1.6527.6.1.1.2.
-        - .1.3.6.1.4.1.6527.1.9.1
-        - .1.3.6.1.4.1.6527.1.15.
+        - .1.3.6.1.4.1.6527.
+
 poller_modules:
     toner: 0
 discovery_modules: