VC-3689: add SNMP fingerprinters for ArubaOS 8/10/CX

Author: pnovotny-r7

identifiers/os_family.txt

@@ -12,6 +12,7 @@ Aficio
 AirPort
 Apple iOS
 Application Switch
+Aruba
 BOSS
 BayRS
 BayStack

identifiers/os_product.txt

@@ -12,6 +12,9 @@ ADSL Modem
 AIX
 AMD
 AOS
+AOS-8
+AOS-10
+AOS-CX
 ATEN Linux
 Access Gateway
 AccessRunner ADSL router

xml/snmp_sysdescr.xml

@@ -773,15 +773,37 @@
                            Aruba Networks
   =======================================================================-->
 
-  <fingerprint pattern="^Aruba\s(JL\d+A)\s(\d+[A-Z]?)\S+\sSwitch.+ROM\s([A-Z]+(?:\.\d+)+)">
-    <description>HP Aruba Network Switch</description>
-    <example hw.model="JL256A" hw.product="2930F" os.version="WC.16.01.0010">Aruba JL256A 2930F-48G-PoE+-4SFP+ Switch, revision WC.16.11.0004, ROM WC.16.01.0010</example>
-    <param pos="0" name="os.vendor" value="Aruba Networks"/>
-    <param pos="3" name="os.version"/>
-    <param pos="0" name="hw.vendor" value="Aruba Networks"/>
-    <param pos="2" name="hw.product"/>
+  <fingerprint pattern="ArubaOS \(MODEL: ([^\)]+)\), Version (8\.[^\s]+)">
+    <description>Aruba OS 8</description>
+    <example hw.model="ArubaMM-VA" os.version="8.12.0.2">ArubaOS (MODEL: ArubaMM-VA), Version 8.12.0.2 SSR (90468)</example>
+    <param pos="0" name="os.vendor" value="Aruba"/>
+    <param pos="0" name="os.family" value="Aruba"/>
+    <param pos="0" name="os.product" value="AOS-8"/>
+    <param pos="0" name="hw.device" value="Switch"/>
     <param pos="1" name="hw.model"/>
+    <param pos="2" name="os.version"/>
+  </fingerprint>
+
+  <fingerprint pattern="ArubaOS \(MODEL: ([^\)]+)\), Version (10\.[^\s]+)">
+    <description>Aruba OS 10</description>
+    <example hw.model="Aruba7005" os.version="10.7.0.1">ArubaOS (MODEL: Aruba7005), Version 10.7.0.1 SSR (91033)</example>
+    <param pos="0" name="os.vendor" value="Aruba"/>
+    <param pos="0" name="os.family" value="Aruba"/>
+    <param pos="0" name="os.product" value="AOS-10"/>
     <param pos="0" name="hw.device" value="Switch"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="2" name="os.version"/>
+  </fingerprint>
+
+  <fingerprint pattern="Aruba\s+(.+)(?:\s+\D+\.|\s+)(\d[\d\.]+)">
+    <description>Aruba OS CX</description>
+    <example hw.model="ABC123 ArubaOS-CX_OVA" os.version="10.07.0010">Aruba ABC123 ArubaOS-CX_OVA Virtual.10.07.0010</example>
+    <param pos="0" name="os.vendor" value="Aruba"/>
+    <param pos="0" name="os.family" value="Aruba"/>
+    <param pos="0" name="os.product" value="AOS-CX"/>
+    <param pos="0" name="hw.device" value="Switch"/>
+    <param pos="1" name="hw.model"/>
+    <param pos="2" name="os.version"/>
   </fingerprint>
 
   <!--======================================================================
@@ -7702,4 +7724,4 @@ Copyright (c) 1995-2005 by Cisco Systems
     <param pos="0" name="os.device" value="Broadband Router"/>
   </fingerprint>
 
-</fingerprints>
+</fingerprints>