From 314a5524378125e719f752b9afb015c2b340c40e Mon Sep 17 00:00:00 2001
From: vivia11 <nguyen_vivia@hotmail.com>
Date: Wed, 28 Mar 2018 22:54:02 -0600
Subject: [PATCH] devices: Add Phybridge OS support (#8456)

* OS yaml definition for Phybridge

* Add images and snmp data

* Removed width/height from svg and added more specific discovery for phybridge

* Minimized svg and inverted icon

* added json test file

* update to json file

* Changing os name: phybridge to phybridge-flex

* Update json file to phybridge-flex

* Remove unneeded test data
---
 html/images/logos/phybridge.svg          |  1 +
 html/images/os/phybridge.svg             |  1 +
 includes/definitions/phybridge-flex.yaml | 16 ++++++++++
 tests/data/phybridge-flex.json           | 40 ++++++++++++++++++++++++
 tests/snmpsim/phybridge-flex.snmprec     |  7 +++++
 5 files changed, 65 insertions(+)
 create mode 100644 html/images/logos/phybridge.svg
 create mode 100644 html/images/os/phybridge.svg
 create mode 100644 includes/definitions/phybridge-flex.yaml
 create mode 100644 tests/data/phybridge-flex.json
 create mode 100644 tests/snmpsim/phybridge-flex.snmprec

diff --git a/html/images/logos/phybridge.svg b/html/images/logos/phybridge.svg
new file mode 100644
index 0000000000..35726d7d29
--- /dev/null
+++ b/html/images/logos/phybridge.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1" viewBox="0 0 700 247"><path d="M30 92c-5 2-13 11-15 15-4 9-5 21-3 27 4 10 8 15 14 19 5 4 6 4 10 4 4-1 7-4 7-7s-2-5-4-5-10-7-12-12c-5-11 0-26 11-29 4-2 5-3 5-6 0-6-7-10-13-6zm26-1c-2 1-3 2-3 6s0 4 4 6c10 5 16 20 12 30-2 4-10 12-13 12-2 0-2 1-2 5v5l4 2c4 1 4 1 9-3 7-5 11-10 14-16 2-3 2-6 2-14l-1-11-3-6c-2-6-7-11-13-14-5-3-6-3-10-2zm554 12c-5 2-11 8-12 12l-1 5-1 7c3 16 17 25 35 21 7-2 7-2 7-15v-11h-15v3c0 2 0 3 4 3h5v7c0 5 0 6-3 7-4 2-12 1-17-1-6-4-8-8-8-16s1-11 7-15c2-2 5-3 9-4 5 0 6 0 9 3l4 2 3-2c3-3 3-4-7-8-5-2-13-1-19 2zm-505-2v47h6v-36h2l2 3 11 17 10 15 4 1h5v-46h-6l-1 17c0 19 0 22-3 16l-11-16-9-15-4-2-4-1h-2zm53 1c-1 1 0 4 1 7l3 6 1 3 1 2 1 4 4 9 2 8c3 6 4 7 7 7 2 0 2 1 13-28l7-18h-4c-2 0-3 1-4 4l-6 15-1 4-1 5-3 5c-1 4-2 3-5-5l-3-8a200 200 0 0 1-7-19c-1-1-6-2-7-1zm121 1v23l1 22h5v-10l1-10h7c12 0 17-4 17-13 0-10-3-12-19-13l-12 1zm23 7c3 3 3 7 0 10-2 1-4 2-9 2h-7l-1-6c0-9 0-9 8-9 6 1 7 1 9 3zm24-8l-1 23v23h6v-21h24v21h6v-45l-3-1h-3v19h-12l-12-1v-9c0-8 0-9-2-9h-3zm47 0l2 3 9 13 7 11v19h6l-1-10v-9l8-13 9-14c-1-2-6 0-9 3l-4 6c-6 11-7 12-9 7l-8-13c-3-3-8-5-10-3zm148 0l-1 23v23h5l1-23-1-23h-5zm-316 2c-1 3 1 4 7 3l8 1v20l1 20h6v-40l8-1c6 0 7 0 7-2v-3h-18l-19 1zm221 21v23l12-1c10 0 11 0 15-2 4-3 5-6 5-11 0-2-1-4-4-7l-4-4 3-3c2-2 3-4 3-7 0-8-5-11-19-11h-11v23zm21-16l2 4c0 6-4 8-11 8h-6v-14h6l9 2zm1 19c3 2 3 3 3 6 0 6-3 9-12 9h-7v-16c1-2 12-1 16 1zm26-26v45l2 1h3v-9l1-11 4-1c2 0 3 1 5 3a90 90 0 0 0 7 14c1 2 3 4 6 4 4 1 5-1 2-5l-10-16 3-1 4-3c2-3 3-5 3-9s0-5-4-9l-3-3h-23zm22 7c3 3 3 8 0 11l-9 1-7 1-1-7c0-5 1-7 2-8 2-1 13 1 15 2zm47-6v44h12c14 0 16-1 22-7 5-5 6-8 6-15 0-11-4-17-12-21-3-2-6-2-16-2l-12 1zm21 5c9 2 13 8 13 17 0 7-2 11-8 14-4 2-16 4-18 3l-1-17v-17h14zm93-5v44h30l1-2v-3h-12l-12-1-1-7v-7h21v-6h-21v-14h23v-5h-29z"/><path d="M36 110l-4 4v8l2 12c1 4 7 8 8 7 1 0 1-34-1-35l-5 4zm17-3v36c1 1 8-6 10-9 3-6 1-18-5-24-3-3-5-5-5-3z"/></svg>
\ No newline at end of file
diff --git a/html/images/os/phybridge.svg b/html/images/os/phybridge.svg
new file mode 100644
index 0000000000..e06ceb1802
--- /dev/null
+++ b/html/images/os/phybridge.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1" viewBox="0 0 900 900"><path fill="#fff" d="M0 450v450h900V0H0v450zm339-324c-2 5 0 8 8 11l21 7c15 4 20 6 26 12 9 11 10 16 10 59v34l-15 5c-46 14-77 31-102 57-33 35-49 80-51 147l1 33a221 221 0 0 0 63 112c29 29 61 49 95 60l9 3v13c0 24-4 47-12 64-4 8-11 16-15 16l-13 3c-20 4-21 4-25 3-3-1-5-1-7 1-3 1-7 6-7 10l-1 2-33-15a351 351 0 0 1-166-436 347 347 0 0 1 214-204v3zm231 0a350 350 0 0 1 179 507 357 357 0 0 1-163 141l-6 2-4-3c-7-6-11-7-26-8-14-1-29-4-32-6-4-3-10-23-16-51-2-8-2-15-3-28v-18l6-1 48-19c59-29 96-75 108-133 2-10 3-14 3-39 0-30-1-37-7-62-11-45-31-83-60-112-26-26-57-43-90-51l-8-1v-36l1-36 2-7 6-9c5-7 25-16 42-19 11-2 14-6 11-12l-1-2 10 3zM404 633a129 129 0 0 1-42-26c-42-36-68-100-68-164 0-79 38-141 101-164l9-3v357zm114-344c35 21 63 57 78 101 22 67 15 140-18 191-8 11-26 30-37 38a155 155 0 0 1-41 19l-1-179V280l6 3 13 6z"/><path fill="#31435c" d="M317 775a349 349 0 0 1 21-651v2c-2 7 6 12 29 18 17 5 21 7 27 14 8 9 9 10 9 53v38l-20 6c-44 15-71 30-95 56-21 21-34 44-42 74-9 29-13 82-9 107 5 29 23 66 46 93 30 36 70 64 108 77l12 4v14c0 33-7 60-19 73l-5 5-18 4c-15 3-19 4-22 3h-7c-3 2-7 8-7 11 0 2-1 2-8-1z"/><path fill="#31435c" d="M393 627c-21-11-39-26-53-45-48-63-59-157-27-226a151 151 0 0 1 83-77l7-2v355l-10-5zm107-168V281l11 5c42 22 76 67 89 120 6 21 7 32 8 56a196 196 0 0 1-34 124c-7 9-26 27-34 33-11 7-35 18-39 18l-1-178z"/><path fill="#31435c" d="M577 773c-4-4-12-7-25-8l-30-5c-4-2-5-2-8-8a302 302 0 0 1-15-76v-13l8-2 49-20c57-30 94-74 105-131 2-10 3-15 3-39 0-32-1-40-7-63-15-63-45-107-93-139-17-11-40-21-58-24l-7-2 1-36v-36l3-6 6-10c7-7 21-13 45-19 6-1 9-4 8-9v-3l7 2a352 352 0 0 1 227 293 347 347 0 0 1-198 349c-16 8-18 8-21 5z"/></svg>
\ No newline at end of file
diff --git a/includes/definitions/phybridge-flex.yaml b/includes/definitions/phybridge-flex.yaml
new file mode 100644
index 0000000000..4e5d51134a
--- /dev/null
+++ b/includes/definitions/phybridge-flex.yaml
@@ -0,0 +1,16 @@
+os: phybridge-flex
+text: 'NVT Phybridge'
+icon: phybridge
+type: network
+over:
+    - { graph: device_bits, text: 'Device Traffic' }
+    - { graph: device_processor, text: 'CPU Usage' }
+    - { graph: device_mempool, text: 'Memory Usage' }
+discovery:
+    - 
+        sysObjectID:
+            - .1.3.6.1.4.1.8072.3.2.10
+        sysDescr:
+            - Phybridge FLEX
+
+
diff --git a/tests/data/phybridge-flex.json b/tests/data/phybridge-flex.json
new file mode 100644
index 0000000000..8e4065ac9f
--- /dev/null
+++ b/tests/data/phybridge-flex.json
@@ -0,0 +1,40 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "<private>",
+                    "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10",
+                    "sysDescr": "Phybridge FLEX 24 Switch 7.0.0",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": "",
+                    "features": null,
+                    "location": null,
+                    "os": "phybridge-flex",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "phybridge.svg"
+                }
+            ]
+        },
+        "poller": {
+            "devices": [
+                {
+                    "sysName": "<private>",
+                    "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10",
+                    "sysDescr": "Phybridge FLEX 24 Switch 7.0.0",
+                    "sysContact": "<private>",
+                    "version": null,
+                    "hardware": "",
+                    "features": null,
+                    "location": "<private>",
+                    "os": "phybridge-flex",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "phybridge.svg"
+                }
+            ]
+        }
+    }
+}
diff --git a/tests/snmpsim/phybridge-flex.snmprec b/tests/snmpsim/phybridge-flex.snmprec
new file mode 100644
index 0000000000..6c6bdd3c10
--- /dev/null
+++ b/tests/snmpsim/phybridge-flex.snmprec
@@ -0,0 +1,7 @@
+1.3.6.1.2.1.1.1.0|4|Phybridge FLEX 24 Switch 7.0.0
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.8072.3.2.10
+1.3.6.1.2.1.1.3.0|67|473281131
+1.3.6.1.2.1.1.4.0|4|<private>
+1.3.6.1.2.1.1.5.0|4|<private>
+1.3.6.1.2.1.1.6.0|4|<private>
+1.3.6.1.6.3.10.2.1.3.0|2|4732811