From c8a77fb73e677ffa3f3710922bf879d256f4ea7a Mon Sep 17 00:00:00 2001
From: Neil Lathwood <neil@lathwood.co.uk>
Date: Wed, 28 Dec 2016 23:04:01 +0000
Subject: [PATCH] newdevice: Added support for TPLink JetStream #5194 (#5249)

---
 html/images/os/tplink.png               | Bin 1577 -> 1154 bytes
 includes/definitions/jetstream.yaml     |   4 +++
 includes/discovery/os/jetstream.inc.php |  34 ++++++++++++++++++++++++
 tests/OSDiscoveryTest.php               |   5 ++++
 tests/snmpsim/jetstream.snmprec         |   2 ++
 5 files changed, 45 insertions(+)
 create mode 100644 includes/definitions/jetstream.yaml
 create mode 100644 includes/discovery/os/jetstream.inc.php
 create mode 100644 tests/snmpsim/jetstream.snmprec

diff --git a/html/images/os/tplink.png b/html/images/os/tplink.png
index 4cfd6eae32d00ec64b557bb90c225f5fd62ff2e3..4afc4dfee454f5517b29014e14184add11d3dafc 100644
GIT binary patch
literal 1154
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyEa{HEjtmSN`?>!lvI6;x#X;^)
z4C~IxyacIC_6YK2V5m}KU}$JzVE6?TYIwoGP-?)y@G60U!D<ErgLuK5U4b@0eGLIV
zA+A6Lh9}N*s;L_uKWBL20+2n5=oSM1|NlR2pehTDgSwI+zhEHEz`!LTD=omxVcojx
z+QU1?=SS-;eD~{A6g#8e%`a^{UQd43vnZeU?0mg*?y6gVH*qW7-fPP_*)r^$D&OjY
z#(%j%Kc-FpWN+|lxrO=Sp68FR8s&5dE6B5HT?`jh<d-~g<3&Klk*`Y+&$)hd!JlTC
zGsXLNCooB=>{&B=nH6hR&|#qcj7i?^F7+P!3!efxoCO|{#X#BvjNMLV+W{4%dAc};
zSe#BySYVcrl9HPI{K1o?BZ_Cw9zK0sUqM4f=g_ee9j@C~%&3rM@$m5ST)aAA%EYOw
zof#@wUENIndYvjg;ous|>&m)#mz%7X!1WZDjSk#OYt}Aay*!^GO-f2}WrB$rBloOX
zGmVQRqgOQaZg2@pP-PU_yp6Hb@Yb!y(A&z|1q_`QR*rklzj(v+XqS?90dwb$YKImH
z+r17k`I0SMZm}EI+6A!gdm!-Hnaj`Zf5QQXrwbA~czYE46j&FY2y1C|cX8R^-gNhb
zgeWiHdkKMl&1)8XEDoOp1>Jg{ef-FIt~0@3rL|eaAX<f8$$=|*Re)5zRm8nO(Kjs9
zc%D3%+GHWdV`O>2&mnvQYjRq&(WBr8Gnl8QC!9H&<T@{*j!}n4B9+_M$L9;{<%L{b
zUEVyg-d9gQa6Awp78VybFJK~Ps6uXvNT;r?RH&2a1Fv@_0RoY(4vdRaOMTtk+;sI=
zpD;7L2w8rj^A=kIFz8iFTq8<S5=&C8l8aJ-6oZk0p_#6sk*<+hh>@|CiGh`=xwe6U
lm4U(kGg=o=H00)|WTsW(*3dU`QVvi9gQu&X%Q~loCII-x^!ES&

literal 1577
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzmUKs7M+SzC{oH>NSwWJ?9znhg
z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!CBxDS<Jw|p9sQ?E9{qN
zGB7YkW`;zRMELqxCFkerC8p#jrRr7W764T<FxXUB0hzg}C5Z|ZxjA{oRu#5NU=>zC
zHb_`sNdc^+B->Ug!Z$#{Ilm}X!Bo#g&p^qJOF==wrYI%ND#*nRsvXF)RmvzSDX`Ml
zFE20GD>v55FG|-pw6wI;H!#vSGSUUA&@HaaD@m--%_~-h7y>iLCAB!YD6^m>Ge1uO
zWNu<oerbuVk`l-wIDojbBr^?RQ(iIDTR;!$gJkp#^$hgkW&^d_fJCkQi!xJzHiOK!
zGqeG#L=l79W1|nU9LX^dpMph!UbW-0(T4|{9hc7`^+;f(S$VoRhD30_4U5f~9V$^b
zN&kQ5zsbv@r!CvIEzIzm<?02cYxrCx-kg&zSFEyJ?{dL#Z;{X3IIb#9jSeG$a>Yl-
z3IZgXcP8#WRQKvc#O$6UDyRKFtN#4-{PR4uAlDnI`9%*-|K9i9=DF?p%6dM-hi~Us
z-8h(d@8IUE7oC|7bMPn|^faV?5a^x3V7*`OzN_)li}mukR~Ut@_R49^d3|Zq$Kv9B
zceb0}io5BY`851-O?Oa%*ty%9tLMB9_?5wbEz?O*;K8zsN7LFhv^QT`Hswi%OSj${
zi}wr73ss)*9GtY$!DX+${S`++6+e!Uo&9+WxwFsp3eC@+z-FHLr)7fc4QUoVw%iXN
zCfJ|SJ=3~&#l?rMS={=+ayYC_bwp=*T(|BB&Nq<KOET|xd0}TW`|&qvLa!J4S;s&8
zs4RBm#olu}Irw*8ex-Q)XS1PtQA(+A{^b3fVw|b1+ifh~9{=}5B28HF&W`8<m%i@*
zaI~1yWOnW?)tXs7k8Xdie{@4V`^S$PJohS6#opJIipJ}U7pCYnOkQu_s%^gchPm*;
zsAWCkc6)jjw?FpqV>9^g!Lr<M{iB;R1)S>G{r*g9>SR$#NIUtu#rrV(^GiQ|da()a
zmlhA(RPp}}+p)!VIcB$hd<tUw=)urkyu0wz-b|Z$911>jT&7(QyxGNO+rbudB5YQK
zN8jV?kAE+SJi}2b^Pzf<McormpSK?$K0QBuV~KzJ{hTn(fLss0GxIw$#r%A>t6bBn
z;{Rx<-=}wE<CaZ*@_OqYr-iw1yw>9OuXv-N&KY(Ae(S4t+fVm>4!>;i_3nF%4d#vJ
z{AZo=OA|InP0)SO(O>o9Z1!cY+Y9qO_iG)RB_dfoTkG1#+go=>_=ZOwvyF*4oA9%Y
z@qJBwy7t90#$K|e%^x~M`;YydA@O-ZK<=YEPjBBialLT;jRWcS>rU4eJm`##@DzQx
zCG*FNGrDi)e@ZNTpSNe$iH9Yt+8Pd@$^O9Kxglfn5f%Q3IUgoP^52})Xq+jVuga`(
z^;W@c-4oY&e!SUZtz7bWU!!*_vp(xviLX%`k14H{l6_N{y~dt5y_h%Ta_NEd$F4-a
zcRb}49eYM>+e*EOCsuQ;u(>e7q2;bw%bhSA+f3&RbB~|V<B#FvK2^mXyyjQO^~SK>
zz0W1Dr3a~AeIEDd`SIF4TRHFMiQAq!p5!~nVAC5uUMXuO|L2TlQnQ&Pe@)~#86YU&
z>cPR-x}amzS*bZ1o1Nv7Qa0TYxq7BRIO541KmRjA$09O<jJD5`wK)?IzT>#NkKeaV
zUfZ=g`F=a+{0w2#uDxCF#40Al<(TRaoUz(<9q+Z3t4bq(uV0rFX{Px@?7{!~P%bv_
zM_zf#=_kEa`xm&lC6^m8Bs^bnYO1(T+nQ_}mkO^hEba@xot85Gci^KwQ`5b7H3{A;
zu1cKPr|I<Y_vil)wym}In9BX`g@llVTY^MmBFjIv)9Q;ee%o!{1uBp|UHx3vIVCg!
E08F@`ng9R*

diff --git a/includes/definitions/jetstream.yaml b/includes/definitions/jetstream.yaml
new file mode 100644
index 0000000000..1f5c15d1a0
--- /dev/null
+++ b/includes/definitions/jetstream.yaml
@@ -0,0 +1,4 @@
+os: jetstream
+text: 'TP-Link JetStream'
+type: network
+icon: tplink
diff --git a/includes/discovery/os/jetstream.inc.php b/includes/discovery/os/jetstream.inc.php
new file mode 100644
index 0000000000..61b7f1948f
--- /dev/null
+++ b/includes/discovery/os/jetstream.inc.php
@@ -0,0 +1,34 @@
+<?php
+/**
+ * jetstream.inc.php
+ *
+ * LibreNMS os discovery module for JetStream
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @package    LibreNMS
+ * @link       http://librenms.org
+ * @copyright  2016 Neil Lathwood
+ * @author     Neil Lathwood <neil@lathwood.co.uk>
+ */
+
+$jetstream = array(
+    '.1.3.6.1.4.1.11863.5.34'
+);
+
+if (starts_with($sysObjectId, $jetstream)) {
+    $os = 'jetstream';
+}
+
+unset($jetstream);
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index fd4bb6f41a..a6d58603a0 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -761,6 +761,11 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('jetdirect', 'jetdirect2');
     }
 
+    public function testJetstream()
+    {
+        $this->checkOS('jetstream');
+    }
+
     public function testJuniperex2500os()
     {
         $this->checkOS('juniperex2500os');
diff --git a/tests/snmpsim/jetstream.snmprec b/tests/snmpsim/jetstream.snmprec
new file mode 100644
index 0000000000..ac9d065ae8
--- /dev/null
+++ b/tests/snmpsim/jetstream.snmprec
@@ -0,0 +1,2 @@
+1.3.6.1.2.1.1.1.0|4|JetStream 48-Port Gigabit L2 Managed Switch with 4 SFP Slots
+1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.11863.5.34