diff --git a/LibreNMS/Modules/OS.php b/LibreNMS/Modules/OS.php index 2f3787f883..64130c5a0d 100644 --- a/LibreNMS/Modules/OS.php +++ b/LibreNMS/Modules/OS.php @@ -35,6 +35,7 @@ class OS implements Module public function discover(\LibreNMS\OS $os) { $this->updateLocation($os); + $this->sysContact($os); if ($os instanceof OSDiscovery) { // null out values in case they aren't filled. $os->getDevice()->fill([ @@ -113,4 +114,14 @@ class OS implements Module $device->location->save(); } } + + private function sysContact(\LibreNMS\OS $os) + { + $device = $os->getDevice(); + $device->sysContact = snmp_get($os->getDeviceArray(), 'sysContact.0', '-Ovq', 'SNMPv2-MIB'); + $device->sysContact = str_replace(['', '"', '\n', 'not set'], null, $device->sysContact); + if (empty($device->sysContact)) { + $device->sysContact = null; + } + } } diff --git a/includes/polling/core.inc.php b/includes/polling/core.inc.php index b1ff122254..463a2defcf 100644 --- a/includes/polling/core.inc.php +++ b/includes/polling/core.inc.php @@ -15,10 +15,9 @@ use LibreNMS\Config; use LibreNMS\RRD\RrdDefinition; use LibreNMS\Util\Time; -$snmpdata = snmp_get_multi_oid($device, ['sysUpTime.0', 'sysContact.0', 'sysName.0', 'sysObjectID.0', 'sysDescr.0'], '-OQnUt', 'SNMPv2-MIB'); +$snmpdata = snmp_get_multi_oid($device, ['sysUpTime.0', 'sysName.0', 'sysObjectID.0', 'sysDescr.0'], '-OQnUt', 'SNMPv2-MIB'); $poll_device['sysUptime'] = $snmpdata['.1.3.6.1.2.1.1.3.0']; -$poll_device['sysContact'] = str_replace("\n", '', $snmpdata['.1.3.6.1.2.1.1.4.0']); $poll_device['sysName'] = str_replace("\n", '', strtolower($snmpdata['.1.3.6.1.2.1.1.5.0'])); $poll_device['sysObjectID'] = $snmpdata['.1.3.6.1.2.1.1.2.0']; $poll_device['sysDescr'] = str_replace(chr(218), "\n", $snmpdata['.1.3.6.1.2.1.1.1.0']); @@ -56,14 +55,8 @@ if ($uptime != 0 && Config::get("os.{$device['os']}.bad_uptime") !== true) { $device['uptime'] = $uptime; }//end if -$poll_device['sysContact'] = str_replace('"', '', $poll_device['sysContact']); - -if ($poll_device['sysContact'] == 'not set') { - $poll_device['sysContact'] = ''; -} - // Save results of various polled values to the database -foreach (['sysContact', 'sysObjectID', 'sysName', 'sysDescr'] as $elem) { +foreach (['sysObjectID', 'sysName', 'sysDescr'] as $elem) { if ($poll_device[$elem] != $device[$elem]) { $update_array[$elem] = $poll_device[$elem]; $device[$elem] = $poll_device[$elem]; diff --git a/tests/data/3com_4200.json b/tests/data/3com_4200.json index 8d8f7f5e73..399148860e 100644 --- a/tests/data/3com_4200.json +++ b/tests/data/3com_4200.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.43.10.27.4.1.2.11", - "sysDescr": "3Com SuperStack 3", - "sysContact": null, - "version": "3.00", - "hardware": "SuperStack 3 Switch 4200", - "features": "07 09 14 15 17 1A 1B 1C 1E 20 21 22 23 25 26 28 0A 32 39 20 32 41 20 33 38 20 34 32 20 34 33 20 34 34", - "os": "3com", - "type": "network", - "serial": "L3ZV7LJ6449A0", - "icon": "3com.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/adva_fsp150_ge112.json b/tests/data/adva_fsp150_ge112.json index 3394212242..8f3da979ed 100644 --- a/tests/data/adva_fsp150_ge112.json +++ b/tests/data/adva_fsp150_ge112.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2544.1.12.1.1.8", - "sysDescr": "FSP150CC-GE112", - "sysContact": null, - "version": "6.3.1-106", - "hardware": "FSP150CC-GE112 1.01", - "features": null, - "os": "adva_fsp150", - "type": "network", - "serial": "LBADVA71171203608", - "icon": "adva.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/adva_fsp150_ge114pro.json b/tests/data/adva_fsp150_ge114pro.json index 87616ecdee..351d20e02a 100644 --- a/tests/data/adva_fsp150_ge114pro.json +++ b/tests/data/adva_fsp150_ge114pro.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2544.1.12.1.1.22", - "sysDescr": "FSP 150-GE114Pro", - "sysContact": null, - "version": null, - "hardware": "GE114Pro", - "features": null, - "os": "adva_fsp150", - "type": "network", - "serial": null, - "icon": "adva.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/adva_fsp150_xg116pro.json b/tests/data/adva_fsp150_xg116pro.json index 24f2ad5533..425b09b64d 100644 --- a/tests/data/adva_fsp150_xg116pro.json +++ b/tests/data/adva_fsp150_xg116pro.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2544.1.12.1.1.39", - "sysDescr": "FSP150CC-XG116PRO", - "sysContact": null, - "version": null, - "hardware": "XG116Pro", - "features": null, - "os": "adva_fsp150", - "type": "network", - "serial": null, - "icon": "adva.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/advantech.json b/tests/data/advantech.json index 5b5e4afce4..147bbc7f1b 100644 --- a/tests/data/advantech.json +++ b/tests/data/advantech.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.10297.202.7000", - "sysDescr": "Switch", - "sysContact": null, - "version": "1.01.01", - "hardware": "EKI-7708G-4FP", - "features": null, - "os": "advantech", - "type": "network", - "serial": null, - "icon": "advantech.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/airconsole.json b/tests/data/airconsole.json index 8388092be3..ec0270d269 100644 --- a/tests/data/airconsole.json +++ b/tests/data/airconsole.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.14358.1", - "sysDescr": "Airconsole 2.80", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "airconsole", - "type": "network", - "serial": null, - "icon": "airconsole.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/airos-af-ltu.json b/tests/data/airos-af-ltu.json index 0e681ced51..80cb09544a 100644 --- a/tests/data/airos-af-ltu.json +++ b/tests/data/airos-af-ltu.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux PRIVATE 3.14.65 #7 SMP PREEMPT RT Wed Mar 14 06:22:08 UTC 2018 armv7l", - "sysContact": null, - "version": ".v1.1.1-BETA2.00015.180314.0503", - "hardware": "airFiber 5XHD", - "features": null, - "os": "airos-af-ltu", - "type": "wireless", - "serial": null, - "icon": "ubiquiti.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/airos-af-ltu_1.4.0.json b/tests/data/airos-af-ltu_1.4.0.json index f4d16bf2ec..cdb990ff3e 100644 --- a/tests/data/airos-af-ltu_1.4.0.json +++ b/tests/data/airos-af-ltu_1.4.0.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux PRIVATE 3.14.65 #1 SMP PREEMPT RT Wed May 13 13:37:04 UTC 2020 armv7l", - "sysContact": null, - "version": "v1.4.0", - "hardware": "airFiber 5XHD", - "features": null, - "os": "airos-af-ltu", - "type": "wireless", - "serial": null, - "icon": "ubiquiti.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/airos-af.json b/tests/data/airos-af.json index c5c381a665..d323491722 100644 --- a/tests/data/airos-af.json +++ b/tests/data/airos-af.json @@ -347,24 +347,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.10002.1", - "sysDescr": "Linux 2.6.33 #1 Fri Jan 26 16:39:18 CST 2018 armv5tejl", - "sysContact": null, - "version": "v4.0.3", - "hardware": null, - "features": null, - "os": "airos-af", - "type": "wireless", - "serial": null, - "icon": "ubiquiti.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -381,7 +363,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/airos.json b/tests/data/airos.json index 1b1f6a5fa9..bcf02b1cd0 100644 --- a/tests/data/airos.json +++ b/tests/data/airos.json @@ -702,24 +702,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.10002.1", - "sysDescr": "Linux 2.6.32.68 #1 Fri Dec 16 15:44:21 EET 2016 mips", - "sysContact": null, - "version": "8.5.1.37185.180307.0931", - "hardware": "Rocket Prism 5AC Gen2", - "features": null, - "os": "airos", - "type": "wireless", - "serial": null, - "icon": "ubiquiti.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -736,6 +718,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/airos_airos8.json b/tests/data/airos_airos8.json index a1a0c6060a..4814891b2a 100644 --- a/tests/data/airos_airos8.json +++ b/tests/data/airos_airos8.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.10002.1", - "sysDescr": "Linux 2.6.32.68 #1 Thu Aug 22 16:38:44 EEST 2019 mips", - "sysContact": null, - "version": "8.6.2.41239.190822.1633", - "hardware": "LiteBeam 5AC Gen2", - "features": null, - "os": "airos", - "type": "wireless", - "serial": null, - "icon": "ubiquiti.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/aix.json b/tests/data/aix.json index 422e661484..1646cd5cab 100644 --- a/tests/data/aix.json +++ b/tests/data/aix.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2.3.1.2.1.1.3", - "sysDescr": "IBM PowerPC CHRP Computer\nMachine Type: 0x0800004c Processor id: 00F61F574C00\nBase Operating System Runtime AIX version: 06.01.0009.0300\nTCP/IP Client Support version: 06.01.0009.0300", - "sysContact": null, - "version": "6.1", - "hardware": null, - "features": null, - "os": "aix", - "type": "server", - "serial": "00F61F574C00", - "icon": "aix.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/aix_net-snmp.json b/tests/data/aix_net-snmp.json index 061e51e721..75b374e7bf 100644 --- a/tests/data/aix_net-snmp.json +++ b/tests/data/aix_net-snmp.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.15", - "sysDescr": "AIX testhost 1 7 ", - "sysContact": null, - "version": "7.1", - "hardware": null, - "features": null, - "os": "aix", - "type": "server", - "serial": "", - "icon": "aix.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/aix_std.json b/tests/data/aix_std.json index 621b7c567d..68674bcb46 100644 --- a/tests/data/aix_std.json +++ b/tests/data/aix_std.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2.3.1.2.1.1.3", - "sysDescr": "IBM PowerPC CHRP Computer\nMachine Type: 0x0800004c Processor id: 000000000000\nBase Operating System Runtime AIX version: 05.03.0008.0000\nTCP/IP Client Support version: 05.03.0008.0002", - "sysContact": null, - "version": "5.3", - "hardware": null, - "features": null, - "os": "aix", - "type": "server", - "serial": "000000000000", - "icon": "aix.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/aix_vios.json b/tests/data/aix_vios.json index 34f01c4b88..fd03328996 100644 --- a/tests/data/aix_vios.json +++ b/tests/data/aix_vios.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2.3.1.2.1.1.3", - "sysDescr": "IBM PowerPC CHRP Computer\nMachine Type: 0x0800004c Processor id: 00FB98004C00\nBase Operating System Runtime VIOS version: 06.01.0009.0100\nTCP/IP Client Support version: 06.01.0009.0102", - "sysContact": null, - "version": "6.1", - "hardware": null, - "features": null, - "os": "aix", - "type": "server", - "serial": "00FB98004C00", - "icon": "aix.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/akcp_serverprobe8.json b/tests/data/akcp_serverprobe8.json index 7fa28d7d2c..484a620857 100644 --- a/tests/data/akcp_serverprobe8.json +++ b/tests/data/akcp_serverprobe8.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.3854.1", - "sysDescr": "SensorProbe", - "sysContact": null, - "version": null, - "hardware": "AKCP sensorProbe8 v2.0", - "features": null, - "os": "akcp", - "type": "environment", - "serial": null, - "icon": "akcp.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/alfo80hd.json b/tests/data/alfo80hd.json index 3815aa3756..9e5e09b053 100644 --- a/tests/data/alfo80hd.json +++ b/tests/data/alfo80hd.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.3373.1103", - "sysDescr": "ALFOplus80HD - SIAE Microelettronica", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "alfo80hd", - "type": "wireless", - "serial": null, - "icon": "siae.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/algcom-dc-ups.json b/tests/data/algcom-dc-ups.json index 42c1bfa76b..0935f4cfc0 100644 --- a/tests/data/algcom-dc-ups.json +++ b/tests/data/algcom-dc-ups.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.49136", - "sysDescr": "DC UPS ALGCOM", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "algcom-dc-ups", - "type": "power", - "serial": null, - "icon": "algcom.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/allied-tq.json b/tests/data/allied-tq.json index 84ddd472d6..18cb7ce60c 100644 --- a/tests/data/allied-tq.json +++ b/tests/data/allied-tq.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.207.1.13.27", - "sysDescr": "AT-TQ4600 version 4.0.1.07", - "sysContact": null, - "version": "4.0.1.07", - "hardware": "AT-TQ4600", - "features": null, - "os": "allied-tq", - "type": "wireless", - "serial": null, - "icon": "alliedtelesis.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/allied_alliedware.json b/tests/data/allied_alliedware.json index be1015969b..a97e961c31 100644 --- a/tests/data/allied_alliedware.json +++ b/tests/data/allied_alliedware.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.207.1.14.57", - "sysDescr": "CentreCOM 9924Ts, version 3.2.1-04, built 08-Sep-2009", - "sysContact": null, - "version": "3.2.1-04", - "hardware": "CentreCOM 9924Ts", - "features": "08-Sep-2009", - "os": "allied", - "type": "network", - "serial": "30BZ32000", - "icon": "alliedtelesis.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/allied_websmart.json b/tests/data/allied_websmart.json index 70dc868090..9bad1c0e68 100644 --- a/tests/data/allied_websmart.json +++ b/tests/data/allied_websmart.json @@ -5158,10 +5158,10 @@ "sysName": "", "sysObjectID": ".1.3.6.1.4.1.207.1.4.167", "sysDescr": "AT-GS950/24 Gigabit Ethernet WebSmart Switch", - "sysContact": null, + "sysContact": "", "version": "WebSmart 1.00.043", "hardware": "AT-GS950/24", - "features": null, + "features": "", "os": "allied", "type": "network", "serial": null, @@ -5170,24 +5170,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.207.1.4.167", - "sysDescr": "AT-GS950/24 Gigabit Ethernet WebSmart Switch", - "sysContact": "", - "version": "WebSmart 1.00.043", - "hardware": "AT-GS950/24", - "features": null, - "os": "allied", - "type": "network", - "serial": null, - "icon": "alliedtelesis.svg", - "location": "" - } - ] - } + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/allworx_voip.json b/tests/data/allworx_voip.json index c69f78087b..82842916b4 100644 --- a/tests/data/allworx_voip.json +++ b/tests/data/allworx_voip.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.38516.2.5.1.0", - "sysDescr": "Allworx Connect 731", - "sysContact": null, - "version": "8.3.5.4", - "hardware": "Allworx Connect 731", - "features": null, - "os": "allworx_voip", - "type": "appliance", - "serial": "", - "icon": "allworx.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/alteonos.json b/tests/data/alteonos.json index 6c5f38f8fe..37e34c47eb 100644 --- a/tests/data/alteonos.json +++ b/tests/data/alteonos.json @@ -36,24 +36,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1872.1.13.3.5.1", - "sysDescr": "Alteon Application Switch 5224XL", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "alteonos", - "type": "network", - "serial": null, - "icon": "radware.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/anue.json b/tests/data/anue.json index f13743a15a..ee5019c2cf 100644 --- a/tests/data/anue.json +++ b/tests/data/anue.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.32620.1.1", - "sysDescr": "Anue 7300 4.6.2.9-180608-20170324-035829", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "anue", - "type": "network", - "serial": null, - "icon": "ixia.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/anyos.json b/tests/data/anyos.json index 426a57158f..02cd37c7ca 100644 --- a/tests/data/anyos.json +++ b/tests/data/anyos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.4413", - "sysDescr": "1.00(AAJZ.16)C0", - "sysContact": null, - "version": "1.00(AAJZ.16)C0", - "hardware": null, - "features": null, - "os": "anyos", - "type": "network", - "serial": "E4186BAB9C4F", - "icon": "zyxel.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/aos-emu2_ap9320.json b/tests/data/aos-emu2_ap9320.json index 8c0ad47c11..4a23cf3af9 100644 --- a/tests/data/aos-emu2_ap9320.json +++ b/tests/data/aos-emu2_ap9320.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.318.1.3.8.2", - "sysDescr": "APC Environmental Management System (MB:v3.6.9 PF:v2.6.4 PN:apc_hw02_aos_264.bin AF1:v2.6.7 AN1:apc_hw02_ems_267.bin MN:AP9320 HR:4 SN: ZA0604022112 MD:01/20/2006)", - "sysContact": null, - "version": "v2.6.7", - "hardware": "AP9320 4", - "features": null, - "os": "aos-emu2", - "type": "environment", - "serial": "ZA0604022112", - "icon": "apc.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/aos.json b/tests/data/aos.json index 48c8ad4a17..f6cfcef5a8 100644 --- a/tests/data/aos.json +++ b/tests/data/aos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6486.800.1.1.2.2.4.1.2", - "sysDescr": "OmniStack LS 6200", - "sysContact": null, - "version": "1.7.0.13", - "hardware": "OmniStack LS 6224P", - "features": null, - "os": "aos", - "type": "network", - "serial": null, - "icon": "alcatellucent.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/aos6.json b/tests/data/aos6.json index d513619d2c..6c845876ac 100644 --- a/tests/data/aos6.json +++ b/tests/data/aos6.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6486.800.1.1.2.1.13.1.2", - "sysDescr": "Alcatel-Lucent OS6350-P24 6.7.1.108.R04 Service Release, January 04, 2017.", - "sysContact": null, - "version": "6.7.1.108.R04", - "hardware": "OS6350-P24", - "features": null, - "os": "aos6", - "type": "network", - "serial": null, - "icon": "alcatellucent.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/aos7.json b/tests/data/aos7.json index a79ca58074..b963bc5ece 100644 --- a/tests/data/aos7.json +++ b/tests/data/aos7.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6486.801.1.1.2.1.11.1.9", - "sysDescr": "Alcatel-Lucent Enterprise OS6860E-U28 8.5.255.R02 GA, August 29, 2018.", - "sysContact": null, - "version": "8.5.255.R02", - "hardware": "OS6860E-U28", - "features": null, - "os": "aos7", - "type": "network", - "serial": null, - "icon": "alcatellucent.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/apc-epdu.json b/tests/data/apc-epdu.json index 8964280852..b072daa163 100644 --- a/tests/data/apc-epdu.json +++ b/tests/data/apc-epdu.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.318.1.3.4.9", - "sysDescr": "EPDU1116S", - "sysContact": null, - "version": "Ver11.10", - "hardware": "EPDU1116S", - "features": null, - "os": "apc-epdu", - "type": "power", - "serial": "506255602541", - "icon": "apc.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/apc-mgeups_galaxy7000.json b/tests/data/apc-mgeups_galaxy7000.json index 4a18cef488..22c4025fd9 100644 --- a/tests/data/apc-mgeups_galaxy7000.json +++ b/tests/data/apc-mgeups_galaxy7000.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.705.1.2", - "sysDescr": "MGE Galaxy 7000 UPS 250 kVA", - "sysContact": null, - "version": "GDET: BQ-7-AR / DIGIT: EJ-7-AR", - "hardware": "Galaxy 7000 250000", - "features": null, - "os": "apc-mgeups", - "type": "power", - "serial": "2Q1L200001", - "icon": "apc.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/apc.json b/tests/data/apc.json index 6ec8fdd8dc..405c06180d 100644 --- a/tests/data/apc.json +++ b/tests/data/apc.json @@ -18,23 +18,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.318.1.3.8.4", - "sysDescr": "APC Web/SNMP Management Card (MB:v3.9.2 PF:v3.5.9 PN:apc_hw03_aos_359.bin AF1:v3.5.6 AN1:apc_hw03_nb200_356.bin MN:NBRK0200 HR:05 SN: FFFFFFFFFFFF MD:07/07/2012)", - "sysContact": null, - "version": "AOS v3.5.9 / App v3.5.6", - "hardware": "Web/SNMP Management Card", - "features": null, - "os": "apc", - "type": "power", - "serial": null, - "icon": "apc.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/apc_ats.json b/tests/data/apc_ats.json index c13f8072f4..21ca089487 100644 --- a/tests/data/apc_ats.json +++ b/tests/data/apc_ats.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.318.1.3.32", - "sysDescr": "APC Web/SNMP Management Card (MB:v4.1.0 PF:v6.4.6 PN:apc_hw05_aos_646.bin AF1:v6.4.7 AN1:apc_hw05_ats4g_647.bin MN:AP4423 HR:R01 SN: MD:06/09/2018)", - "sysContact": null, - "version": "4.1.9", - "hardware": "AP4423 R01", - "features": null, - "os": "apc", - "type": "power", - "serial": "", - "icon": "apc.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/apc_environmental_manager.json b/tests/data/apc_environmental_manager.json index a901348df6..0ccfa39386 100644 --- a/tests/data/apc_environmental_manager.json +++ b/tests/data/apc_environmental_manager.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.318.1.3.8.4", - "sysDescr": "APC Web/SNMP Management Card (MB:v3.9.2 PF:v3.5.9 PN:apc_hw03_aos_359.bin AF1:v3.5.6 AN1:apc_hw03_nb200_356.bin MN:NBRK0200 HR:05 SN: FFFFFFFFFFFF MD:07/07/2012)", - "sysContact": null, - "version": "AOS v3.0.3 / App v3.0.4", - "hardware": "Web/SNMP Management Card", - "features": null, - "os": "apc", - "type": "power", - "serial": null, - "icon": "apc.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/apc_inrow-dx.json b/tests/data/apc_inrow-dx.json index ac05c6b666..aed7c19fab 100644 --- a/tests/data/apc_inrow-dx.json +++ b/tests/data/apc_inrow-dx.json @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.318.1.3.14.23", - "sysDescr": "APC InRow DX 300mm (MB:v4.1.0 PF:v6.8.8 PN:apc_hw06_aos_688.bin AF1:v6.6.9.b AN1:apc_hw06_rd3xx_669b.bin MN:0N-9580AC HR:06 SN: JK1905001111 MD:01/30/2019)", - "sysContact": null, - "version": "AOS v6.8.8 / App v6.6.9.b", - "hardware": "InRow DX 300mm", - "features": null, - "os": "apc", - "type": "power", - "serial": null, - "icon": "apc.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/apc_masterswitch2.json b/tests/data/apc_masterswitch2.json index b57757b472..13d174a4c7 100644 --- a/tests/data/apc_masterswitch2.json +++ b/tests/data/apc_masterswitch2.json @@ -251,24 +251,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.318.1.3.4.2", - "sysDescr": "APC Web/SNMP Management Card (MB:v3.2.0 PF:v3.0.9.a PN:aos309a.bin AF1:v2.2.5.a AN1:ms225a.bin MN: AP9606 HR: G9 SN: FFFFFFFFFFFF MD: 04/05/2000)", - "sysContact": null, - "version": "AOS v3.0.9.a / App v2.2.5.a", - "hardware": "Web/SNMP Management Card", - "features": null, - "os": "apc", - "type": "power", - "serial": null, - "icon": "apc.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -285,6 +267,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/apc_smx750i.json b/tests/data/apc_smx750i.json index f451371a92..f20fb4b3ab 100644 --- a/tests/data/apc_smx750i.json +++ b/tests/data/apc_smx750i.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.318.1.3.27", - "sysDescr": "APC Web/SNMP Management Card (MB:v4.1.0 PF:v6.6.4 PN:apc_hw05_aos_664.bin AF1:v6.6.4 AN1:apc_hw05_sumx_664.bin MN:AP9631 HR:08 SN: MD:07/07/2017) (Embedded PowerNet SNMP Agent SW v2.2 compatible)", - "sysContact": null, - "version": "AOS v6.6.4 / App v6.6.4", - "hardware": "Smart-UPS X 750 UPS 09.9 (ID20)", - "features": null, - "os": "apc", - "type": "power", - "serial": "", - "icon": "apc.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/apc_uniflair-sp.json b/tests/data/apc_uniflair-sp.json index a81eca76e3..3e4b054b7e 100644 --- a/tests/data/apc_uniflair-sp.json +++ b/tests/data/apc_uniflair-sp.json @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.318.1.3.14.21", - "sysDescr": "APC Uniflair SP (MB:v4.1.0 PF:v6.8.8 PN:apc_hw06_aos_688.bin AF1:v6.0.2.a AN1:apc_hw06_unflrsp_602a.bin MN:SPRD100 HR:06 SN: TE1234561111 MD:02/09/2019)", - "sysContact": null, - "version": "AOS v6.8.8 / App v6.0.2.a", - "hardware": "Uniflair SP", - "features": null, - "os": "apc", - "type": "power", - "serial": null, - "icon": "apc.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/apex-lynx.json b/tests/data/apex-lynx.json index c02d563645..a4b47545f8 100644 --- a/tests/data/apex-lynx.json +++ b/tests/data/apex-lynx.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3", - "sysDescr": "Apex Lynx-2.0.2", - "sysContact": null, - "version": "2p6r22b0D031716", - "hardware": "Apex Lynx-2.0.2", - "features": null, - "os": "apex-lynx", - "type": "wireless", - "serial": null, - "icon": "trango.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/apex-plus.json b/tests/data/apex-plus.json index 6b4b188583..c196b4cac8 100644 --- a/tests/data/apex-plus.json +++ b/tests/data/apex-plus.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3", - "sysDescr": "ApexPlus-3.2.0", - "sysContact": null, - "version": null, - "hardware": "ApexPlus-3.2.0", - "features": null, - "os": "apex-plus", - "type": "wireless", - "serial": null, - "icon": "trango.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/aprisa.json b/tests/data/aprisa.json index 52d58ab687..3f60148643 100644 --- a/tests/data/aprisa.json +++ b/tests/data/aprisa.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.14817.7.3", - "sysDescr": "AprisaXE - 4RF Communications Ltd.", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "aprisa", - "type": "wireless", - "serial": null, - "icon": "4rf.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/apsoluteos.json b/tests/data/apsoluteos.json index 374ce8e0ee..df0761dd0c 100644 --- a/tests/data/apsoluteos.json +++ b/tests/data/apsoluteos.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.89.1.1.62.16", - "sysDescr": "DefensePro with DPI, BWM, Basic, Flood and IPv6", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "apsoluteos", - "type": "network", - "serial": null, - "icon": "radware.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/arbos.json b/tests/data/arbos.json index 92f92b69b2..9f6ea09776 100644 --- a/tests/data/arbos.json +++ b/tests/data/arbos.json @@ -2840,24 +2840,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9694.1.4", - "sysDescr": "Peakflow SP 8.3 (build HIU6) System Board Model: S2600CO Serial Number: XX00000000XXX", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "arbos", - "type": "network", - "serial": null, - "icon": "arbor.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -2874,7 +2856,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/arbos_tms.json b/tests/data/arbos_tms.json index 29c598765d..ac8eeaa660 100644 --- a/tests/data/arbos_tms.json +++ b/tests/data/arbos_tms.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9694.1.5", - "sysDescr": "Peakflow TMS 8.4 Model: TMS-HD1000 Serial: XXXXXXXXXX", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "arbos", - "type": "network", - "serial": null, - "icon": "arbor.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/arista_eos.json b/tests/data/arista_eos.json index b8071413a3..6fa7ab1764 100644 --- a/tests/data/arista_eos.json +++ b/tests/data/arista_eos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.30065.1.3011.7050.1958.128", - "sysDescr": "Arista Networks EOS version 4.15.3F running on an Arista Networks DCS-7050TX-128", - "sysContact": null, - "version": "4.15.3F", - "hardware": "DCS-7050TX-128", - "features": null, - "os": "arista_eos", - "type": "network", - "serial": "JPE00000000", - "icon": "arista.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/arista_eos_vrf.json b/tests/data/arista_eos_vrf.json index 8c3543c72c..100b1042d7 100644 --- a/tests/data/arista_eos_vrf.json +++ b/tests/data/arista_eos_vrf.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.30065.1.3011.7150.3282.24", - "sysDescr": "Arista Networks EOS version 4.20.12.1M running on an Arista Networks DCS-7150S-24", - "sysContact": null, - "version": "4.20.12.1M", - "hardware": "DCS-7150S-24", - "features": null, - "os": "arista_eos", - "type": "network", - "serial": "serial", - "icon": "arista.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/arris-apex.json b/tests/data/arris-apex.json index b04e892f4f..7a36e759ba 100644 --- a/tests/data/arris-apex.json +++ b/tests/data/arris-apex.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1166.1.31", - "sysDescr": "ARRIS APEX1000, VxWorks SNMPv1/v2c Agent", - "sysContact": null, - "version": "2.9.4", - "hardware": "APEX1000", - "features": null, - "os": "arris-apex", - "type": "network", - "serial": "", - "icon": "arris.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/arris-c3.json b/tests/data/arris-c3.json index 3f09f2bb64..9492061f9e 100644 --- a/tests/data/arris-c3.json +++ b/tests/data/arris-c3.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.4115.1.4.3", - "sysDescr": "Cadant C3 CMTS <>", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "arris-c3", - "type": "network", - "serial": null, - "icon": "arris.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/arris-c4.json b/tests/data/arris-c4.json index a3ac6a5482..322059c170 100644 --- a/tests/data/arris-c4.json +++ b/tests/data/arris-c4.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.4998.2.2", - "sysDescr": "CMTS_V08.02.00.97, <>", - "sysContact": null, - "version": "08.02.00.97", - "hardware": "C4c", - "features": null, - "os": "arris-c4", - "type": "network", - "serial": null, - "icon": "arris.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/arris-d5.json b/tests/data/arris-d5.json index 7dda1f60d5..e10e0cde55 100644 --- a/tests/data/arris-d5.json +++ b/tests/data/arris-d5.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.4115.1.8.1", - "sysDescr": "ARRIS D5 Universal EdgeQAM <>", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "arris-d5", - "type": "network", - "serial": null, - "icon": "arris.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/arris-dsr4410md.json b/tests/data/arris-dsr4410md.json index 24684bccca..ee6467e154 100644 --- a/tests/data/arris-dsr4410md.json +++ b/tests/data/arris-dsr4410md.json @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": null, - "sysDescr": null, - "sysContact": null, - "version": "000292", - "hardware": "DSR-4410MD", - "features": null, - "os": "arris-dsr4410md", - "type": "network", - "serial": "", - "icon": "arris.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/aruba-instant.json b/tests/data/aruba-instant.json index a09b1416a9..f5cd9aee21 100644 --- a/tests/data/aruba-instant.json +++ b/tests/data/aruba-instant.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.14823.1.2.59", - "sysDescr": "ArubaOS (MODEL: 225), Version 8.4.0.0-8.4.0.0", - "sysContact": null, - "version": "8.4.0.0-8.4.0.0", - "hardware": "225", - "features": null, - "os": "aruba-instant", - "type": "wireless", - "serial": "CNBJHMV0WN", - "icon": "aruba.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/aruba-instant_105.json b/tests/data/aruba-instant_105.json index 7f37bdc3b9..f03b18c82c 100644 --- a/tests/data/aruba-instant_105.json +++ b/tests/data/aruba-instant_105.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.14823.1.2.71", - "sysDescr": "ArubaOS (MODEL: 105), Version 6.4.4.8-4.2.4.12", - "sysContact": null, - "version": "6.4.4.8-4.2.4.12", - "hardware": "105", - "features": null, - "os": "aruba-instant", - "type": "wireless", - "serial": "BT0489813", - "icon": "aruba.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/arubaos-cx.json b/tests/data/arubaos-cx.json index 31c325fa1f..019dc24035 100644 --- a/tests/data/arubaos-cx.json +++ b/tests/data/arubaos-cx.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.47196.4.1.1.1.50", - "sysDescr": "Aruba JL635A 8325 GL.10.04.2000", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "arubaos-cx", - "type": "network", - "serial": null, - "icon": "aruba.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/arubaos.json b/tests/data/arubaos.json index 71ee8d55a9..7e2f998e1d 100644 --- a/tests/data/arubaos.json +++ b/tests/data/arubaos.json @@ -6,9 +6,9 @@ "sysName": "", "sysObjectID": ".1.3.6.1.4.1.14823.1.1.9999", "sysDescr": "ArubaOS Version 6.4.4.4-4.2.3.1", - "sysContact": null, - "hardware": null, + "sysContact": "", "version": "6.4.4.4-4.2.3.1", + "hardware": "", "features": "Local Controller for 172.31.200.100", "os": "arubaos", "type": "wireless", @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.14823.1.1.9999", - "sysDescr": "ArubaOS Version 6.4.4.4-4.2.3.1", - "sysContact": "", - "hardware": null, - "version": "6.4.4.4-4.2.3.1", - "features": "Local Controller for 172.31.200.100", - "os": "arubaos", - "type": "wireless", - "serial": null, - "icon": "aruba.svg", - "location": "" - } - ] - } + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/arubaos_aosw.json b/tests/data/arubaos_aosw.json index 93890d6e97..fe515e7723 100644 --- a/tests/data/arubaos_aosw.json +++ b/tests/data/arubaos_aosw.json @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6486.800.1.1.2.2.2.1.1.4", - "sysDescr": "AOS-W (MODEL: OAW-6000), Version 6.3.1.23 (56687)", - "sysContact": null, - "version": "6.3.1.23", - "hardware": "OAW-6000", - "features": "Local Controller for ", - "os": "arubaos", - "type": "wireless", - "serial": null, - "icon": "aruba.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "wireless": { "discovery": { diff --git a/tests/data/arubaos_aruba7210.json b/tests/data/arubaos_aruba7210.json index 8ee616615d..d9767f5e99 100644 --- a/tests/data/arubaos_aruba7210.json +++ b/tests/data/arubaos_aruba7210.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.14823.1.1.32", - "sysDescr": "ArubaOS (MODEL: Aruba7210), Version 8.2.0.2 (62929)", - "sysContact": null, - "version": "8.2.0.2", - "hardware": "Aruba7210", - "features": "Local Controller for 10.235.132.234", - "os": "arubaos", - "type": "wireless", - "serial": null, - "icon": "aruba.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/arubaos_powerconnect.json b/tests/data/arubaos_powerconnect.json index 4aaaff730e..f7f3907615 100644 --- a/tests/data/arubaos_powerconnect.json +++ b/tests/data/arubaos_powerconnect.json @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10895.5027", - "sysDescr": "ArubaOS (MODEL: Dell PowerConnect W-7210 Controller), Version 6.4.4.8 (55228)", - "sysContact": null, - "version": "6.4.4.8", - "hardware": "Dell PowerConnect W-7210 Controller", - "features": "Local Controller for ", - "os": "arubaos", - "type": "wireless", - "serial": null, - "icon": "aruba.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "wireless": { "discovery": { diff --git a/tests/data/asa.json b/tests/data/asa.json index bc9da98083..f890a12d97 100644 --- a/tests/data/asa.json +++ b/tests/data/asa.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.745", - "sysDescr": "Cisco Adaptive Security Appliance Version 8.2(5)", - "sysContact": null, - "version": "9.12(3)", - "hardware": "ASA5555", - "features": null, - "os": "asa", - "type": "firewall", - "serial": "FGL1641413L", - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ascom.json b/tests/data/ascom.json index 3cd3fb7175..b4f3313016 100644 --- a/tests/data/ascom.json +++ b/tests/data/ascom.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.27614", - "sysDescr": "IPBS2[10.3.9], Bootcode[10.3.9], Hardware[IPBS2-C3/1B1]", - "sysContact": null, - "version": "IPBS2[10.3.9], Bootcode[10.3.9]", - "hardware": "IPBS2-C3/1B1", - "features": null, - "os": "ascom", - "type": "network", - "serial": null, - "icon": "ascom.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/asuswrt-merlin.json b/tests/data/asuswrt-merlin.json index 89f1459501..26cf3e7729 100644 --- a/tests/data/asuswrt-merlin.json +++ b/tests/data/asuswrt-merlin.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux wap-familyroom 2.6.36.4brcmarm #1 SMP PREEMPT Sat Apr 25 22:35:50 EDT 2020 armv7l", - "sysContact": null, - "version": "384.17_0", - "hardware": "RT-AC68U", - "features": null, - "os": "asuswrt-merlin", - "type": "network", - "serial": null, - "icon": "asuswrt-merlin.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/atenpdu.json b/tests/data/atenpdu.json index e57d023ca5..c2b2d7b73e 100644 --- a/tests/data/atenpdu.json +++ b/tests/data/atenpdu.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.21317", - "sysDescr": "Aten", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "atenpdu", - "type": "power", - "serial": null, - "icon": "aten.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/ats.json b/tests/data/ats.json index ddab215714..5d8775d943 100644 --- a/tests/data/ats.json +++ b/tests/data/ats.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.37662.1.2.2.1", - "sysDescr": "SNMP Smart II Card v1.05 (SN 11230031806015)", - "sysContact": null, - "version": "1.05", - "hardware": "ATS11747", - "features": null, - "os": "ats", - "type": "power", - "serial": "11230031806015", - "icon": "ats.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/audiocodes_mp118.json b/tests/data/audiocodes_mp118.json index 606e3d7ae6..f5f6083c9c 100644 --- a/tests/data/audiocodes_mp118.json +++ b/tests/data/audiocodes_mp118.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.5003.8.1.1.56", - "sysDescr": "Product: GW 8 FXS;SW Version: 6.60A.309.001", - "sysContact": null, - "version": "6.60A.309.001", - "hardware": "MP-118 FXS", - "features": null, - "os": "audiocodes", - "type": "network", - "serial": "10512508", - "icon": "audiocodes.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/avocent_6000.json b/tests/data/avocent_6000.json index 45e138a550..b6e4378696 100644 --- a/tests/data/avocent_6000.json +++ b/tests/data/avocent_6000.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "my-hostname-blanked-out", - "sysObjectID": ".1.3.6.1.4.1.10418.16.1.3", - "sysDescr": "Cyclades ACS 6000", - "sysContact": null, - "version": "3.7.0.6", - "hardware": "ACS6048", - "features": null, - "os": "avocent", - "type": "network", - "serial": "0530068451", - "icon": "avocent.svg", - "location": "sys-location-here-blanked-out" - } - ] - }, - "poller": { "devices": [ { "sysName": "my-hostname-blanked-out", @@ -35,7 +17,8 @@ "location": "sys-location-here-blanked-out" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/avocent_8000.json b/tests/data/avocent_8000.json index f5b2c436b9..192d9d3253 100644 --- a/tests/data/avocent_8000.json +++ b/tests/data/avocent_8000.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "my-hostname-blanked-out", - "sysObjectID": ".1.3.6.1.4.1.10418.26.1.1", - "sysDescr": "Avocent ACS 8000", - "sysContact": null, - "version": "2.0.3.3542+685+35+11", - "hardware": "ACS8048", - "features": null, - "os": "avocent", - "type": "network", - "serial": "0530050907", - "icon": "avocent.svg", - "location": "snmp-location-blanked-out" - } - ] - }, - "poller": { "devices": [ { "sysName": "my-hostname-blanked-out", @@ -35,7 +17,8 @@ "location": "snmp-location-blanked-out" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/avtech_roomalert4e.json b/tests/data/avtech_roomalert4e.json index 3afa525c4c..425042a409 100644 --- a/tests/data/avtech_roomalert4e.json +++ b/tests/data/avtech_roomalert4e.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.20916.1.6", - "sysDescr": "Room Alert 4E v4.2.4", - "sysContact": null, - "version": "4.2.4", - "hardware": "Room Alert 4E", - "features": null, - "os": "avtech", - "type": "environment", - "serial": null, - "icon": "avtech.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/awplus.json b/tests/data/awplus.json index 51d2e982a3..3c7fe365b7 100644 --- a/tests/data/awplus.json +++ b/tests/data/awplus.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.207.1.14.114", - "sysDescr": "Allied Telesis router/switch, AW+ v5.4.7-2.1", - "sysContact": null, - "version": "5.4.7-2.1", - "hardware": "AT-SBx8106", - "features": "AT-SBx81CFC960", - "os": "awplus", - "type": "network", - "serial": "A04699H130900048", - "icon": "alliedtelesis.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/awplus_5.4.8-2.json b/tests/data/awplus_5.4.8-2.json index 7666ff9235..bb97e7eabe 100644 --- a/tests/data/awplus_5.4.8-2.json +++ b/tests/data/awplus_5.4.8-2.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.207.1.14.120", - "sysDescr": "Allied Telesis router/switch, Software (AlliedWare Plus) Version 5.4.8-2.1", - "sysContact": null, - "version": "5.4.8-2.1", - "hardware": "AT-x930-28GSTX", - "features": null, - "os": "awplus", - "type": "network", - "serial": "A04881A151300018", - "icon": "alliedtelesis.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/barracudangfirewall.json b/tests/data/barracudangfirewall.json index b43db511d8..ead5dd1902 100644 --- a/tests/data/barracudangfirewall.json +++ b/tests/data/barracudangfirewall.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.10704.1.10", - "sysDescr": "Barracuda Firewall", - "sysContact": null, - "version": null, - "hardware": "", - "features": null, - "os": "barracudangfirewall", - "type": "firewall", - "serial": null, - "icon": "barracuda.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/barracudaspamfirewall.json b/tests/data/barracudaspamfirewall.json index 2181ea2350..44e0bb2b2c 100644 --- a/tests/data/barracudaspamfirewall.json +++ b/tests/data/barracudaspamfirewall.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Barracuda Spam Firewall", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "barracudaspamfirewall", - "type": "firewall", - "serial": null, - "icon": "barracuda.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/barracudaspamfirewall_email_sg.json b/tests/data/barracudaspamfirewall_email_sg.json index 89422fe094..28e1a3f7db 100644 --- a/tests/data/barracudaspamfirewall_email_sg.json +++ b/tests/data/barracudaspamfirewall_email_sg.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Barracuda Email Security Gateway", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "barracudaspamfirewall", - "type": "firewall", - "serial": null, - "icon": "barracuda.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/barracudawafirewall.json b/tests/data/barracudawafirewall.json index 21e710cd5b..72fe2bf03e 100644 --- a/tests/data/barracudawafirewall.json +++ b/tests/data/barracudawafirewall.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Barracuda Web Application Firewall", - "sysContact": null, - "version": "10.0.1.003", - "hardware": null, - "features": null, - "os": "barracudawafirewall", - "type": "firewall", - "serial": "888888", - "icon": "barracuda.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/beagleboard.json b/tests/data/beagleboard.json index d3db925d50..82bb3c03d3 100644 --- a/tests/data/beagleboard.json +++ b/tests/data/beagleboard.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux beagleboneAI 4.19.94-ti-r48 #1buster SMP PREEMPT Wed Aug 19 17:38:55 UTC 2020 armv7l", - "sysContact": null, - "version": "Debian Buster IoT TIDL Image 2020-04-06", - "hardware": "BeagleBone AI", - "features": null, - "os": "beagleboard", - "type": "server", - "serial": null, - "icon": "beagleboard.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/binox.json b/tests/data/binox.json index fa11bf2153..b4846c3f41 100644 --- a/tests/data/binox.json +++ b/tests/data/binox.json @@ -19,24 +19,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.738.10.5.100.1.1.10004", - "sysDescr": "Switch software version 3.1.R1", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "binox", - "type": "network", - "serial": null, - "icon": "telco-systems.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -53,7 +35,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/binox_1.json b/tests/data/binox_1.json index 627bb0c9da..da2759d3e4 100644 --- a/tests/data/binox_1.json +++ b/tests/data/binox_1.json @@ -19,24 +19,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.738.10.5.100.1.1.10002", - "sysDescr": "Switch software version 2.4.R3.1.1", - "sysContact": null, - "version": "2.4.R3.1.1", - "hardware": null, - "features": null, - "os": "binox", - "type": "network", - "serial": null, - "icon": "telco-systems.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -53,6 +35,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/bluecatnetworks.json b/tests/data/bluecatnetworks.json index 4ba16e5790..ae42e834ee 100644 --- a/tests/data/bluecatnetworks.json +++ b/tests/data/bluecatnetworks.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.13315.2.1", - "sysDescr": "labbdds01", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "bluecatnetworks", - "type": "appliance", - "serial": null, - "icon": "bcn.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/boss.json b/tests/data/boss.json index 132575b26c..0ce8139baa 100644 --- a/tests/data/boss.json +++ b/tests/data/boss.json @@ -47,24 +47,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.45.3.65", - "sysDescr": "Ethernet Routing Switch 5530-24TFD HW:32 FW:6.0.0.18 SW:v6.3.2.011 BN:11 (c) Avaya Networks", - "sysContact": null, - "version": "6.3.2.011", - "hardware": "ERS-5530-24TFD", - "features": null, - "os": "boss", - "type": "network", - "serial": null, - "icon": "extremeboss.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/boss_ers3510.json b/tests/data/boss_ers3510.json index d15501295d..31ec6dc0c9 100644 --- a/tests/data/boss_ers3510.json +++ b/tests/data/boss_ers3510.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.45.3.80.6", - "sysDescr": "Ethernet Routing Switch 3510GT-PWR+ HW:17 FW:5.3.0.8 SW:v5.3.9.011 BN:11 (c) Extreme Networks", - "sysContact": null, - "version": "5.3.9.011", - "hardware": "ERS-3510GT-PWR+", - "features": null, - "os": "boss", - "type": "network", - "serial": null, - "icon": "extremeboss.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/boss_ers4950.json b/tests/data/boss_ers4950.json index 3c5fdc76e3..3f78bfa3bf 100644 --- a/tests/data/boss_ers4950.json +++ b/tests/data/boss_ers4950.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.45.3.82.4", - "sysDescr": "Ethernet Routing Switch 4950GTS-PWR+ HW:02 FW:7.5.0.2 SW:v7.6.1.033 BN:33 (c) Extreme Networks", - "sysContact": null, - "version": "7.6.1.033", - "hardware": "ERS-4950GTS-PWR+", - "features": null, - "os": "boss", - "type": "network", - "serial": null, - "icon": "extremeboss.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/brother.json b/tests/data/brother.json index cc82c43e08..355bdee35e 100644 --- a/tests/data/brother.json +++ b/tests/data/brother.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2435.2.3.9.1", - "sysDescr": "Brother NC-8300h, Firmware Ver.1.14 (14.11.06),MID 8C5-F01,FID 2", - "sysContact": null, - "version": "Q", - "hardware": "MFC-L2710DW", - "features": null, - "os": "brother", - "type": "printer", - "serial": "000A5J431816", - "icon": "brother.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/bti800.json b/tests/data/bti800.json index 991f0dc5e5..7f535cf26d 100644 --- a/tests/data/bti800.json +++ b/tests/data/bti800.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.30005.1.7", - "sysDescr": "BTIOS software, SA-805, Version 2.2.2Build2\n Copyright (C) BTI Systems. All rights reserved.", - "sysContact": null, - "version": "2.2.2Build2", - "hardware": "BTI-SA-805 1.0", - "features": null, - "os": "bti800", - "type": "network", - "serial": "HF17240001", - "icon": "bti.png", - "location": null - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": null } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/canonprinter_lbp.json b/tests/data/canonprinter_lbp.json index c0966ffaf0..b058aada17 100644 --- a/tests/data/canonprinter_lbp.json +++ b/tests/data/canonprinter_lbp.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1602.4.2", - "sysDescr": "Canon LBP6670 /P", - "sysContact": null, - "version": "R7.21", - "hardware": "LBP6670", - "features": null, - "os": "canonprinter", - "type": "printer", - "serial": "MKRA012345", - "icon": "canon.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/cdata.json b/tests/data/cdata.json index a0801be831..6c7fc5bd42 100644 --- a/tests/data/cdata.json +++ b/tests/data/cdata.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.17409", - "sysDescr": "zaporojskoe-olt", - "sysContact": null, - "version": "4.2.7.58", - "hardware": "V4.0", - "features": null, - "os": "cdata", - "type": "network", - "serial": "AF2101-1901000029", - "icon": "cdata.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ceraos.json b/tests/data/ceraos.json index af71c4847e..102acd2abd 100644 --- a/tests/data/ceraos.json +++ b/tests/data/ceraos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2281.1.20.2.2", - "sysDescr": "High capacity packet radio outdoor unit", - "sysContact": null, - "version": "9.0.0.0.0.295", - "hardware": "IP-20C", - "features": "2 radios in unit", - "os": "ceraos", - "type": "wireless", - "serial": "F217305963", - "icon": "ceragon.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/chatsworth-pdu.json b/tests/data/chatsworth-pdu.json index 6b712619ab..723c19019e 100644 --- a/tests/data/chatsworth-pdu.json +++ b/tests/data/chatsworth-pdu.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".0.10.43.6.1.4.1", - "sysDescr": "Epicenter SNMP", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "chatsworth-pdu", - "type": "power", - "serial": null, - "icon": "chatsworth.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ciena-sds.json b/tests/data/ciena-sds.json index 1a2d685d23..b5575c08a0 100644 --- a/tests/data/ciena-sds.json +++ b/tests/data/ciena-sds.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6141.1.98", - "sysDescr": "3942 Service Delivery Switch", - "sysContact": null, - "version": "rel_saos8700_8.7.0_ga195", - "hardware": "154-8700-930", - "features": null, - "os": "ciena-sds", - "type": "network", - "serial": "M9123456", - "icon": "ciena.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { @@ -25730,7 +25713,7 @@ "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 0, - "sensor_limit": 0.014999999999999999, + "sensor_limit": 0.015, "sensor_limit_warn": null, "sensor_limit_low": 0, "sensor_limit_low_warn": null, diff --git a/tests/data/ciena-waveserver.json b/tests/data/ciena-waveserver.json index 722f2b9fb2..dd20632afc 100644 --- a/tests/data/ciena-waveserver.json +++ b/tests/data/ciena-waveserver.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1271.3", - "sysDescr": "Waveserver Platform", - "sysContact": null, - "version": "1.5.0-ej76_svrbuild_wvsrvr", - "hardware": "Waveserver 40x10GE/10x40GE/4x100GE QSFP+/QSFP28, 2x100G/2x150G/2x200G Wavelogic 3 Extreme Coherent Optical Processors", - "features": null, - "os": "ciena-waveserver", - "type": "network", - "serial": "AAAAAAAA", - "icon": "ciena.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/cimc.json b/tests/data/cimc.json index 9359aa2bfb..35f687dadd 100644 --- a/tests/data/cimc.json +++ b/tests/data/cimc.json @@ -345,24 +345,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.2178", - "sysDescr": "Cisco Integrated Management Controller(Cisco IMC) [UCS C220 M4S\n], Firmware Version 3.0(3a) Copyright (c) 2008-2016, Cisco Systems, Inc.", - "sysContact": null, - "version": "3.0(3a)", - "hardware": "UCSC-C220-M4S", - "features": null, - "os": "cimc", - "type": "server", - "serial": "FCH2126720R", - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -379,6 +361,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/cirpack.json b/tests/data/cirpack.json index 0386aae221..a9a5f033a3 100644 --- a/tests/data/cirpack.json +++ b/tests/data/cirpack.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux private 3.10.0-229.4.2.el7.x86_64 #1 SMP Fri Apr 24 15:26:38 EDT 2015 x86_64", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "cirpack", - "type": "server", - "serial": null, - "icon": "cirpack.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ciscosat.json b/tests/data/ciscosat.json index dcc3410522..80dbe0a533 100644 --- a/tests/data/ciscosat.json +++ b/tests/data/ciscosat.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1429.2.2.6.5", - "sysDescr": "D9854 APR", - "sysContact": null, - "version": "1.50(1.11)", - "hardware": "D9859", - "features": null, - "os": "ciscosat", - "type": "network", - "serial": "", - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/ciscosb.json b/tests/data/ciscosb.json index 666a7792be..980481e542 100644 --- a/tests/data/ciscosb.json +++ b/tests/data/ciscosb.json @@ -24,9 +24,9 @@ "sysName": "", "sysObjectID": ".1.3.6.1.4.1.9.6.1.80", "sysDescr": "Linux, Cisco Systems, Inc WAP371 (WAP371-A-K9), Version 1.3.0.4", - "sysContact": null, + "sysContact": "", "version": "Software 1.3.0.4", - "hardware": null, + "hardware": "", "features": null, "os": "ciscosb", "type": "network", @@ -36,24 +36,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.6.1.80", - "sysDescr": "Linux, Cisco Systems, Inc WAP371 (WAP371-A-K9), Version 1.3.0.4", - "sysContact": "", - "version": "Software 1.3.0.4", - "hardware": null, - "features": null, - "os": "ciscosb", - "type": "network", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - } + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ciscosb_esw540_8p.json b/tests/data/ciscosb_esw540_8p.json index 4554919999..20e89d142a 100644 --- a/tests/data/ciscosb_esw540_8p.json +++ b/tests/data/ciscosb_esw540_8p.json @@ -7,8 +7,8 @@ "sysObjectID": ".1.3.6.1.4.1.9.1.1176", "sysDescr": "8-port 10/100/1000 Ethernet Switch with PoE", "sysContact": null, - "version": null, - "hardware": null, + "version": "", + "hardware": "", "features": null, "os": "ciscosb", "type": "network", @@ -18,23 +18,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.1176", - "sysDescr": "8-port 10/100/1000 Ethernet Switch with PoE", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "ciscosb", - "type": "network", - "serial": null, - "icon": "cisco.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/ciscosb_sg350-10.json b/tests/data/ciscosb_sg350-10.json index a4e0351985..905dfc0b2e 100644 --- a/tests/data/ciscosb_sg350-10.json +++ b/tests/data/ciscosb_sg350-10.json @@ -3007,24 +3007,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.6.1.95.10.3", - "sysDescr": "SG350-10 10-Port Gigabit Managed Switch", - "sysContact": null, - "version": "Software 1.0.0, Firmware 1.0.0", - "hardware": "SG350-10", - "features": null, - "os": "ciscosb", - "type": "network", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -3041,6 +3023,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/ciscosb_sg350x-48.json b/tests/data/ciscosb_sg350x-48.json index a9c57ec5c9..9d05dc5e71 100644 --- a/tests/data/ciscosb_sg350x-48.json +++ b/tests/data/ciscosb_sg350x-48.json @@ -6,8 +6,8 @@ "sysName": "", "sysObjectID": ".1.3.6.1.4.1.9.6.1.94.48.1", "sysDescr": "SG350X-48 48-Port Gigabit Stackable Managed Switch", - "sysContact": null, - "version": null, + "sysContact": "", + "version": "", "hardware": "SG350X-48", "features": null, "os": "ciscosb", @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.6.1.94.48.1", - "sysDescr": "SG350X-48 48-Port Gigabit Stackable Managed Switch", - "sysContact": "", - "version": null, - "hardware": "SG350X-48", - "features": null, - "os": "ciscosb", - "type": "network", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - } + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/ciscosb_sg550x-24.json b/tests/data/ciscosb_sg550x-24.json index 397b1d65e0..766a16f7b2 100644 --- a/tests/data/ciscosb_sg550x-24.json +++ b/tests/data/ciscosb_sg550x-24.json @@ -7,7 +7,7 @@ "sysObjectID": ".1.3.6.1.4.1.9.6.1.93.24.1", "sysDescr": "SG550X-24 24-Port Gigabit Stackable Managed Switch", "sysContact": null, - "version": null, + "version": "", "hardware": "SG550X-24", "features": null, "os": "ciscosb", @@ -18,23 +18,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.6.1.93.24.1", - "sysDescr": "SG550X-24 24-Port Gigabit Stackable Managed Switch", - "sysContact": null, - "version": null, - "hardware": "SG550X-24", - "features": null, - "os": "ciscosb", - "type": "network", - "serial": null, - "icon": "cisco.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/ciscosb_sge.json b/tests/data/ciscosb_sge.json index 36c11d2b55..0e57fc0aa2 100644 --- a/tests/data/ciscosb_sge.json +++ b/tests/data/ciscosb_sge.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.6.1.72.2010.2", - "sysDescr": "48-port 10/100/1000 Ethernet Switch", - "sysContact": null, - "version": "Software 3.0.0.18, Firmware 2.0.0.03", - "hardware": "SGE2010-48 00.00.01", - "features": null, - "os": "ciscosb", - "type": "network", - "serial": "DNI1446B72Z", - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ciscosb_sx550x-24f.json b/tests/data/ciscosb_sx550x-24f.json index d083595e75..d74a926cff 100644 --- a/tests/data/ciscosb_sx550x-24f.json +++ b/tests/data/ciscosb_sx550x-24f.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.6.1.1001.24.8", - "sysDescr": "SX550X-24F 24-Port 10G SFP+ Stackable Managed Switch", - "sysContact": null, - "version": "Software 2.5.0.90, Firmware 2.5.18", - "hardware": "SX550X-24F V02", - "features": null, - "os": "ciscosb", - "type": "network", - "serial": "DNI22500E57", - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ciscospa.json b/tests/data/ciscospa.json index 5b60c5a781..a082e68827 100644 --- a/tests/data/ciscospa.json +++ b/tests/data/ciscospa.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.6.1.23.1.1.1.3", - "sysDescr": "Linux SPA112 2.6.26.5 #1 PREEMPT Wed Aug 2 14:04:45 CST 2017 armv5tejl", - "sysContact": null, - "version": "0.00.51", - "hardware": "SPA112", - "features": null, - "os": "ciscospa", - "type": "appliance", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/ciscospa_spa112.json b/tests/data/ciscospa_spa112.json index c596779402..2610d5b845 100644 --- a/tests/data/ciscospa_spa112.json +++ b/tests/data/ciscospa_spa112.json @@ -18,23 +18,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.6.1.23.1.1.1.3", - "sysDescr": "Linux SPA112 - Elevator 2.6.26.5 #1 PREEMPT Wed Aug 2 14:04:45 CST 2017 armv5tejl", - "sysContact": null, - "version": null, - "hardware": "ciscoSB.23.1.1.1.3", - "features": null, - "os": "ciscospa", - "type": "appliance", - "serial": null, - "icon": "cisco.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/ciscospa_spa112_1.json b/tests/data/ciscospa_spa112_1.json index 583621fe7e..e26aac523b 100644 --- a/tests/data/ciscospa_spa112_1.json +++ b/tests/data/ciscospa_spa112_1.json @@ -18,23 +18,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.6.1.23.1.1.1.3", - "sysDescr": "CISCO SPA112 1.4.0(001)", - "sysContact": null, - "version": null, - "hardware": "ciscoSB.23.1.1.1.3", - "features": null, - "os": "ciscospa", - "type": "appliance", - "serial": null, - "icon": "cisco.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/ciscowlc.json b/tests/data/ciscowlc.json index 4ac2601a20..b40f04523f 100644 --- a/tests/data/ciscowlc.json +++ b/tests/data/ciscowlc.json @@ -36,24 +36,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.1069", - "sysDescr": "Cisco Controller", - "sysContact": null, - "version": null, - "hardware": "cisco5500Wlc", - "features": null, - "os": "ciscowlc", - "type": "wireless", - "serial": null, - "icon": "cisco.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/cmm.json b/tests/data/cmm.json index bf0d4b6a51..9db25947e7 100644 --- a/tests/data/cmm.json +++ b/tests/data/cmm.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".2.716653033.173240166.1953980786.1696612975.1869881430.1701999465.1869488186.541278542.1330665794", - "sysDescr": "CMM 3.1", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "cmm", - "type": "wireless", - "serial": null, - "icon": "cambium.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/cms.json b/tests/data/cms.json index ec02295ea0..2f338e1cfb 100644 --- a/tests/data/cms.json +++ b/tests/data/cms.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.41036", - "sysDescr": "Corero CMS SNMP agent", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "cms", - "type": "appliance", - "serial": null, - "icon": "corero.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/compas.json b/tests/data/compas.json index 4202d49c41..b1dc49d780 100644 --- a/tests/data/compas.json +++ b/tests/data/compas.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.26854.3.2.1", - "sysDescr": "Alpha Innovations Comp@s Monitoring System", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "compas", - "type": "power", - "serial": null, - "icon": "alpha.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/comtrol.json b/tests/data/comtrol.json index e33f1830d2..a79d088b62 100644 --- a/tests/data/comtrol.json +++ b/tests/data/comtrol.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2882.2.1.1", - "sysDescr": "ES8510 Industrial Managed Ethernet Switch", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "comtrol", - "type": "network", - "serial": null, - "icon": "comtrol.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/comware.json b/tests/data/comware.json index 2d34804e80..476fa9ac52 100644 --- a/tests/data/comware.json +++ b/tests/data/comware.json @@ -49759,24 +49759,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.25506.11.1.172", - "sysDescr": "HP Comware Platform Software, Software Version 7.1.045, Release 2416 HP FF 5700-40XG-2QSFP Switch Copyright (c) 2010-2014 Hewlett-Packard Development Company, L.P.", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "comware", - "type": "network", - "serial": "DM20F3000F", - "icon": "hpe.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -49793,7 +49775,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/comware_a5500.json b/tests/data/comware_a5500.json index 940a366268..2be69151a4 100644 --- a/tests/data/comware_a5500.json +++ b/tests/data/comware_a5500.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.25506.11.1.24", - "sysDescr": "HP Comware Platform Software, Software Version 5.20.99 Release 2222P08\nHP A5500-24G EI Switch with 2 Interface Slots\r\nCopyright (c) 2010-2017 Hewlett Packard Enterprise Development LP", - "sysContact": null, - "version": "5.20.99", - "hardware": "A5500-24G EI Switch with 2 Interface Slots\r", - "features": "2222P08", - "os": "comware", - "type": "network", - "serial": "CN50A1Z4BN", - "icon": "hpe.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/comware_hpe5900.json b/tests/data/comware_hpe5900.json index ea08100c9b..7013f752fd 100644 --- a/tests/data/comware_hpe5900.json +++ b/tests/data/comware_hpe5900.json @@ -19,24 +19,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.25506.11.1.120", - "sysDescr": "HPE Comware Platform Software, Software Version 7.1.045, Release 2422P01\nHPE 5900AF-48G-4XG-2QSFP+ Switch\r\nCopyright (c) 2010-2015 Hewlett Packard Enterprise Development LP", - "sysContact": null, - "version": "7.1.045", - "hardware": "5900AF-48G-4XG-2QSFP+ Switch\r", - "features": "2422P01", - "os": "comware", - "type": "network", - "serial": null, - "icon": "hpe.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -48,12 +30,13 @@ "features": "2422P01", "os": "comware", "type": "network", - "serial": null, + "serial": "", "icon": "hpe.svg", "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/ctm.json b/tests/data/ctm.json index fd5373a88f..5ec35bbd95 100644 --- a/tests/data/ctm.json +++ b/tests/data/ctm.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.25868.1", - "sysDescr": "Last Mile Gear CTM", - "sysContact": null, - "version": "245.00", - "hardware": "Last Mile Gear CTM", - "features": null, - "os": "ctm", - "type": "wireless", - "serial": null, - "icon": "ctm.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/cumulus_edgecore-as4610-54p.json b/tests/data/cumulus_edgecore-as4610-54p.json index b49f54bdce..3c9232d5a0 100644 --- a/tests/data/cumulus_edgecore-as4610-54p.json +++ b/tests/data/cumulus_edgecore-as4610-54p.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.40310", - "sysDescr": "Cumulus Linux 3.5.3 (Linux Kernel 4.1.33-1+cl3u12)", - "sysContact": null, - "version": "3.5.3 (Linux Kernel 4.1.33-1+cl3u12)", - "hardware": "Cumulus Networks arm-accton_as4610_54-r0 4610-54P-O-AC-F Chassis", - "features": null, - "os": "cumulus", - "type": "network", - "serial": "EC1713000000", - "icon": "cumulus.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/cxr-ts.json b/tests/data/cxr-ts.json index 4ff5e3136b..bbd9ed5cd7 100644 --- a/tests/data/cxr-ts.json +++ b/tests/data/cxr-ts.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1425.1040", - "sysDescr": "TS 324 (SN: 0302000017017 - 11 03)", - "sysContact": null, - "version": "Rev 2.44d", - "hardware": "TS 324 (047202CD)", - "features": null, - "os": "cxr-ts", - "type": "network", - "serial": null, - "icon": "cxr-networks.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/cyberoam-utm.json b/tests/data/cyberoam-utm.json index 3633d11798..71918a4542 100644 --- a/tests/data/cyberoam-utm.json +++ b/tests/data/cyberoam-utm.json @@ -19,24 +19,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.21067.2", - "sysDescr": "Cyberoam cloud partitio", - "sysContact": null, - "version": "SFOS 17.5.5 MR-5", - "hardware": "SFVH_SO01", - "features": null, - "os": "cyberoam-utm", - "type": "appliance", - "serial": "C01001GF24TPDE1", - "icon": "sophos.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -53,7 +35,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/cyberpower.json b/tests/data/cyberpower.json index 42e5d8315f..d231cc1598 100644 --- a/tests/data/cyberpower.json +++ b/tests/data/cyberpower.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.3808.1.1.3", - "sysDescr": "Power Manager", - "sysContact": null, - "version": "S1A17", - "hardware": "OL2200RTXL2U", - "features": null, - "os": "cyberpower", - "type": "power", - "serial": "ABCFT1000001", - "icon": "cyberpower.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/dahua-nvr.json b/tests/data/dahua-nvr.json index 62c749977f..b2c4328ad8 100644 --- a/tests/data/dahua-nvr.json +++ b/tests/data/dahua-nvr.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1004849.3.2.10", - "sysDescr": "DH-NVR4108HS-8P-4KS2", - "sysContact": null, - "version": "3.212.0000.1", - "hardware": "DH-NVR4108HS-8P-4KS2", - "features": null, - "os": "dahua-nvr", - "type": "appliance", - "serial": "2M00D2APAZTL62J", - "icon": "dahua.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dantherm-os.json b/tests/data/dantherm-os.json index e31a8635e0..2f3c3e44df 100644 --- a/tests/data/dantherm-os.json +++ b/tests/data/dantherm-os.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.0", - "sysDescr": "FreeCooling Controller, SNMP V1.0", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "dantherm-os", - "type": "network", - "serial": null, - "icon": "dantherm.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/dasan-nos.json b/tests/data/dasan-nos.json index 0cfd5bb99f..4eafb3dd5e 100644 --- a/tests/data/dasan-nos.json +++ b/tests/data/dasan-nos.json @@ -36,24 +36,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6296.1.2.5.12", - "sysDescr": "V5812G NOS 6.07p1/00:d0:cb:f5:b9:8b", - "sysContact": null, - "version": "6.07p1", - "hardware": "V5812G", - "features": null, - "os": "dasan-nos", - "type": "network", - "serial": null, - "icon": "dasan.png", - "location": null - } - ] - } + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/datadomain.json b/tests/data/datadomain.json index f850b2b148..b739f53673 100644 --- a/tests/data/datadomain.json +++ b/tests/data/datadomain.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.19746.3.1.38", - "sysDescr": "Data Domain OS 5.5.1.4-464376", - "sysContact": null, - "version": "5.5.1.4-464376", - "hardware": null, - "features": null, - "os": "datadomain", - "type": "storage", - "serial": null, - "icon": "emc.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/dcn-software_s5750e.json b/tests/data/dcn-software_s5750e.json index c5fd79027c..eb8d3aafbf 100644 --- a/tests/data/dcn-software_s5750e.json +++ b/tests/data/dcn-software_s5750e.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6339.1.1.1.293", - "sysDescr": "S5750E-16X-SI Device, Compiled Feb 01 15:18:54 2018", - "sysContact": null, - "version": "7.5.3.0(R0016.0036)", - "hardware": "1.0.1", - "features": null, - "os": "dcn-software", - "type": "network", - "serial": "SW053110GB09000067", - "icon": "dcn.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/dd-wrt.json b/tests/data/dd-wrt.json index 8ecc4ad4f4..c8999c9c3e 100644 --- a/tests/data/dd-wrt.json +++ b/tests/data/dd-wrt.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux wap-study 3.10.108-d8 #24797 Thu Jun 6 12:07:26 CEST 2019 mips", - "sysContact": null, - "version": "3.10.108-d8", - "hardware": "Netgear WNDR4500", - "features": null, - "os": "dd-wrt", - "type": "network", - "serial": null, - "icon": "dd-wrt.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/dell-compellent.json b/tests/data/dell-compellent.json index 9526baf410..fa94f1d634 100644 --- a/tests/data/dell-compellent.json +++ b/tests/data/dell-compellent.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.8", - "sysDescr": "FreeBSD sn654321.example.org 10.0-RELEASE-p11 FreeBSD 10.0-RELEASE-p11 #0: Mon Jan 8 09:55:45 CST 2018 root@es-vb100-1:/work/buildmaster/r07.02.31/R07.02.31.003/07_02_31_003/work/buildmaster/r07.02.31/R07.02.31.003/src/sys/COMPELLENT amd64", - "sysContact": null, - "version": "10.0-RELEASE-p11", - "hardware": null, - "features": null, - "os": "dell-compellent", - "type": "storage", - "serial": null, - "icon": "dell.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dell-laser_s5830dn.json b/tests/data/dell-laser_s5830dn.json index e62187d82b..7c1d3a85ca 100644 --- a/tests/data/dell-laser_s5830dn.json +++ b/tests/data/dell-laser_s5830dn.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10898.2.100.100.51.1094474004", - "sysDescr": "Dell S5830dn version NH62.YS.N636 kernel 3.0.0 All-N-1", - "sysContact": null, - "version": "NH62.YS.N636", - "hardware": "Dell S5830dn", - "features": null, - "os": "dell-laser", - "type": "printer", - "serial": "7XQ1R92-132-13", - "icon": "dell.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dell-os10.json b/tests/data/dell-os10.json index a11bfb94a3..917cdea7db 100644 --- a/tests/data/dell-os10.json +++ b/tests/data/dell-os10.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.11000.5000.100.2.1.7", - "sysDescr": "Dell EMC Networking OS10 Enterprise.", - "sysContact": null, - "version": "A03", - "hardware": "s4128Fon", - "features": "CWTQXC2/281 062 707 86", - "os": "dell-os10", - "type": "network", - "serial": null, - "icon": "dell.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dell-powervault.json b/tests/data/dell-powervault.json index 9df934aef6..2f05cb9cec 100644 --- a/tests/data/dell-powervault.json +++ b/tests/data/dell-powervault.json @@ -6,7 +6,7 @@ "sysName": "", "sysObjectID": ".1.3.6.1.4.1.674.10893.2.31", "sysDescr": "DELL MD38xxi 0123", - "sysContact": null, + "sysContact": "", "version": null, "hardware": null, "features": null, diff --git a/tests/data/dell-rpdu.json b/tests/data/dell-rpdu.json index 2a255ae98b..d6e4bf1e9b 100644 --- a/tests/data/dell-rpdu.json +++ b/tests/data/dell-rpdu.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10903.200.3.1", - "sysDescr": "DELL Web/SNMP Management Card (MB:V1.0f PF:v5.1.4 PN:dell_hw05_aos_514.bin AF1:v5.1.2 AN1:dell_hw05_rpdud_512.bin MN:DELL6606 HR:HW01 SN: IN1A234B5678912CD345E67 MD:09/19/2013)", - "sysContact": null, - "version": "v5.1.2", - "hardware": "DELL6606 HW01", - "features": null, - "os": "dell-rpdu", - "type": "power", - "serial": "IN1A234B5678912CD345E67", - "icon": "dell.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dell-ups_rack3750w.json b/tests/data/dell-ups_rack3750w.json index 4b796bbcfd..c180ba210e 100644 --- a/tests/data/dell-ups_rack3750w.json +++ b/tests/data/dell-ups_rack3750w.json @@ -451,24 +451,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10902.2", - "sysDescr": "Dell UPS Rack 3750W High Efficiency Online HV", - "sysContact": null, - "version": "01.08 0004", - "hardware": "Dell UPS Rack 3750W High Efficiency Online HV", - "features": null, - "os": "dell-ups", - "type": "power", - "serial": "CN-0K804N-75162-2CH-0081-A03", - "icon": "dell.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -485,7 +467,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/dell-ups_tower1000w.json b/tests/data/dell-ups_tower1000w.json index 9c8f645499..44d9facbcc 100644 --- a/tests/data/dell-ups_tower1000w.json +++ b/tests/data/dell-ups_tower1000w.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10902.2", - "sysDescr": "Dell UPS Tower 1000W HV", - "sysContact": null, - "version": "01.14 0003", - "hardware": "Dell UPS Tower 1000W HV", - "features": null, - "os": "dell-ups", - "type": "power", - "serial": "CN-0H914N-75162-15K-0050-A04", - "icon": "dell.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/deltaups.json b/tests/data/deltaups.json index 01b54faf30..caffd17855 100644 --- a/tests/data/deltaups.json +++ b/tests/data/deltaups.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2254.2.4", - "sysDescr": "UPS SNMP Agent", - "sysContact": null, - "version": "03", - "hardware": "Minuteman E1500RTXL2U", - "features": null, - "os": "deltaups", - "type": "power", - "serial": null, - "icon": "delta.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dhcpatriot.json b/tests/data/dhcpatriot.json index f9f7579d98..01e7db89d7 100644 --- a/tests/data/dhcpatriot.json +++ b/tests/data/dhcpatriot.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux patriot-1 3.19.0-FNGi-ModularOS-2.0.0 #1 SMP Thu Aug 9 14:02:24 UTC 2018 x86_64", - "sysContact": null, - "version": "6.4.0", - "hardware": "MODELNUMBER", - "features": "Non-Expiry License", - "os": "dhcpatriot", - "type": "server", - "serial": "SERIALNUMBER", - "icon": "dhcpatriot.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dkt.json b/tests/data/dkt.json index 44a3049e46..de4d0b94af 100644 --- a/tests/data/dkt.json +++ b/tests/data/dkt.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.27304.3.2.10", - "sysDescr": "This is a DKTCOMEGA CPE FTTH gateway (GbE)", - "sysContact": null, - "version": "DKT_F2_Firmware_v05_29", - "hardware": "F2_1 1", - "features": null, - "os": "dkt", - "type": "network", - "serial": null, - "icon": "dkt.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/dlink.json b/tests/data/dlink.json index 8c9f2b7665..44ec3e817b 100644 --- a/tests/data/dlink.json +++ b/tests/data/dlink.json @@ -18,23 +18,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.171.10.153.7.1", - "sysDescr": "WS6-DGS-1210-52/F1 6.10.007", - "sysContact": null, - "version": "6.10.007", - "hardware": "WS6-DGS-1210-52/F1", - "features": null, - "os": "dlink", - "type": "network", - "serial": null, - "icon": "dlink.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/dlink_des-3526.json b/tests/data/dlink_des-3526.json index 42709c6802..e3a0b28b1e 100644 --- a/tests/data/dlink_des-3526.json +++ b/tests/data/dlink_des-3526.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.171.10.64.1", - "sysDescr": "DES-3526 Fast-Ethernet Switch", - "sysContact": null, - "version": "Build 5.01.B65", - "hardware": "DES-3526 Rev. 3A1", - "features": null, - "os": "dlink", - "type": "network", - "serial": null, - "icon": "dlink.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dlink_des-3528.json b/tests/data/dlink_des-3528.json index b9d2473840..7d7e5d7d24 100644 --- a/tests/data/dlink_des-3528.json +++ b/tests/data/dlink_des-3528.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.171.10.105.1", - "sysDescr": "DES-3528 Fast Ethernet Switch", - "sysContact": null, - "version": "3.00.012", - "hardware": "DES-3528 Rev. A2", - "features": null, - "os": "dlink", - "type": "network", - "serial": "P1UM298000677", - "icon": "dlink.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dlink_des-3550.json b/tests/data/dlink_des-3550.json index 852d5200c8..487529efd1 100644 --- a/tests/data/dlink_des-3550.json +++ b/tests/data/dlink_des-3550.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.171.10.64.2", - "sysDescr": "DES-3550 Fast-Ethernet Switch", - "sysContact": null, - "version": "Build 5.01.B65", - "hardware": "DES-3550 Rev. A5G", - "features": null, - "os": "dlink", - "type": "network", - "serial": null, - "icon": "dlink.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dlink_des.json b/tests/data/dlink_des.json index af54775e60..7b9bf1d04e 100644 --- a/tests/data/dlink_des.json +++ b/tests/data/dlink_des.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.171.10.113.1.2", - "sysDescr": "D-Link DES-3200-18 Fast Ethernet Switch", - "sysContact": null, - "version": null, - "hardware": "DES-3200-18", - "features": null, - "os": "dlink", - "type": "network", - "serial": null, - "icon": "dlink.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/dlink_dgs-1210-52mp.json b/tests/data/dlink_dgs-1210-52mp.json index 7425ec0ad8..c25371921a 100644 --- a/tests/data/dlink_dgs-1210-52mp.json +++ b/tests/data/dlink_dgs-1210-52mp.json @@ -18,23 +18,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.171.10.153.10.1", - "sysDescr": "WS6-DGS-1210-52MP/F1 6.10.007", - "sysContact": null, - "version": "6.10.007", - "hardware": "WS6-DGS-1210-52MP/F1", - "features": null, - "os": "dlink", - "type": "network", - "serial": null, - "icon": "dlink.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/dlink_dgs-1510-28.json b/tests/data/dlink_dgs-1510-28.json index 1da95783e1..adddd005db 100644 --- a/tests/data/dlink_dgs-1510-28.json +++ b/tests/data/dlink_dgs-1510-28.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.171.10.137.2.1", - "sysDescr": "DGS-1510-28 Gigabit Ethernet SmartPro Switch", - "sysContact": null, - "version": "1.50.021", - "hardware": "DGS-1510-28", - "features": null, - "os": "dlink", - "type": "network", - "serial": null, - "icon": "dlink.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dlink_dgs-1510-28x-me.json b/tests/data/dlink_dgs-1510-28x-me.json index c118d808e7..c61f3b7dce 100644 --- a/tests/data/dlink_dgs-1510-28x-me.json +++ b/tests/data/dlink_dgs-1510-28x-me.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.171.10.141.4.1", - "sysDescr": "DGS-1510-28X/ME Gigabit Ethernet Switch", - "sysContact": null, - "version": "Build 1.10.010", - "hardware": "DGS-1510-28X/ME Rev. A1", - "features": null, - "os": "dlink", - "type": "network", - "serial": "RZQG1HB000048", - "icon": "dlink.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dlink_dgs-1510-28xmp-me.json b/tests/data/dlink_dgs-1510-28xmp-me.json index 30be73c7c9..df2d113da8 100644 --- a/tests/data/dlink_dgs-1510-28xmp-me.json +++ b/tests/data/dlink_dgs-1510-28xmp-me.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.171.10.141.8.1", - "sysDescr": "DGS-1510-28XMP/ME Gigabit Ethernet Switch", - "sysContact": null, - "version": "Build 1.10.010", - "hardware": "DGS-1510-28XMP/ME Rev. A1", - "features": null, - "os": "dlink", - "type": "network", - "serial": "RZQW1I6000009", - "icon": "dlink.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dlink_dgs-3000-28x.json b/tests/data/dlink_dgs-3000-28x.json index f1003e845a..c7de674819 100644 --- a/tests/data/dlink_dgs-3000-28x.json +++ b/tests/data/dlink_dgs-3000-28x.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.171.10.133.10.2", - "sysDescr": "DGS-3000-28X Gigabit Ethernet Switch", - "sysContact": null, - "version": "4.04.B005", - "hardware": "DGS-3000-28X Rev. B1", - "features": null, - "os": "dlink", - "type": "network", - "serial": "SY321IA000068", - "icon": "dlink.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dlink_dgs-3000-28xmp.json b/tests/data/dlink_dgs-3000-28xmp.json index a62ab0caa0..2720562891 100644 --- a/tests/data/dlink_dgs-3000-28xmp.json +++ b/tests/data/dlink_dgs-3000-28xmp.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.171.10.133.11.2", - "sysDescr": "DGS-3000-28XMP Gigabit Ethernet Switch", - "sysContact": null, - "version": "Build 4.00.017", - "hardware": "DGS-3000-28XMP Rev. B1", - "features": null, - "os": "dlink", - "type": "network", - "serial": "SY331IC000040", - "icon": "dlink.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dlink_dgs-3120-24tc.json b/tests/data/dlink_dgs-3120-24tc.json index b316790dd9..1398d1ccc8 100644 --- a/tests/data/dlink_dgs-3120-24tc.json +++ b/tests/data/dlink_dgs-3120-24tc.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.171.10.117.1.1", - "sysDescr": "DGS-3120-24TC Gigabit Ethernet Switch", - "sysContact": null, - "version": "Build 2.00.010", - "hardware": "DGS-3120-24TC Rev. A1", - "features": null, - "os": "dlink", - "type": "network", - "serial": "R34O1B9000496", - "icon": "dlink.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dlink_dgs-3420-28tc.json b/tests/data/dlink_dgs-3420-28tc.json index fa37ab4a16..18187c9c6c 100644 --- a/tests/data/dlink_dgs-3420-28tc.json +++ b/tests/data/dlink_dgs-3420-28tc.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.171.10.119.1", - "sysDescr": "DGS-3420-28TC Gigabit Ethernet Switch", - "sysContact": null, - "version": "Build 1.50.018", - "hardware": "DGS-3420-28TC Rev. B1", - "features": null, - "os": "dlink", - "type": "network", - "serial": "R3045H1000058", - "icon": "dlink.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dlink_dgs-3620-28sc.json b/tests/data/dlink_dgs-3620-28sc.json index 836f5ff1de..9d0b91a5f0 100644 --- a/tests/data/dlink_dgs-3620-28sc.json +++ b/tests/data/dlink_dgs-3620-28sc.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.171.10.118.2", - "sysDescr": "DGS-3620-28SC Gigabit Ethernet Switch", - "sysContact": null, - "version": "Build 3.00.004", - "hardware": "DGS-3620-28SC Rev. A1", - "features": null, - "os": "dlink", - "type": "network", - "serial": "PVXE1B7000664", - "icon": "dlink.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dlink_dgs-3627g.json b/tests/data/dlink_dgs-3627g.json index 55d3ca4519..0fde205351 100644 --- a/tests/data/dlink_dgs-3627g.json +++ b/tests/data/dlink_dgs-3627g.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.171.10.70.8", - "sysDescr": "DGS-3627G Gigabit Ethernet Switch", - "sysContact": null, - "version": "Build 3.00.B47", - "hardware": "DGS-3627G Rev. A1", - "features": null, - "os": "dlink", - "type": "network", - "serial": "P417183000294", - "icon": "dlink.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dlinkap.json b/tests/data/dlinkap.json index 7165c3f96b..62b0bc6750 100644 --- a/tests/data/dlinkap.json +++ b/tests/data/dlinkap.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.171.10.37.56", - "sysDescr": "D-Link DAP-2230", - "sysContact": null, - "version": null, - "hardware": "D-Link DAP-2230", - "features": null, - "os": "dlinkap", - "type": "wireless", - "serial": null, - "icon": "dlink.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/dlinkap_1.json b/tests/data/dlinkap_1.json index a6a065e66b..0073cb3bd5 100644 --- a/tests/data/dlinkap_1.json +++ b/tests/data/dlinkap_1.json @@ -36,24 +36,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.171.10.37.52", - "sysDescr": "D-Link DAP-2660", - "sysContact": null, - "version": null, - "hardware": "D-Link DAP-2660", - "features": null, - "os": "dlinkap", - "type": "wireless", - "serial": null, - "icon": "dlink.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/dnos.json b/tests/data/dnos.json index e5dd20ae37..a94d4edf32 100644 --- a/tests/data/dnos.json +++ b/tests/data/dnos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6027.1.3.20", - "sysDescr": "Dell Networking OS Operating System Version: 2.0 Application Software Version: 9.9(0.0P9) Series: S4048-ON Copyright (c) 1999-2015 by Dell Inc. All Rights Reserved. Build Time: Thu Feb 4 06:57:34 2016", - "sysContact": null, - "version": "9.9(0.0P9)", - "hardware": "S4048-ON", - "features": null, - "os": "dnos", - "type": "network", - "serial": null, - "icon": "dell.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dnos_m.json b/tests/data/dnos_m.json index e87ebf0860..669d7ea6df 100644 --- a/tests/data/dnos_m.json +++ b/tests/data/dnos_m.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6027.1.4.3", - "sysDescr": "Dell Networking OS\nOperating System Version: 2.0\nApplication Software Version: 9.11(2.6)\nSeries: PE-FN-2210S-IOM\nCopyright (c) 1999-2017 by Dell Inc. All Rights Reserved.\nBuild Time: Mon Nov 13 02:08:55 2017", - "sysContact": null, - "version": "9.11(2.6)", - "hardware": "PE-FN-2210S-IOM", - "features": null, - "os": "dnos", - "type": "network", - "serial": null, - "icon": "dell.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/dnos_s4048.json b/tests/data/dnos_s4048.json index 9e94d11e7a..fe0e479a20 100644 --- a/tests/data/dnos_s4048.json +++ b/tests/data/dnos_s4048.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6027.1.3.20", - "sysDescr": "Dell Networking OS Operating System Version: 2.0 Application Software Version: 9.9(0.0P9) Series: S4048-ON Copyright (c) 1999-2015 by Dell Inc. All Rights Reserved. Build Time: Thu Feb 4 06:57:34 2016", - "sysContact": null, - "version": "9.9(0.0P9)", - "hardware": "S4048-ON", - "features": null, - "os": "dnos", - "type": "network", - "serial": null, - "icon": "dell.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dpi.json b/tests/data/dpi.json index 51cd59c647..e56f77df89 100644 --- a/tests/data/dpi.json +++ b/tests/data/dpi.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2.6.223", - "sysDescr": "IBM DPI V01.08.0003", - "sysContact": null, - "version": "V01.08.0003", - "hardware": null, - "features": null, - "os": "dpi", - "type": "power", - "serial": null, - "icon": "ibmos.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/drac.json b/tests/data/drac.json index 8ff857a503..27b0364318 100644 --- a/tests/data/drac.json +++ b/tests/data/drac.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10892.5", - "sysDescr": "Dell Out-of-band SNMP Agent for Remote Access Controller", - "sysContact": null, - "version": "6.20.200.201810113973", - "hardware": "PowerEdge M1000e", - "features": null, - "os": "drac", - "type": "appliance", - "serial": "1234ABC", - "icon": "dell.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/draytek.json b/tests/data/draytek.json index f9cbfa42ad..6c41cb6d51 100644 --- a/tests/data/draytek.json +++ b/tests/data/draytek.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.7367", - "sysDescr": "DrayTek Corporation, Router Model: Vigor2920 Series, Version: 3.8.8.2, Build Date/Time:May 21 2018 16:45:55", - "sysContact": null, - "version": "3.8.8.2", - "hardware": "Vigor2920 Series", - "features": null, - "os": "draytek", - "type": "network", - "serial": null, - "icon": "draytek.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dsm.json b/tests/data/dsm.json index eff11f1cec..be5580f5a7 100644 --- a/tests/data/dsm.json +++ b/tests/data/dsm.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux hostname 3.10.77 #8451 SMP Wed Jan 4 00:31:32 CST 2017 x86_64", - "sysContact": null, - "version": "6.1-15217", - "hardware": "RS2212RP+", - "features": null, - "os": "dsm", - "type": "storage", - "serial": "3005AWL999111", - "icon": "synology.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/dsm_ds214se.json b/tests/data/dsm_ds214se.json index 95844c8133..db57370d75 100644 --- a/tests/data/dsm_ds214se.json +++ b/tests/data/dsm_ds214se.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux Nas 3.2.40 #25426 Wed Jul 8 03:15:48 CST 2020 armv7l", - "sysContact": null, - "version": "6.2-25426", - "hardware": "DS214se", - "features": null, - "os": "dsm", - "type": "storage", - "serial": "139M8N0094", - "icon": "synology.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/dsm_ds916.json b/tests/data/dsm_ds916.json index fa6c2745c6..0cc9a35290 100644 --- a/tests/data/dsm_ds916.json +++ b/tests/data/dsm_ds916.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux Syno 3.10.77 #8451 SMP Wed Nov 9 13:45:59 CST 2016 x86_6", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "dsm", - "type": "storage", - "serial": null, - "icon": "synology.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/e3meter.json b/tests/data/e3meter.json index b2240ae1b3..efbad43e92 100644 --- a/tests/data/e3meter.json +++ b/tests/data/e3meter.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.21695.1.1290", - "sysDescr": "E3METER IPS 1290 #027676 (H4, F4.8, B4, Re73d936)", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "e3meter", - "type": "power", - "serial": null, - "icon": "riedo.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/e3meterdc.json b/tests/data/e3meterdc.json index ff583328b4..619076f901 100644 --- a/tests/data/e3meterdc.json +++ b/tests/data/e3meterdc.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.21695.1401", - "sysDescr": "E3METER Data Concentrator", - "sysContact": null, - "version": "6.1.1 (2019-04-18)", - "hardware": null, - "features": null, - "os": "e3meterdc", - "type": "power", - "serial": null, - "icon": "riedo.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/eaton-matrix.json b/tests/data/eaton-matrix.json index fe55222845..5eb877c0bf 100644 --- a/tests/data/eaton-matrix.json +++ b/tests/data/eaton-matrix.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.935.10.2", - "sysDescr": "Network Management Card for UPS", - "sysContact": null, - "version": "1.0.0.1", - "hardware": "Telecom Power", - "features": null, - "os": "eaton-matrix", - "type": "power", - "serial": "000000000", - "icon": "eaton.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/eaton-mgeups_5px.json b/tests/data/eaton-mgeups_5px.json index 1931b55901..1ea085eb40 100644 --- a/tests/data/eaton-mgeups_5px.json +++ b/tests/data/eaton-mgeups_5px.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.705.1", - "sysDescr": "Eaton 5PX 3000", - "sysContact": null, - "version": "06", - "hardware": "Eaton 5PX 3000", - "features": null, - "os": "eaton-mgeups", - "type": "power", - "serial": "G4294C3232", - "icon": "eaton.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/eaton-mgeups_93ps.json b/tests/data/eaton-mgeups_93ps.json index 497d50623e..5ea85ea919 100644 --- a/tests/data/eaton-mgeups_93ps.json +++ b/tests/data/eaton-mgeups_93ps.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.705.1", - "sysDescr": "93PS 20kW", - "sysContact": null, - "version": "2.30.0004", - "hardware": "93PS 20kW", - "features": "Network Management Card V6.00 LD", - "os": "eaton-mgeups", - "type": "power", - "serial": "H2652000009", - "icon": "eaton.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/eaton-mgeups_9px.json b/tests/data/eaton-mgeups_9px.json index 2451b1c6a1..31fc6a1317 100644 --- a/tests/data/eaton-mgeups_9px.json +++ b/tests/data/eaton-mgeups_9px.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.705.1", - "sysDescr": "Eaton 9PX 1000i RT 2U", - "sysContact": null, - "version": "01.16.4638", - "hardware": "Eaton 9PX 1000i RT 2U", - "features": "Network Management Card V6.00 LD", - "os": "eaton-mgeups", - "type": "power", - "serial": "GA10J05109", - "icon": "eaton.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/eatonpdu_dbq.json b/tests/data/eatonpdu_dbq.json index 9a43220b38..44dba6baac 100644 --- a/tests/data/eatonpdu_dbq.json +++ b/tests/data/eatonpdu_dbq.json @@ -5,25 +5,7 @@ { "sysName": "", "sysObjectID": ".1.3.6.1.4.1.534.6.6.6", - "sysDescr": null, - "sysContact": null, - "version": "01.01.01", - "hardware": "DBQ145412", - "features": null, - "os": "eatonpdu", - "type": "power", - "serial": "ADO3051266", - "icon": "eaton.svg", - "location": "" - } - ] - }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.534.6.6.6", - "sysDescr": null, + "sysDescr": "", "sysContact": "", "version": "01.01.01", "hardware": "DBQ145412", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/eatonups.json b/tests/data/eatonups.json index c6415d24b7..4e4a67c9ae 100644 --- a/tests/data/eatonups.json +++ b/tests/data/eatonups.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.534.1", - "sysDescr": "ConnectUPS Web/SNMP Card V4.38", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "eatonups", - "type": "power", - "serial": null, - "icon": "eaton.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/eatonupsm2.json b/tests/data/eatonupsm2.json index 477a0743c7..c8ba93a8fa 100644 --- a/tests/data/eatonupsm2.json +++ b/tests/data/eatonupsm2.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.534.1", - "sysDescr": "Eaton 9PX 1000i RT 2U", - "sysContact": null, - "version": "01.20.5072", - "hardware": "Eaton 9PX 1000i RT 2U", - "features": "Eaton Gigabit Network Card 1.7.6", - "os": "eatonupsm2", - "type": "power", - "serial": "GA10K33096", - "icon": "eaton.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/edfa.json b/tests/data/edfa.json index 2b414a24f0..b30a667a6d 100644 --- a/tests/data/edfa.json +++ b/tests/data/edfa.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.17409.1", - "sysDescr": "V1.29_May 24 2016_11:26:12", - "sysContact": null, - "version": null, - "hardware": "HA5837A-1x016", - "features": null, - "os": "edfa", - "type": "network", - "serial": "S26-PYA346", - "icon": "generic.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/edgecos_2100-28p.json b/tests/data/edgecos_2100-28p.json index f2d3b9cec9..854c6ee11c 100644 --- a/tests/data/edgecos_2100-28p.json +++ b/tests/data/edgecos_2100-28p.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.259.10.1.43.105", - "sysDescr": "ECS2100-28P", - "sysContact": null, - "version": "R01 1.2.2.17", - "hardware": "ECS2100-28P", - "features": null, - "os": "edgecos", - "type": "network", - "serial": "EC1806001051", - "icon": "edge-core.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/edgecos_ecs2100-10t.json b/tests/data/edgecos_ecs2100-10t.json index 051927fdab..63ccbc9acf 100644 --- a/tests/data/edgecos_ecs2100-10t.json +++ b/tests/data/edgecos_ecs2100-10t.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.259.10.1.43.101", - "sysDescr": "ECS2100-10T", - "sysContact": null, - "version": "R01 1.2.2.24", - "hardware": "ECS2100-10T", - "features": null, - "os": "edgecos", - "type": "network", - "serial": "EC1813001458", - "icon": "edge-core.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/edgecos_ecs3510-52t.json b/tests/data/edgecos_ecs3510-52t.json index 661519b094..71d175480d 100644 --- a/tests/data/edgecos_ecs3510-52t.json +++ b/tests/data/edgecos_ecs3510-52t.json @@ -46,24 +46,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.259.10.1.27.102", - "sysDescr": "ECS3510-52T", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "edgecos", - "type": "network", - "serial": null, - "icon": "edge-core.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -80,6 +62,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/edgecos_ecs4100-28t.json b/tests/data/edgecos_ecs4100-28t.json index e8a8006f20..d9270a31dd 100644 --- a/tests/data/edgecos_ecs4100-28t.json +++ b/tests/data/edgecos_ecs4100-28t.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.259.10.1.46.104", - "sysDescr": "ECS4100-28T", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "edgecos", - "type": "network", - "serial": null, - "icon": "edge-core.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/edgecos_ecs4110-28t.json b/tests/data/edgecos_ecs4110-28t.json index c2fd4a537f..f42a0688ef 100644 --- a/tests/data/edgecos_ecs4110-28t.json +++ b/tests/data/edgecos_ecs4110-28t.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.259.10.1.39.103", - "sysDescr": "ECS4110-28T", - "sysContact": null, - "version": "R01 1.1.2.0", - "hardware": "ECS4110-28T", - "features": null, - "os": "edgecos", - "type": "network", - "serial": "EC1549000075", - "icon": "edge-core.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/edgecos_ecs4210-28t.json b/tests/data/edgecos_ecs4210-28t.json index 8156f0df23..21b51e9612 100644 --- a/tests/data/edgecos_ecs4210-28t.json +++ b/tests/data/edgecos_ecs4210-28t.json @@ -46,24 +46,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.259.10.1.42.101", - "sysDescr": "ECS4210-28T", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "edgecos", - "type": "network", - "serial": null, - "icon": "edge-core.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -80,6 +62,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/edgecos_ecs4510-28f.json b/tests/data/edgecos_ecs4510-28f.json index 41d857bf19..2f08f80780 100644 --- a/tests/data/edgecos_ecs4510-28f.json +++ b/tests/data/edgecos_ecs4510-28f.json @@ -46,24 +46,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.259.10.1.24.103", - "sysDescr": "ECS4510-28F", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "edgecos", - "type": "network", - "serial": null, - "icon": "edge-core.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -80,6 +62,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/edgecos_ecs4510-52t.json b/tests/data/edgecos_ecs4510-52t.json index c2841e7192..f83453472f 100644 --- a/tests/data/edgecos_ecs4510-52t.json +++ b/tests/data/edgecos_ecs4510-52t.json @@ -46,24 +46,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.259.10.1.24.104", - "sysDescr": "ECS4510-52T", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "edgecos", - "type": "network", - "serial": null, - "icon": "edge-core.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -80,6 +62,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/edgecos_es3510ma.json b/tests/data/edgecos_es3510ma.json index 098f0a6eac..16cc72be81 100644 --- a/tests/data/edgecos_es3510ma.json +++ b/tests/data/edgecos_es3510ma.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.259.8.1.11", - "sysDescr": "ES3510MA", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "edgecos", - "type": "network", - "serial": null, - "icon": "edge-core.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/edgecos_es3526xa-v2.json b/tests/data/edgecos_es3526xa-v2.json index a5b159e69e..51a2cf00c3 100644 --- a/tests/data/edgecos_es3526xa-v2.json +++ b/tests/data/edgecos_es3526xa-v2.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.259.8.1.5", - "sysDescr": "Layer2+ Fast Ethernet Standalone Switch ES3526XA", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "edgecos", - "type": "network", - "serial": null, - "icon": "edge-core.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/edgecos_es3528mv2.json b/tests/data/edgecos_es3528mv2.json index 6ad649af46..ba090dff28 100644 --- a/tests/data/edgecos_es3528mv2.json +++ b/tests/data/edgecos_es3528mv2.json @@ -46,24 +46,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.259.10.1.22.101", - "sysDescr": "ES3528MV2", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "edgecos", - "type": "network", - "serial": null, - "icon": "edge-core.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -80,6 +62,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/edgeos-ep.json b/tests/data/edgeos-ep.json index 9c3c81cfb8..6fe21e0282 100644 --- a/tests/data/edgeos-ep.json +++ b/tests/data/edgeos-ep.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.10002.1", - "sysDescr": "Linux 2.6.32.71 #1 Fri Jan 24 08:44:01 UTC 2020 mips", - "sysContact": null, - "version": "EP.v1.6.0", - "hardware": "EP-54V-150W", - "features": null, - "os": "edgeos-ep", - "type": "power", - "serial": null, - "icon": "ubiquiti.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/edgeos.json b/tests/data/edgeos.json index 49dee0739c..13004e15a5 100644 --- a/tests/data/edgeos.json +++ b/tests/data/edgeos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.41112.1.5", - "sysDescr": "EdgeOS v1.8.0.4853089.160219.1607", - "sysContact": null, - "version": "1.8.0", - "hardware": "EdgeRouter Pro 8-Port", - "features": null, - "os": "edgeos", - "type": "network", - "serial": null, - "icon": "edgeos.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/edgeswitch.json b/tests/data/edgeswitch.json index 806403b790..c7fb5b9b81 100644 --- a/tests/data/edgeswitch.json +++ b/tests/data/edgeswitch.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.4413", - "sysDescr": "EdgeSwitch 24-Port 250W, 1.0.1.4720839, Linux 3.6.5-f4a26ed5", - "sysContact": null, - "version": "1.0.1.4720839", - "hardware": "EdgeSwitch 24-Port 250W", - "features": null, - "os": "edgeswitch", - "type": "network", - "serial": null, - "icon": "ubiquiti.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/edgeswitch_10xp.json b/tests/data/edgeswitch_10xp.json index b61231dd21..f1347ffbc5 100644 --- a/tests/data/edgeswitch_10xp.json +++ b/tests/data/edgeswitch_10xp.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.27282.3.2.10", - "sysDescr": "RTL8380-8GE-2GEF", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "edgeswitch", - "type": "network", - "serial": null, - "icon": "ubiquiti.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/edgeswitch_es-24-250w.json b/tests/data/edgeswitch_es-24-250w.json index 3ffb6f6b61..a9b46d6f6d 100644 --- a/tests/data/edgeswitch_es-24-250w.json +++ b/tests/data/edgeswitch_es-24-250w.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.4413", - "sysDescr": "EdgeSwitch 24-Port 250W, 1.8.0.5106045, Linux 3.6.5-1b505fb7, 0.0.0.0000000", - "sysContact": null, - "version": "1.8.0.5106045", - "hardware": "EdgeSwitch 24-Port 250W", - "features": null, - "os": "edgeswitch", - "type": "network", - "serial": "F03E34F342C3", - "icon": "ubiquiti.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/eds.json b/tests/data/eds.json index a671d2b48e..7e9fad3f45 100644 --- a/tests/data/eds.json +++ b/tests/data/eds.json @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.31440", - "sysDescr": "Presents 1-wire devices over Ethernet using HTTP and SNMP", - "sysContact": null, - "version": "2.10", - "hardware": "Ethernet to 1-wire Interface", - "features": null, - "os": "eds", - "type": "appliance", - "serial": null, - "icon": "eds.png", - "location": null - } - ] - } + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/ekinops.json b/tests/data/ekinops.json index 3a4be73717..5598cfbd6f 100644 --- a/tests/data/ekinops.json +++ b/tests/data/ekinops.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.20044", - "sysDescr": "Ekinops 360 Platform, C600HC, Release 6.3.900", - "sysContact": null, - "version": "Release 6.3.900", - "hardware": "C600HC", - "features": null, - "os": "ekinops", - "type": "network", - "serial": "002870", - "icon": "ekinops.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/eltek-webpower.json b/tests/data/eltek-webpower.json index f078237950..53f8dea0bd 100644 --- a/tests/data/eltek-webpower.json +++ b/tests/data/eltek-webpower.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "sysname", - "sysObjectID": ".1.3.6.1.4.1.12148.9", - "sysDescr": "WebPower(402414.003) 4.11, Apr 4 2016 OS:2.7", - "sysContact": null, - "version": "4.11", - "hardware": "smartpack", - "features": "Rectifier type: FLATPACK2 48/2000 HE, Battery name: PowerSafe 12V170FS", - "os": "eltek-webpower", - "type": "power", - "serial": "142308329523", - "icon": "eltek.png", - "location": "sysLocation" - } - ] - }, - "poller": { "devices": [ { "sysName": "sysname", @@ -35,7 +17,8 @@ "location": "sysLocation" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/endrun.json b/tests/data/endrun.json index b717012f22..6725b589ec 100644 --- a/tests/data/endrun.json +++ b/tests/data/endrun.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux NTSCBOTNTP1 2.4.26-1 #0 Wed Aug 18 17:28:45 UTC 2004 i486", - "sysContact": null, - "version": "5.70", - "hardware": "Tempus LX CDMA 6010-0042-000", - "features": "F/W 5.11 FPGA 0416", - "os": "endrun", - "type": "appliance", - "serial": "1882136009", - "icon": "endrun.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/endrun_sonoma.json b/tests/data/endrun_sonoma.json index bdd71c0894..14c5cd93b6 100644 --- a/tests/data/endrun_sonoma.json +++ b/tests/data/endrun_sonoma.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux NTSDC3NTPPTP 3.2.2-Sonoma 6010-0064-000_v2.01 #1 PREEMPT Sun Nov 13 21:31:23 UTC 2016 armv5tel", - "sysContact": null, - "version": null, - "hardware": "Sonoma_D12 GPS 6010-0065-000", - "features": null, - "os": "endrun", - "type": "appliance", - "serial": "426724685", - "icon": "endrun.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/enexus.json b/tests/data/enexus.json index 1d835c7c05..704782ed3e 100644 --- a/tests/data/enexus.json +++ b/tests/data/enexus.json @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": null, - "sysDescr": null, - "sysContact": null, - "version": "2.7.4", - "hardware": "Micropack System", - "features": null, - "os": "enexus", - "type": "power", - "serial": "", - "icon": "eltek.png", - "location": "" - } - ] - } + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/enexus_smartpacks.json b/tests/data/enexus_smartpacks.json index d7eb23cf38..a193a52708 100644 --- a/tests/data/enexus_smartpacks.json +++ b/tests/data/enexus_smartpacks.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.12148.10", - "sysDescr": "ELTEK Power System", - "sysContact": null, - "version": "2.5.3", - "hardware": "Smartpack S", - "features": null, - "os": "enexus", - "type": "power", - "serial": "999999999999", - "icon": "eltek.png", - "location": "Site" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "Site" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/enexus_smartpacks2.json b/tests/data/enexus_smartpacks2.json index 4881bb2019..2643fe9748 100644 --- a/tests/data/enexus_smartpacks2.json +++ b/tests/data/enexus_smartpacks2.json @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": null, - "sysDescr": null, - "sysContact": null, - "version": "2.5.2", - "hardware": "Smartpack S", - "features": null, - "os": "enexus", - "type": "power", - "serial": "999999999999", - "icon": "eltek.png", - "location": "Site" - } - ] - } + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/enexus_sp2touch.json b/tests/data/enexus_sp2touch.json index a30b2d3932..09b520797c 100644 --- a/tests/data/enexus_sp2touch.json +++ b/tests/data/enexus_sp2touch.json @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": null, - "sysDescr": null, - "sysContact": null, - "version": "1.5", - "hardware": "SmartPack2 Touch", - "features": null, - "os": "enexus", - "type": "power", - "serial": "", - "icon": "eltek.png", - "location": "" - } - ] - } + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/epson.json b/tests/data/epson.json index 5aa17debeb..2e32c6979e 100644 --- a/tests/data/epson.json +++ b/tests/data/epson.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1248.1.1.2.1.3.5.69.69.80.83.50", - "sysDescr": "EPSON Built-in", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "epson", - "type": "printer", - "serial": "X3B8022793", - "icon": "epson.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ericsson-ml.json b/tests/data/ericsson-ml.json index 543ae82576..93e2815d57 100644 --- a/tests/data/ericsson-ml.json +++ b/tests/data/ericsson-ml.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.193.223.2.1", - "sysDescr": "MINI-LINK 6352 80/21H", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "ericsson-ml", - "type": "wireless", - "serial": null, - "icon": "ericsson.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/exa.json b/tests/data/exa.json index fab800b1f3..d115955457 100644 --- a/tests/data/exa.json +++ b/tests/data/exa.json @@ -19,24 +19,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6321.1.2.2.5.3", - "sysDescr": "E7-2", - "sysContact": null, - "version": null, - "hardware": "Calix E7-2", - "features": "", - "os": "exa", - "type": "network", - "serial": null, - "icon": "calix.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -53,6 +35,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/exa_e7-2.json b/tests/data/exa_e7-2.json index a45693511c..44003c1421 100644 --- a/tests/data/exa_e7-2.json +++ b/tests/data/exa_e7-2.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6321.1.2.2.5.3", - "sysDescr": "E7-2", - "sysContact": null, - "version": "3.1.50.1", - "hardware": "Calix E7-2", - "features": "tenge4, gpon4", - "os": "exa", - "type": "network", - "serial": "80394580923", - "icon": "calix.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/exagridos.json b/tests/data/exagridos.json index 064f19d4f5..f8844f10ed 100644 --- a/tests/data/exagridos.json +++ b/tests/data/exagridos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.14941.3.1.840", - "sysDescr": "ExaGrid EX40000E-SEC, 4.8.1.1209.P60", - "sysContact": null, - "version": "4.8.1.1209.P60", - "hardware": "EX40000E-SEC", - "features": null, - "os": "exagridos", - "type": "storage", - "serial": null, - "icon": "exagrid.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/f5.json b/tests/data/f5.json index 7b4d2a61c4..889d80a502 100644 --- a/tests/data/f5.json +++ b/tests/data/f5.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.3375.2.1.3.4.94", - "sysDescr": "Linux F5_device 2.6.32-431.56.1.el6.f5.x86_64 #1 SMP Thu Dec 13 14:25:45 PST 2018 x86_64", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "f5", - "type": "loadbalancer", - "serial": null, - "icon": "f5.svg", - "location": null - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": null } ] - } + }, + "poller": "matches discovery" }, "loadbalancers": { "discovery": { diff --git a/tests/data/fabos.json b/tests/data/fabos.json index c9e945790b..966b66e6fe 100644 --- a/tests/data/fabos.json +++ b/tests/data/fabos.json @@ -19,24 +19,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1588.2.1.1.1", - "sysDescr": "Fibre Channel Switch.", - "sysContact": null, - "version": "v8.1.2g", - "hardware": "Brocade 6520 Switch", - "features": null, - "os": "fabos", - "type": "network", - "serial": null, - "icon": "brocade.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -53,7 +35,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/fiberhome-switch.json b/tests/data/fiberhome-switch.json index a4a1fd714b..3f988e1296 100644 --- a/tests/data/fiberhome-switch.json +++ b/tests/data/fiberhome-switch.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.3807.1.582815", - "sysDescr": "S5800 FHN USP (R) Software, Version V210R240,Hw Version 2.0,Copyrig", - "sysContact": null, - "version": "V210R240", - "hardware": "S5800 FHN USP", - "features": "2.0", - "os": "fiberhome-switch", - "type": "network", - "serial": null, - "icon": "fiberhome.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/fiberhome-switch_fh2800.json b/tests/data/fiberhome-switch_fh2800.json index 197697fcb6..2d31cc2c9d 100644 --- a/tests/data/fiberhome-switch_fh2800.json +++ b/tests/data/fiberhome-switch_fh2800.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.3807.1.281802", - "sysDescr": "S2800 FHN USP (R) Software, Version V210R220,Hw Version 1.0,Copyright (c) 2000-2012 by FiberHome Networks Co., Ltd", - "sysContact": null, - "version": "V210R220", - "hardware": "S2800 FHN USP", - "features": "1.0", - "os": "fiberhome-switch", - "type": "network", - "serial": null, - "icon": "fiberhome.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/fiberhome-switch_fh4800.json b/tests/data/fiberhome-switch_fh4800.json index a7e840b298..4f399af66e 100644 --- a/tests/data/fiberhome-switch_fh4800.json +++ b/tests/data/fiberhome-switch_fh4800.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.3807.1.481005", - "sysDescr": "S4800 FiberHome INP (R) Software, Version V210R220,Hw Version N/A,Copyright (c) 2000-2017 by FiberHome Technologies Co., Ltd", - "sysContact": null, - "version": "V210R220", - "hardware": "S4800 FiberHome INP", - "features": "N/A", - "os": "fiberhome-switch", - "type": "network", - "serial": null, - "icon": "fiberhome.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/fiberhome.json b/tests/data/fiberhome.json index 52c75ece74..da356c1202 100644 --- a/tests/data/fiberhome.json +++ b/tests/data/fiberhome.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.5875.800.1001.11", - "sysDescr": "AN5516-01", - "sysContact": null, - "version": "RP0700", - "hardware": "AN5516-01", - "features": "WKE2.115.331R1A", - "os": "fiberhome", - "type": "network", - "serial": null, - "icon": "fiberhome.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/fiberhome_an5516-01.json b/tests/data/fiberhome_an5516-01.json index c30626c960..08e0e2f14a 100644 --- a/tests/data/fiberhome_an5516-01.json +++ b/tests/data/fiberhome_an5516-01.json @@ -47,24 +47,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.5875.800.1001.11", - "sysDescr": "AN5516-01", - "sysContact": null, - "version": null, - "hardware": "AN5516-01", - "features": null, - "os": "fiberhome", - "type": "network", - "serial": null, - "icon": "fiberhome.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/fiberhome_an5516-04.json b/tests/data/fiberhome_an5516-04.json index 94886e6a4b..c1c0728d0a 100644 --- a/tests/data/fiberhome_an5516-04.json +++ b/tests/data/fiberhome_an5516-04.json @@ -36,24 +36,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.5875.800.1001.12", - "sysDescr": "AN5516-04", - "sysContact": null, - "version": null, - "hardware": "AN5516-04", - "features": null, - "os": "fiberhome", - "type": "network", - "serial": null, - "icon": "fiberhome.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/fibernet-xmux4-plus.json b/tests/data/fibernet-xmux4-plus.json index 3e6f3474bd..3f0d219c32 100644 --- a/tests/data/fibernet-xmux4-plus.json +++ b/tests/data/fibernet-xmux4-plus.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "xmux torrevieja", - "sysObjectID": ".1.3.6.1.4.1.29003.2.44.1", - "sysDescr": "Xmux Torrevieja", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "fibernet-xmux4-plus", - "type": "network", - "serial": null, - "icon": "fibernet.svg", - "location": "Torrevieja" - } - ] - }, - "poller": { "devices": [ { "sysName": "xmux torrevieja", @@ -35,7 +17,8 @@ "location": "Torrevieja" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/firebrick.json b/tests/data/firebrick.json index fb8c8e7341..b7f3b65ff5 100644 --- a/tests/data/firebrick.json +++ b/tests/data/firebrick.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.24693.1.2900", - "sysDescr": "FB2900 Belladonna+ (V1.49.037 2018-10-27T18:12:27)", - "sysContact": null, - "version": "V1.49.037 2018-10-27T18:12:27", - "hardware": "FB2900", - "features": null, - "os": "firebrick", - "type": "network", - "serial": null, - "icon": "firebrick.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/fortiauthenticator.json b/tests/data/fortiauthenticator.json index b491bf8434..31a9b7c6c9 100644 --- a/tests/data/fortiauthenticator.json +++ b/tests/data/fortiauthenticator.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.12356.113.100.101", - "sysDescr": "FortiAuthenticator", - "sysContact": null, - "version": "v6.0.3-build0058", - "hardware": "FACVM", - "features": null, - "os": "fortiauthenticator", - "type": "firewall", - "serial": "FAC-VM0A12345678", - "icon": "fortinet.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/fortigate.json b/tests/data/fortigate.json index 040912aba2..1acb4794ee 100644 --- a/tests/data/fortigate.json +++ b/tests/data/fortigate.json @@ -19,24 +19,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.12356.15", - "sysDescr": "", - "sysContact": null, - "version": "v5.6.4,build1575,180425 (GA)", - "hardware": "FGT_501E", - "features": null, - "os": "fortigate", - "type": "firewall", - "serial": "FG5H1E5810000000", - "icon": "fortinet.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -53,7 +35,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/fortigate_100e.json b/tests/data/fortigate_100e.json index 52510c5a98..a623c8f643 100644 --- a/tests/data/fortigate_100e.json +++ b/tests/data/fortigate_100e.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.12356.101.1.1041", - "sysDescr": "Gecom", - "sysContact": null, - "version": "v5.4.4,build7650,170529 (GA)", - "hardware": "FGT_100E", - "features": null, - "os": "fortigate", - "type": "firewall", - "serial": "FG100E4Q17011652", - "icon": "fortinet.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/fortigate_1500d-sensors.json b/tests/data/fortigate_1500d-sensors.json index e3c9cddd6e..586fd44738 100644 --- a/tests/data/fortigate_1500d-sensors.json +++ b/tests/data/fortigate_1500d-sensors.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.12356.101.1.15000", - "sysDescr": "our firewall", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "fortigate", - "type": "firewall", - "serial": null, - "icon": "fortinet.svg", - "location": null - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": null } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/fortigate_1500d.json b/tests/data/fortigate_1500d.json index f8aa2cae67..eb0b0ea162 100644 --- a/tests/data/fortigate_1500d.json +++ b/tests/data/fortigate_1500d.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.12356.101.1.15000", - "sysDescr": "FG1K5D3I14802135", - "sysContact": null, - "version": "v5.4.8,build1183,180115 (GA)", - "hardware": "FGT_1500D", - "features": null, - "os": "fortigate", - "type": "firewall", - "serial": "FG1K5D3I14802132", - "icon": "fortinet.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/fortigate_fwf60d.json b/tests/data/fortigate_fwf60d.json index 0e9237cb39..16deab32c8 100644 --- a/tests/data/fortigate_fwf60d.json +++ b/tests/data/fortigate_fwf60d.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.12356.101.1.626", - "sysDescr": "", - "sysContact": null, - "version": "v5.6.5,build1600,180620 (GA)", - "hardware": "FWF_60D", - "features": null, - "os": "fortigate", - "type": "firewall", - "serial": "", - "icon": "fortinet.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/fortimail.json b/tests/data/fortimail.json index 98ded8ea08..0e7f9e5eda 100644 --- a/tests/data/fortimail.json +++ b/tests/data/fortimail.json @@ -6,24 +6,6 @@ "sysName": "", "sysObjectID": ".1.3.6.1.4.1.12356.105", "sysDescr": "", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "fortimail", - "type": "firewall", - "serial": null, - "icon": "fortinet.svg", - "location": "" - } - ] - }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.12356.105", - "sysDescr": null, "sysContact": "", "version": null, "hardware": null, @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/fortios.json b/tests/data/fortios.json index 7dc06f9fae..bba5dc69d9 100644 --- a/tests/data/fortios.json +++ b/tests/data/fortios.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.12356.103", - "sysDescr": "", - "sysContact": null, - "version": "v5.6.0-build1557 170727 (GA)", - "hardware": null, - "features": "with Analyzer features", - "os": "fortios", - "type": "appliance", - "serial": "FMG-VM0000000000", - "icon": "fortinet.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/fortisandbox.json b/tests/data/fortisandbox.json index 52d4693e5a..c152e708b6 100644 --- a/tests/data/fortisandbox.json +++ b/tests/data/fortisandbox.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.12356.118.1.20000", - "sysDescr": "", - "sysContact": null, - "version": "v3.12-build0124 (GA)", - "hardware": "FSA VM", - "features": null, - "os": "fortisandbox", - "type": "firewall", - "serial": "FSAVM00000000000", - "icon": "fortinet.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/fortiswitch.json b/tests/data/fortiswitch.json index f34ff01bcb..991a6ce783 100644 --- a/tests/data/fortiswitch.json +++ b/tests/data/fortiswitch.json @@ -36,24 +36,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.12356.106.1.2482", - "sysDescr": null, - "sysContact": null, - "version": "3.3.3", - "hardware": "FortiSwitch-248D-FPOE", - "features": null, - "os": "fortiswitch", - "type": "network", - "serial": null, - "icon": "fortinet.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/fortivoice.json b/tests/data/fortivoice.json index c5981b2bf8..c217ca3726 100644 --- a/tests/data/fortivoice.json +++ b/tests/data/fortivoice.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.12356.115", - "sysDescr": "", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "fortivoice", - "type": "firewall", - "serial": null, - "icon": "fortinet.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/fortiweb.json b/tests/data/fortiweb.json index 8ebd1d1843..694d01cd1a 100644 --- a/tests/data/fortiweb.json +++ b/tests/data/fortiweb.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.12356.107.1.50007", - "sysDescr": "FortiwebAz", - "sysContact": null, - "version": "5.91", - "hardware": "FortiWeb-Azure", - "features": null, - "os": "fortiweb", - "type": "firewall", - "serial": "FVVM123456789012", - "icon": "fortinet.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/fortiwlc.json b/tests/data/fortiwlc.json index eee0550a08..af72bff203 100644 --- a/tests/data/fortiwlc.json +++ b/tests/data/fortiwlc.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.15983.1.1.7.18", - "sysDescr": "controller", - "sysContact": null, - "version": "8.2-7MR-1", - "hardware": "MC1550", - "features": null, - "os": "fortiwlc", - "type": "network", - "serial": null, - "icon": "fortinet.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/freebsd.json b/tests/data/freebsd.json index e5ccf93398..43f92a720c 100644 --- a/tests/data/freebsd.json +++ b/tests/data/freebsd.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2238", - "sysDescr": "FreeBSD some.example.org 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Thu Sep 26 22:50:31 UTC 2013 root@bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64", - "sysContact": null, - "version": "9.2-RELEASE", - "hardware": "Red Hat [KVM]", - "features": "FreeBSD 12.1-RELEASE-p3", - "os": "freebsd", - "type": "server", - "serial": null, - "icon": "freebsd.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/freshtomato.json b/tests/data/freshtomato.json index a99b60f7b3..e54b8e18b9 100644 --- a/tests/data/freshtomato.json +++ b/tests/data/freshtomato.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux TomatoWifi 2.6.22.19 #13 Wed Sep 23 16:39:18 CEST 2020 mips", - "sysContact": null, - "version": "2020.6", - "hardware": "Asus RT-N66U", - "features": null, - "os": "freshtomato", - "type": "network", - "serial": null, - "icon": "tomato.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/fs-gbn_2800.json b/tests/data/fs-gbn_2800.json index 7feb5bd874..501ea5df81 100644 --- a/tests/data/fs-gbn_2800.json +++ b/tests/data/fs-gbn_2800.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.13464.1.3.32.1", - "sysDescr": "FS Switch", - "sysContact": null, - "version": "S2800-24T4F V100R001B01D001P003SP9", - "hardware": "S2800-24T4F Switch Product", - "features": null, - "os": "fs-gbn", - "type": "network", - "serial": "T180321D200", - "icon": "fs.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/fs-gbn_3800.json b/tests/data/fs-gbn_3800.json index 11328cc1c4..5cfde9364e 100644 --- a/tests/data/fs-gbn_3800.json +++ b/tests/data/fs-gbn_3800.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.13464.1.3.38.3", - "sysDescr": "FS Switch", - "sysContact": null, - "version": "S3800-24F4S V100R001B01D001P004SP3", - "hardware": "S3800-24F4S Switch Product", - "features": null, - "os": "fs-gbn", - "type": "network", - "serial": "F170823DN051", - "icon": "fs.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/fs-net-pdu.json b/tests/data/fs-net-pdu.json index 66ed4980b6..1a51b0ec46 100644 --- a/tests/data/fs-net-pdu.json +++ b/tests/data/fs-net-pdu.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.30966", - "sysDescr": "net-pdu", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "fs-net-pdu", - "type": "power", - "serial": null, - "icon": "fs.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/fs-nmu.json b/tests/data/fs-nmu.json index 21655b9ee3..5bb2b19b5f 100644 --- a/tests/data/fs-nmu.json +++ b/tests/data/fs-nmu.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.2.1.1.2", - "sysDescr": "GLCY SNMP", - "sysContact": null, - "version": "SV3.01.18", - "hardware": "OEO", - "features": null, - "os": "fs-nmu", - "type": "network", - "serial": "1119120009301117", - "icon": "fs.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/fs-switch_5800.json b/tests/data/fs-switch_5800.json index b3a4609362..eb4c3604fb 100644 --- a/tests/data/fs-switch_5800.json +++ b/tests/data/fs-switch_5800.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.27975.99.263", - "sysDescr": "FSOS software, S5800 software (S5800 8TF12S), Version 5.3.7", - "sysContact": null, - "version": "FSOS Software, Version 5.3.7", - "hardware": "8TF12S", - "features": null, - "os": "fs-switch", - "type": "network", - "serial": "CG1805255992N013", - "icon": "fs.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/fs-switch_s3900.json b/tests/data/fs-switch_s3900.json index 48be913230..f36b22b9d9 100644 --- a/tests/data/fs-switch_s3900.json +++ b/tests/data/fs-switch_s3900.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.52642.2.1.45.101", - "sysDescr": "S3900-24T4S", - "sysContact": null, - "version": "1.6.9R2", - "hardware": "S3900-24T4S", - "features": null, - "os": "fs-switch", - "type": "network", - "serial": "CG1906181563N0093", - "icon": "fs.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ftd.json b/tests/data/ftd.json index fd4a3f08ef..510ec682e6 100644 --- a/tests/data/ftd.json +++ b/tests/data/ftd.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.2409", - "sysDescr": "Cisco FirePOWER Threat Defense, Version 6.2.0.4 (Build 85), ASA Version 9.7(1)19", - "sysContact": null, - "version": "6.2.0.4 (Build 85)", - "hardware": null, - "features": null, - "os": "ftd", - "type": "firewall", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ftd_1140.json b/tests/data/ftd_1140.json index 2033a6d0b6..d2f950586a 100644 --- a/tests/data/ftd_1140.json +++ b/tests/data/ftd_1140.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.2662", - "sysDescr": "Cisco Firepower Threat Defense, Version 6.4.0 (Build 102), ASA Version 9.12(1)6", - "sysContact": null, - "version": "6.4.0 (Build 102)", - "hardware": null, - "features": null, - "os": "ftd", - "type": "firewall", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ftd_4115.json b/tests/data/ftd_4115.json index 927eaac9b7..b72de3ed5a 100644 --- a/tests/data/ftd_4115.json +++ b/tests/data/ftd_4115.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.2774", - "sysDescr": "Cisco Firepower Threat Defense, Version 6.6.1 (Build 90), ASA Version 9.14(1)27", - "sysContact": null, - "version": "6.6.1 (Build 90)", - "hardware": null, - "features": null, - "os": "ftd", - "type": "firewall", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ftos.json b/tests/data/ftos.json index 1378025c86..dd8c046443 100644 --- a/tests/data/ftos.json +++ b/tests/data/ftos.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6027.1.3.4", - "sysDescr": "Force10 Networks Real Time Operating System Software.Force10 Operating System Version: 1.0.Force10 Application Software Version: 8.4.2.5.Copyright (c) 1999-2010 by Force10 Networks, Inc.", - "sysContact": null, - "version": "8.4.2.5", - "hardware": "S25P-AC", - "features": null, - "os": "ftos", - "type": "network", - "serial": null, - "icon": "force10.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/ftos_1.json b/tests/data/ftos_1.json index 38a7a52037..a91ff302da 100644 --- a/tests/data/ftos_1.json +++ b/tests/data/ftos_1.json @@ -47,23 +47,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6027.1.2.1", - "sysDescr": "Force10 Networks Real Time Operating System Software.Force10 Operating System Version: 1.0.Force10 Application Software Version: 8.3.2.0.Copyright (c) 1999-2010 by Force10 Networks, Inc..Build Time: Wed Jul 7 19:27:13 PDT 2010", - "sysContact": null, - "version": "8.3.2.0", - "hardware": "C300", - "features": null, - "os": "ftos", - "type": "network", - "serial": null, - "icon": "force10.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/fusion.json b/tests/data/fusion.json index 054d785e27..9b4a8f2f7d 100644 --- a/tests/data/fusion.json +++ b/tests/data/fusion.json @@ -1183,24 +1183,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.259.6.10.120", - "sysDescr": "FNS-SFP-24", - "sysContact": null, - "version": "1.0.2.3", - "hardware": "FNS-SFP-24", - "features": null, - "os": "fusion", - "type": "network", - "serial": "XX00000001", - "icon": "ignitenet.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -1217,6 +1199,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/fusionhub.json b/tests/data/fusionhub.json index 5ce5ca6ff4..84bcefc200 100644 --- a/tests/data/fusionhub.json +++ b/tests/data/fusionhub.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.23695", - "sysDescr": "Peplink FusionHub", - "sysContact": null, - "version": "8.0.0 build 1595", - "hardware": "Peplink FusionHub", - "features": null, - "os": "fusionhub", - "type": "appliance", - "serial": "1113-8637-D091", - "icon": "peplink.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/gaia.json b/tests/data/gaia.json index c0aecb73a5..750878dc28 100644 --- a/tests/data/gaia.json +++ b/tests/data/gaia.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2620.1.6.123.1.49", - "sysDescr": "Linux hostname 2.6.18-92cpx86_64 #1 SMP Tue Sep 20 14:57:58 IDT 2016 x86_64", - "sysContact": null, - "version": "R80.10", - "hardware": "Check Point 3200", - "features": null, - "os": "gaia", - "type": "firewall", - "serial": "2000AB4000", - "icon": "checkpoint.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/gaia_15600.json b/tests/data/gaia_15600.json index cabca719a7..c1f13ad985 100644 --- a/tests/data/gaia_15600.json +++ b/tests/data/gaia_15600.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2620.1.6.123.1.64", - "sysDescr": "Linux vsx2 2.6.18-92cpx86_64 #1 SMP Sun Sep 15 13:03:19 IDT 2019 x86_64", - "sysContact": null, - "version": "R80.20", - "hardware": "Check Point 15600", - "features": null, - "os": "gaia", - "type": "firewall", - "serial": "LR201805015955", - "icon": "checkpoint.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/generex-ups.json b/tests/data/generex-ups.json index af597e0e3a..f23f4c7454 100644 --- a/tests/data/generex-ups.json +++ b/tests/data/generex-ups.json @@ -18,23 +18,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.2.1.33", - "sysDescr": "CS121 v 5.14.50", - "sysContact": null, - "version": "5.14.50", - "hardware": "CS121", - "features": null, - "os": "generex-ups", - "type": "power", - "serial": null, - "icon": "generex-ups.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/generex-ups_cs121.json b/tests/data/generex-ups_cs121.json index ba3dc6301a..d2c0cf07bf 100644 --- a/tests/data/generex-ups_cs121.json +++ b/tests/data/generex-ups_cs121.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.2.1.33", - "sysDescr": "CS121 v 4.26.14", - "sysContact": null, - "version": "CS121 v 4.26.14", - "hardware": "Rittal RITTAL PMC Extension", - "features": null, - "os": "generex-ups", - "type": "power", - "serial": null, - "icon": "generex-ups.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/generex-ups_cs141.json b/tests/data/generex-ups_cs141.json index d6c8bee00f..816e15fcd3 100644 --- a/tests/data/generex-ups_cs141.json +++ b/tests/data/generex-ups_cs141.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.2.1.33", - "sysDescr": "The Cs141 SNMP Agent", - "sysContact": null, - "version": "CS141-SNMP V1.80.17 190618", - "hardware": "Multimatic Upscale", - "features": null, - "os": "generex-ups", - "type": "power", - "serial": null, - "icon": "generex-ups.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/gepulsar.json b/tests/data/gepulsar.json index bd04b2a96c..da389b8cda 100644 --- a/tests/data/gepulsar.json +++ b/tests/data/gepulsar.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.10520.2.1.3", - "sysDescr": "NE843A", - "sysContact": null, - "version": "3.3.24", - "hardware": "NE843_M1", - "features": null, - "os": "gepulsar", - "type": "power", - "serial": "16KZ46035608", - "icon": "ge.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/gigavue.json b/tests/data/gigavue.json index 7febb522c2..c1c2e36498 100644 --- a/tests/data/gigavue.json +++ b/tests/data/gigavue.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.26866.3.1", - "sysDescr": "Gigamon GigaVUE-2404 v8.6.07", - "sysContact": null, - "version": "v8.6.07", - "hardware": "GigaVUE-2404", - "features": null, - "os": "gigavue", - "type": "network", - "serial": "21327", - "icon": "gigamon.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/gos.json b/tests/data/gos.json index 0f92e27f1f..fee909c65e 100644 --- a/tests/data/gos.json +++ b/tests/data/gos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.35847.1.1", - "sysDescr": "Greenbone Security Manager", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "gos", - "type": "appliance", - "serial": null, - "icon": "gos.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/grandstream-ht.json b/tests/data/grandstream-ht.json index dd701bf39e..79be284fdf 100644 --- a/tests/data/grandstream-ht.json +++ b/tests/data/grandstream-ht.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux HT8XX 3.4.20-rt31-dvf-v1.2.6.1-rc2 #54 PREEMPT Sat Oct 21 17:21:10 CST 2017 armv5tejl", - "sysContact": null, - "version": "Core: 1.0.5.3, Base: 1.0.5.11", - "hardware": null, - "features": null, - "os": "grandstream-ht", - "type": "network", - "serial": "9610005015A", - "icon": "grandstream.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/gw-eydfa.json b/tests/data/gw-eydfa.json index 016ab160a7..c8a347c94f 100644 --- a/tests/data/gw-eydfa.json +++ b/tests/data/gw-eydfa.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.17409.1.11", - "sysDescr": "GW-6420-WDM", - "sysContact": null, - "version": "V3.1.0", - "hardware": "GW-6420-WDM", - "features": null, - "os": "gw-eydfa", - "type": "network", - "serial": "180619085787", - "icon": "glassway.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/gwd.json b/tests/data/gwd.json index 0b740a2f67..5aaa5cd124 100644 --- a/tests/data/gwd.json +++ b/tests/data/gwd.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.10072.2.20", - "sysDescr": "EasyPath Ethernet-PON", - "sysContact": null, - "version": "V1R12B192sp18", - "hardware": "V2.3B1", - "features": null, - "os": "gwd", - "type": "network", - "serial": "4PA0S16091000090", - "icon": "gwd.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/harmony-enhanced.json b/tests/data/harmony-enhanced.json index c90368d2dd..048803e374 100644 --- a/tests/data/harmony-enhanced.json +++ b/tests/data/harmony-enhanced.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.7262.4.5.1.3", - "sysDescr": "Multiprotocol Agent running on QNX Neutrino", - "sysContact": null, - "version": "1.0.4", - "hardware": null, - "features": null, - "os": "harmony-enhanced", - "type": "wireless", - "serial": "", - "icon": "dragonwave.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/helios.json b/tests/data/helios.json index 2280911088..30cf7a501a 100644 --- a/tests/data/helios.json +++ b/tests/data/helios.json @@ -5,25 +5,7 @@ { "sysName": "", "sysObjectID": ".1.3.6.1.4.1.47307", - "sysDescr": null, - "sysContact": null, - "version": "1.1.9-9791-1b3b6d8c", - "hardware": "ML-60-30-18", - "features": null, - "os": "helios", - "type": "wireless", - "serial": null, - "icon": "ignitenet.png", - "location": "" - } - ] - }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.47307", - "sysDescr": null, + "sysDescr": "", "sysContact": "", "version": "1.1.9-9791-1b3b6d8c", "hardware": "ML-60-30-18", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/heliosip.json b/tests/data/heliosip.json index 1a191e9614..ed8b1c5a8f 100644 --- a/tests/data/heliosip.json +++ b/tests/data/heliosip.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "2n-helios.company.com", - "sysObjectID": ".1.3.6.1.4.1.6530", - "sysDescr": "2N IP Force", - "sysContact": null, - "version": "2.22.0.31.8", - "hardware": "2N IP Force", - "features": null, - "os": "heliosip", - "type": "appliance", - "serial": "54-2354-8708", - "icon": "2n.svg", - "location": "Front Door" - } - ] - }, - "poller": { "devices": [ { "sysName": "2n-helios.company.com", @@ -35,7 +17,8 @@ "location": "Front Door" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/hikvision-cam.json b/tests/data/hikvision-cam.json index d8ebb14a81..6ac6d0889d 100644 --- a/tests/data/hikvision-cam.json +++ b/tests/data/hikvision-cam.json @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": null, - "sysDescr": null, - "sysContact": null, - "version": "V5.5.3 build 171025", - "hardware": "DS-2CD2185FWD-I", - "features": "H.264-MJPEG", - "os": "hikvision-cam", - "type": "network", - "serial": null, - "icon": "hikvision.png", - "location": null - } - ] - } + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/hikvision-nvr.json b/tests/data/hikvision-nvr.json index ef19c54f0c..e60d71bfc6 100644 --- a/tests/data/hikvision-nvr.json +++ b/tests/data/hikvision-nvr.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.50001", - "sysDescr": "Hikvision company products", - "sysContact": null, - "version": "200", - "hardware": "NVR", - "features": null, - "os": "hikvision-nvr", - "type": "network", - "serial": "0820160719AARR624053979WCVU", - "icon": "hikvision.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/hirschmann.json b/tests/data/hirschmann.json index 432b0e987a..fade3a92da 100644 --- a/tests/data/hirschmann.json +++ b/tests/data/hirschmann.json @@ -19,24 +19,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.248.14.10.41", - "sysDescr": "Hirschmann Railswitch", - "sysContact": null, - "version": "07.1.05", - "hardware": "RS30-1602OOZZSDHPHH", - "features": null, - "os": "hirschmann", - "type": "network", - "serial": "9999999999999F9999", - "icon": "hirschmann.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -53,7 +35,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/hiveos-wireless.json b/tests/data/hiveos-wireless.json index da54276a6f..e512b2088f 100644 --- a/tests/data/hiveos-wireless.json +++ b/tests/data/hiveos-wireless.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.26928.1", - "sysDescr": "AP230, HiveOS 8.1r2a build-178408", - "sysContact": null, - "version": "8.1r2a build-178408", - "hardware": "AP250", - "features": null, - "os": "hiveos-wireless", - "type": "wireless", - "serial": "02501608254257", - "icon": "aerohive.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "wireless": { "discovery": { diff --git a/tests/data/hiveos-wireless_320_n.json b/tests/data/hiveos-wireless_320_n.json index 8f797a90b6..404c54bd63 100644 --- a/tests/data/hiveos-wireless_320_n.json +++ b/tests/data/hiveos-wireless_320_n.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.26928.1", - "sysDescr": "HiveAP320_n, HiveOS 6.5r9a build-194750", - "sysContact": null, - "version": "6.5r9a build-194750", - "hardware": "HiveAP320_n", - "features": null, - "os": "hiveos-wireless", - "type": "wireless", - "serial": null, - "icon": "aerohive.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/hiveos-wireless_650ax.json b/tests/data/hiveos-wireless_650ax.json index 70b0c88a22..4aa5ab3f87 100644 --- a/tests/data/hiveos-wireless_650ax.json +++ b/tests/data/hiveos-wireless_650ax.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.26928.1", - "sysDescr": "AP650X, HiveOS 10.0r7a build-232353", - "sysContact": null, - "version": "10.0r7a build-232353", - "hardware": "AP650X", - "features": null, - "os": "hiveos-wireless", - "type": "wireless", - "serial": "16501810030163", - "icon": "aerohive.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/hiveos-wireless_ap130.json b/tests/data/hiveos-wireless_ap130.json index e9aa4b2da8..9f007a68b3 100644 --- a/tests/data/hiveos-wireless_ap130.json +++ b/tests/data/hiveos-wireless_ap130.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.26928.1", - "sysDescr": "AP130, HiveOS 8.1r2a build-178408", - "sysContact": null, - "version": "8.1r2a build-178408", - "hardware": "AP130", - "features": null, - "os": "hiveos-wireless", - "type": "wireless", - "serial": "01301603336863", - "icon": "aerohive.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/hpblmos.json b/tests/data/hpblmos.json index 45bbefb634..7d5eeb0c1a 100644 --- a/tests/data/hpblmos.json +++ b/tests/data/hpblmos.json @@ -19,24 +19,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.11.5.7.1.2", - "sysDescr": "HP Onboard Administrator", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "hpblmos", - "type": "appliance", - "serial": null, - "icon": "hpe.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -53,7 +35,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/hpe-ilo.json b/tests/data/hpe-ilo.json index 7b2238e07e..41965ca6ad 100644 --- a/tests/data/hpe-ilo.json +++ b/tests/data/hpe-ilo.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.232.9.4.10", - "sysDescr": "Integrated Lights-Out 4 2.50 Sep 23 2016", - "sysContact": null, - "version": "2.50", - "hardware": "ProLiant ML350 Gen9", - "features": null, - "os": "hpe-ilo", - "type": "appliance", - "serial": "AB123456CD", - "icon": "hpe.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/hpe-ilo_4.json b/tests/data/hpe-ilo_4.json index f02c192531..1b099b239f 100644 --- a/tests/data/hpe-ilo_4.json +++ b/tests/data/hpe-ilo_4.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.232.9.4.10", - "sysDescr": "Integrated Lights-Out 4 2.60 May 23 2018", - "sysContact": null, - "version": "2.60", - "hardware": "ProLiant ML350 Gen9", - "features": null, - "os": "hpe-ilo", - "type": "appliance", - "serial": "CZ270746S1", - "icon": "hpe.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/hpe-pdumm.json b/tests/data/hpe-pdumm.json index d8c0f87e0d..56e6ea02da 100644 --- a/tests/data/hpe-pdumm.json +++ b/tests/data/hpe-pdumm.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": null, - "sysDescr": "HP PDU Management Module, revision 1.00.A, firmware version 1.00.16", - "sysContact": null, - "version": "1.00.16", - "hardware": null, - "features": null, - "os": "hpe-pdumm", - "type": "power", - "serial": null, - "icon": "hpe.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/hpmsm.json b/tests/data/hpmsm.json index 862b825d09..5f7f76a872 100644 --- a/tests/data/hpmsm.json +++ b/tests/data/hpmsm.json @@ -36,24 +36,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8744.1.47", - "sysDescr": "MSM765 - Hardware revision 2 - Serial number FFFFFFFFFF - Firmware version 6.6.0.0-22530", - "sysContact": null, - "version": "6.6.0.0-22530", - "hardware": "MSM765", - "features": null, - "os": "hpmsm", - "type": "wireless", - "serial": "FFFFFFFFFF", - "icon": "hp.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/huawei-smu.json b/tests/data/huawei-smu.json index 3c90087df6..75405df66b 100644 --- a/tests/data/huawei-smu.json +++ b/tests/data/huawei-smu.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux GSE200M 2.6.27-SPEAr310 #5 Fri Mar 9 23:07:56 CST 2012 armv5tejl", - "sysContact": null, - "version": "V100R002C01B104SP04", - "hardware": null, - "features": null, - "os": "huawei-smu", - "type": "power", - "serial": null, - "icon": "huawei.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/huaweiups_ups2000.json b/tests/data/huaweiups_ups2000.json index 18e51a25a8..07c0260125 100644 --- a/tests/data/huaweiups_ups2000.json +++ b/tests/data/huaweiups_ups2000.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2011.6.174.4.1.2.4", - "sysDescr": "SNMP Card for HUAWEI UPS2000", - "sysContact": null, - "version": "V100R001C00SPC602", - "hardware": "UPS2000 6kVA", - "features": null, - "os": "huaweiups", - "type": "power", - "serial": null, - "icon": "huawei.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/hwg-poseidon.json b/tests/data/hwg-poseidon.json index 5255d1774a..810b34e336 100644 --- a/tests/data/hwg-poseidon.json +++ b/tests/data/hwg-poseidon.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.21796.3.3", - "sysDescr": "Poseidon 4002 SNMP Supervisor v2.0.15", - "sysContact": null, - "version": "2.0.15", - "hardware": "Poseidon 4002", - "features": null, - "os": "hwg-poseidon", - "type": "environment", - "serial": null, - "icon": "hwg-poseidon.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/ibm-i.json b/tests/data/ibm-i.json index 3a5194dd19..946ab66676 100644 --- a/tests/data/ibm-i.json +++ b/tests/data/ibm-i.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2.6.11", - "sysDescr": "IBM OS/400 V7R1M0", - "sysContact": null, - "version": "V7R1M0", - "hardware": null, - "features": null, - "os": "ibm-i", - "type": "server", - "serial": null, - "icon": "ibmos.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ibmc.json b/tests/data/ibmc.json index 5695c2b75a..b3d4f74c19 100644 --- a/tests/data/ibmc.json +++ b/tests/data/ibmc.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2011.2.235", - "sysDescr": "Hardware management system", - "sysContact": null, - "version": "2.55", - "hardware": "RH2288H V3", - "features": null, - "os": "ibmc", - "type": "appliance", - "serial": "SerialNumber", - "icon": "huawei.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/iboot_pdu8-2n15.json b/tests/data/iboot_pdu8-2n15.json index e8d5c50e74..605e552518 100644 --- a/tests/data/iboot_pdu8-2n15.json +++ b/tests/data/iboot_pdu8-2n15.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux ibootpdu 4.4.9 #6 SMP Thu Apr 27 15:48:52 EDT 2017 armv7l", - "sysContact": null, - "version": "1.03.12212017", - "hardware": "iBoot-PDU8-2N15", - "features": null, - "os": "iboot", - "type": "power", - "serial": null, - "icon": "generic.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ibos.json b/tests/data/ibos.json index 3bd58791a8..ce02d594ab 100644 --- a/tests/data/ibos.json +++ b/tests/data/ibos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9303.1.5.64", - "sysDescr": "MS4026-AC, iBOS Version ibos-ms4k-7.1.2-ED-R Copyright (c) 2001-2018 by Waystream AB Compiled Thu Aug 30 22:12:28 CST 2018 by builder", - "sysContact": null, - "version": "7.1.2-ED-R ", - "hardware": "MS4026-AC", - "features": null, - "os": "ibos", - "type": "network", - "serial": null, - "icon": "waystream.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/icotera.json b/tests/data/icotera.json index 8a31421f4b..c7bc3a3dc6 100644 --- a/tests/data/icotera.json +++ b/tests/data/icotera.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.29865.11", - "sysDescr": "ICOTERA i6405-51 2.5.0", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "icotera", - "type": "network", - "serial": null, - "icon": "icotera.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ict-mps.json b/tests/data/ict-mps.json index 489bcfdcc7..53a5776eec 100644 --- a/tests/data/ict-mps.json +++ b/tests/data/ict-mps.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "my_ict_ups", - "sysObjectID": ".1.3.6.1.4.1.39145.13", - "sysDescr": "ICT Modular Power System", - "sysContact": null, - "version": "1.04", - "hardware": "2", - "features": null, - "os": "ict-mps", - "type": "power", - "serial": null, - "icon": "ict.png", - "location": "my_ict_ups" - } - ] - }, - "poller": { "devices": [ { "sysName": "my_ict_ups", @@ -35,7 +17,8 @@ "location": "my_ict_ups" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/ict-pdu.json b/tests/data/ict-pdu.json index d3a496dfdf..9f265fd79b 100644 --- a/tests/data/ict-pdu.json +++ b/tests/data/ict-pdu.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.39145.10", - "sysDescr": "ICT Distribution Panel", - "sysContact": null, - "version": "2.08", - "hardware": "ICT180S-12BRCP", - "features": null, - "os": "ict-pdu", - "type": "power", - "serial": null, - "icon": "ict.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/ict-swi.json b/tests/data/ict-swi.json index 14e4cc12b0..27bbd5bfa4 100644 --- a/tests/data/ict-swi.json +++ b/tests/data/ict-swi.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "my_ict_inverter", - "sysObjectID": ".1.3.6.1.4.1.39145.12", - "sysDescr": "ICT Sine Wave Inverter", - "sysContact": null, - "version": "1.03", - "hardware": "1", - "features": null, - "os": "ict-swi", - "type": "power", - "serial": null, - "icon": "ict.png", - "location": "my_ict_inverter" - } - ] - }, - "poller": { "devices": [ { "sysName": "my_ict_inverter", @@ -35,7 +17,8 @@ "location": "my_ict_inverter" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/ies5000_5005.json b/tests/data/ies5000_5005.json index 723dfdf15e..fd0da89e62 100644 --- a/tests/data/ies5000_5005.json +++ b/tests/data/ies5000_5005.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.890.1.5.13.7", - "sysDescr": "IES-5005", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "ies5000", - "type": "network", - "serial": null, - "icon": "zyxel.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ies5000_5106.json b/tests/data/ies5000_5106.json index f8f858048a..9221399934 100644 --- a/tests/data/ies5000_5106.json +++ b/tests/data/ies5000_5106.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.890.1.5.13.10", - "sysDescr": "IES-5106", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "ies5000", - "type": "network", - "serial": "S110Z47000583", - "icon": "zyxel.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ies52xxM_4206.json b/tests/data/ies52xxM_4206.json index c646df5548..09131bbf70 100644 --- a/tests/data/ies52xxM_4206.json +++ b/tests/data/ies52xxM_4206.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.890.1.5.13.15", - "sysDescr": "MSC1240QA", - "sysContact": null, - "version": "V1.08(ABGX.0)", - "hardware": "IES5206 MSC", - "features": null, - "os": "ies52xxM", - "type": "network", - "serial": "S170Z34010399", - "icon": "zyxel.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ies52xxM_zynos-msc1240xa-ies5206.json b/tests/data/ies52xxM_zynos-msc1240xa-ies5206.json index 156dd097be..cf12c6033f 100644 --- a/tests/data/ies52xxM_zynos-msc1240xa-ies5206.json +++ b/tests/data/ies52xxM_zynos-msc1240xa-ies5206.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.890.1.5.13.13", - "sysDescr": "MSC1240XA", - "sysContact": null, - "version": "V1.10(AAWC.1)", - "hardware": "IES5206 MSC", - "features": null, - "os": "ies52xxM", - "type": "network", - "serial": "", - "icon": "zyxel.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ies52xxM_zynos-msc1240xa-ies5212.json b/tests/data/ies52xxM_zynos-msc1240xa-ies5212.json index 8de0e16fad..2dac9910c9 100644 --- a/tests/data/ies52xxM_zynos-msc1240xa-ies5212.json +++ b/tests/data/ies52xxM_zynos-msc1240xa-ies5212.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.890.1.5.13.16", - "sysDescr": "MSC1240XA", - "sysContact": null, - "version": "V1.10(AAWC.1)", - "hardware": "IES5206 MSC", - "features": null, - "os": "ies52xxM", - "type": "network", - "serial": "", - "icon": "zyxel.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ifotec.json b/tests/data/ifotec.json index 1de1b36e36..2b150a60bc 100644 --- a/tests/data/ifotec.json +++ b/tests/data/ifotec.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "n/a", - "sysObjectID": ".1.3.6.1.4.1.21362", - "sysDescr": "CPEFibre-G4G-PVN-001 : Commutateur Ethernet 4 ports 1000BASE-T / 1 port 1000BASE-X", - "sysContact": null, - "version": null, - "hardware": "CPEFibre-G4G-PVN-001", - "features": null, - "os": "ifotec", - "type": "network", - "serial": null, - "icon": "ifotec.png", - "location": "N/A" - } - ] - }, - "poller": { "devices": [ { "sysName": "n/a", @@ -35,7 +17,8 @@ "location": "N/A" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ifotec_inetpoe-4gp2gf.json b/tests/data/ifotec_inetpoe-4gp2gf.json index 777484bdc5..08a87279d3 100644 --- a/tests/data/ifotec_inetpoe-4gp2gf.json +++ b/tests/data/ifotec_inetpoe-4gp2gf.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.21362.100.1.4.3.4", - "sysDescr": "INETPOE-4GP2GF : Switch 2 ports 1000BASE-X / 4 ports 1000BASE-T PoE", - "sysContact": null, - "version": "1.0.5d (Bootloader x.x.x)", - "hardware": "INETPOE-4GP2GF", - "features": null, - "os": "ifotec", - "type": "network", - "serial": "0051", - "icon": "ifotec.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/illustra.json b/tests/data/illustra.json index 2869a38787..add6eaa74d 100644 --- a/tests/data/illustra.json +++ b/tests/data/illustra.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "illustra IFS03D1OCWIT Network camera 05-27-2019 Illustra.SS004.01.06.05.0026", - "sysContact": null, - "version": "SS004.01.06.05.0026", - "hardware": "IFS03D1OCWIT", - "features": null, - "os": "illustra", - "type": "network", - "serial": null, - "icon": "illustra.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/imcopower-big.json b/tests/data/imcopower-big.json index c892d8a8fc..da7f0ad88a 100644 --- a/tests/data/imcopower-big.json +++ b/tests/data/imcopower-big.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.818.32.4.43", - "sysDescr": "IMCO SNMP Agent 10.10", - "sysContact": null, - "version": "2.8", - "hardware": "XXX2.8", - "features": null, - "os": "imcopower-big", - "type": "power", - "serial": "201254517", - "icon": "imco.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/infinera-groove.json b/tests/data/infinera-groove.json index 60fd2940dc..f2b5d0f23d 100644 --- a/tests/data/infinera-groove.json +++ b/tests/data/infinera-groove.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.42229.1.2", - "sysDescr": "GSS-G3003000-BZ Groove G30 3.0.3 2018-07-10 Copyright 2018 Coriant", - "sysContact": null, - "version": "FP3.0.3", - "hardware": "GROOVE_G30", - "features": null, - "os": "infinera-groove", - "type": "network", - "serial": "magicserialnumber", - "icon": "infinera.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/infinera-pon.json b/tests/data/infinera-pon.json index a6714b334a..ccdafd627e 100644 --- a/tests/data/infinera-pon.json +++ b/tests/data/infinera-pon.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.42229", - "sysDescr": "7090 100 CEM", - "sysContact": null, - "version": "7090 4.0 01.00.00 Build 2.9.0_p12", - "hardware": null, - "features": null, - "os": "infinera-pon", - "type": "network", - "serial": null, - "icon": "infinera.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/infinity.json b/tests/data/infinity.json index 838a3eb4b2..7eb7841b94 100644 --- a/tests/data/infinity.json +++ b/tests/data/infinity.json @@ -36,24 +36,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.10002.1", - "sysDescr": "NFT 2N", - "sysContact": null, - "version": null, - "hardware": "NFT 2N", - "features": null, - "os": "infinity", - "type": "wireless", - "serial": null, - "icon": "ligowave.png", - "location": null - } - ] - } + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/innovaphone.json b/tests/data/innovaphone.json index d237934711..b9e9b1bdb9 100644 --- a/tests/data/innovaphone.json +++ b/tests/data/innovaphone.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6666", - "sysDescr": "13r1 sr8 IP3011[13.2195], Bootcode[132134], Hardware[401#]", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "innovaphone", - "type": "environment", - "serial": null, - "icon": "innovaphone.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/inteno_xg6846.json b/tests/data/inteno_xg6846.json index 12def2fffb..186c16f7e5 100644 --- a/tests/data/inteno_xg6846.json +++ b/tests/data/inteno_xg6846.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.4413", - "sysDescr": "XG6846_4.12ITT01.99", - "sysContact": null, - "version": "4.12ITT01.99", - "hardware": "XG6846", - "features": null, - "os": "inteno", - "type": "network", - "serial": "684624H197019306", - "icon": "inteno.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/interseptor.json b/tests/data/interseptor.json index b61a3f5a82..82de49ef69 100644 --- a/tests/data/interseptor.json +++ b/tests/data/interseptor.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.19011.1.3.1", - "sysDescr": "", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "interseptor", - "type": "environment", - "serial": null, - "icon": "jacarta.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ionodes.json b/tests/data/ionodes.json index c911868f00..a587f5605f 100644 --- a/tests/data/ionodes.json +++ b/tests/data/ionodes.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.40748.1.3", - "sysDescr": "SNMP Agent on IONODES's ATOMAS-MINI ver 0.0.0.0", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "ionodes", - "type": "encoder", - "serial": null, - "icon": "ionodes.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ionos.json b/tests/data/ionos.json index 325f205580..d7f1eba423 100644 --- a/tests/data/ionos.json +++ b/tests/data/ionos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1038.20", - "sysDescr": "SAGEM ADR2500 eXtra", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "ionos", - "type": "network", - "serial": null, - "icon": "sagemcom.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ios.json b/tests/data/ios.json index 9a9cdef7b3..86a42b1461 100644 --- a/tests/data/ios.json +++ b/tests/data/ios.json @@ -13475,24 +13475,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.359", - "sysDescr": "Cisco Internetwork Operating System Software\nIOS (tm) C2950 Software (C2950-I6K2L2Q4-M), Version 12.1(22)EA14, RELEASE SOFTWARE (fc1)\r\nTechnical Support: http://www.cisco.com/techsupport\r\nCopyright (c) 1986-2010 by cisco Systems, Inc.\r\nCompiled Tue 26-O", - "sysContact": null, - "version": "12.1(22)EA14", - "hardware": "catalyst2950t24", - "features": "I6K2L2Q4", - "os": "ios", - "type": "network", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -13509,7 +13491,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ospf": { "poller": { diff --git a/tests/data/ios_2960x.json b/tests/data/ios_2960x.json index 5bcaf5e2c9..e5319bd0bc 100644 --- a/tests/data/ios_2960x.json +++ b/tests/data/ios_2960x.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.1208", - "sysDescr": "Cisco IOS Software, C2960X Software (C2960X-UNIVERSALK9-M), Version 15.0(2a)EX5, RELEASE SOFTWARE (fc3)\nTechnical Support: http://www.cisco.com/techsupport\r\nCopyright (c) 1986-2015 by Cisco Systems, Inc.\r\nCompiled Mon 16-Feb-15 08:16 by prod_rel_team", - "sysContact": null, - "version": "15.0(2a)EX5", - "hardware": "WS-C2960X-48FPS-L", - "features": "UNIVERSALK9", - "os": "ios", - "type": "network", - "serial": "FCW1929B68S", - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ios_3560g.json b/tests/data/ios_3560g.json index 911a5f2fbe..eeb4943fc2 100644 --- a/tests/data/ios_3560g.json +++ b/tests/data/ios_3560g.json @@ -295,24 +295,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.615", - "sysDescr": "Cisco IOS Software, C3560 Software (C3560-IPSERVICESK9-M), Version 15.0(2)SE11, RELEASE SOFTWARE (fc3)\nTechnical Support: http://www.cisco.com/techsupport\r\nCopyright (c) 1986-2017 by Cisco Systems, Inc.\r\nCompiled Sat 19-Aug-17 09:21 by prod_rel_team", - "sysContact": null, - "version": "15.0(2)SE11", - "hardware": "WS-C3560G-24TS-S", - "features": "IPSERVICESK9", - "os": "ios", - "type": "network", - "serial": "FOC1426Y2AY", - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -329,6 +311,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/ios_6500.json b/tests/data/ios_6500.json index 31c92346fc..1f88e01e2b 100644 --- a/tests/data/ios_6500.json +++ b/tests/data/ios_6500.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.283", - "sysDescr": "Cisco IOS Software, s72033_rp Software (s72033_rp-IPSERVICESK9-M), Version 15.1(2)SY10, RELEASE SOFTWARE (fc4)\nTechnical Support: http://www.cisco.com/techsupport\r\nCopyright (c) 1986-2017 by Cisco Systems, Inc.\r\nCompiled Tue 21-Feb-17 02:00 by prod_rel_+", - "sysContact": null, - "version": "15.1(2)SY10", - "hardware": "cat6509", - "features": "IPSERVICESK9", - "os": "ios", - "type": "network", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ios_c2960s.json b/tests/data/ios_c2960s.json index df94c80d0b..d11a80f2ce 100644 --- a/tests/data/ios_c2960s.json +++ b/tests/data/ios_c2960s.json @@ -19,24 +19,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.1208", - "sysDescr": "Cisco IOS Software, C2960S Software (C2960S-UNIVERSALK9-M), Version 15.2(2a)E1, RELEASE SOFTWARE (fc1)\nTechnical Support: http://www.cisco.com/techsupport\r\nCopyright (c) 1986-2014 by Cisco Systems, Inc.\r\nCompiled Wed 10-Dec-14 03:54 by prod_rel_team", - "sysContact": null, - "version": "15.2(2a)E1", - "hardware": "cat29xxStack", - "features": "UNIVERSALK9", - "os": "ios", - "type": "network", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -53,6 +35,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/ios_c3560e.json b/tests/data/ios_c3560e.json index 660ca37d50..ab50a9fb9d 100644 --- a/tests/data/ios_c3560e.json +++ b/tests/data/ios_c3560e.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.1226", - "sysDescr": "Cisco IOS Software, C3560E Software (C3560E-UNIVERSALK9-M), Version 15.0(2)SE7, RELEASE SOFTWARE (fc1)\nTechnical Support: http://www.cisco.com/techsupport\r\nCopyright (c) 1986-2014 by Cisco Systems, Inc.\r\nCompiled Thu 23-Oct-14 13:27 by prod_rel_team", - "sysContact": null, - "version": "15.0(2)SE7", - "hardware": "cat3560x24", - "features": "UNIVERSALK9", - "os": "ios", - "type": "network", - "serial": null, - "icon": "cisco.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/ios_nac.json b/tests/data/ios_nac.json index 2775fe40cb..ac9b51f560 100644 --- a/tests/data/ios_nac.json +++ b/tests/data/ios_nac.json @@ -2670,24 +2670,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.1006", - "sysDescr": "Cisco IOS Software, C2960 Software (C2960-LANLITEK9-M), Version 15.0(2)SE8, RELEASE SOFTWARE (fc1)\nTechnical Support: http://www.cisco.com/techsupport\r\nCopyright (c) 1986-2015 by Cisco Systems, Inc.\r\nCompiled Thu 14-May-15 02:39 by prod_rel_team", - "sysContact": null, - "version": "15.0(2)SE8", - "hardware": "catalyst29608TCS", - "features": "LANLITEK9", - "os": "ios", - "type": "network", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -2704,6 +2686,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/iosxe.json b/tests/data/iosxe.json index aec927a1bd..fdf3abf8f7 100644 --- a/tests/data/iosxe.json +++ b/tests/data/iosxe.json @@ -383,24 +383,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.1116", - "sysDescr": "Cisco IOS Software, ASR1000 Software (PPC_LINUX_IOSD-ADVENTERPRISEK9-M), Version 15.5(3)S1a, RELEASE SOFTWARE (fc1)\nTechnical Support: http://www.cisco.com/techsupport\r\nCopyright (c) 1986-2015 by Cisco Systems, Inc.\r\nCompiled Wed 04-Nov-15 17:40 by mcpre", - "sysContact": null, - "version": "15.5(3)S1a", - "hardware": "ciscoASR1002F", - "features": "ADVENTERPRISEK9", - "os": "iosxe", - "type": "network", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -417,7 +399,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/iosxe_c3650.json b/tests/data/iosxe_c3650.json index beb810af3d..bfd4e07014 100644 --- a/tests/data/iosxe_c3650.json +++ b/tests/data/iosxe_c3650.json @@ -52,24 +52,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.2066", - "sysDescr": "Cisco IOS Software, IOS-XE Software, Catalyst L3 Switch Software (CAT3K_CAA-UNIVERSALK9-M), Version 03.07.05E RELEASE SOFTWARE (fc1)\nTechnical Support: http://www.cisco.com/techsupport\r\nCopyright (c) 1986-2017 by Cisco Systems, Inc.\r\nCompiled Fri 10-Feb-", - "sysContact": null, - "version": "03.07.05E", - "hardware": "cat36xxstack", - "features": "UNIVERSALK9", - "os": "iosxe", - "type": "network", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -86,7 +68,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/iosxe_c9300.json b/tests/data/iosxe_c9300.json index e45610a7ba..709e65987f 100644 --- a/tests/data/iosxe_c9300.json +++ b/tests/data/iosxe_c9300.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.2494", - "sysDescr": "Cisco IOS Software [Everest], Catalyst L3 Switch Software (CAT9K_IOSXE), Version 16.6.7, RELEASE SOFTWARE (fc2)", - "sysContact": null, - "version": "CAT9K_IOSXE 16.6.7", - "hardware": "C9300-48P", - "features": "Everest", - "os": "iosxe", - "type": "network", - "serial": "FCW2204L050", - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/iosxe_c9400.json b/tests/data/iosxe_c9400.json index 3a091ea48a..155ab2f2af 100644 --- a/tests/data/iosxe_c9400.json +++ b/tests/data/iosxe_c9400.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.1116", - "sysDescr": "Cisco IOS Software, ASR1000 Software (PPC_LINUX_IOSD-ADVENTERPRISEK9-M), Version 15.5(3)S1a, RELEASE SOFTWARE (fc1)\nTechnical Support: http://www.cisco.com/techsupport\r\nCopyright (c) 1986-2015 by Cisco Systems, Inc.\r\nCompiled Wed 04-Nov-15 17:40 by mcpre", - "sysContact": null, - "version": "15.5(3)S1a", - "hardware": "C9404R", - "features": "ADVENTERPRISEK9", - "os": "iosxe", - "type": "network", - "serial": "FXS1111A11A", - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/iosxr.json b/tests/data/iosxr.json index e8a028f3e6..1c203bde00 100644 --- a/tests/data/iosxr.json +++ b/tests/data/iosxr.json @@ -28764,24 +28764,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.1018", - "sysDescr": "Cisco IOS XR Software (Cisco ASR9K Series), Version 5.3.4[Default]\nCopyright (c) 2017 by Cisco Systems, Inc.", - "sysContact": null, - "version": "5.3.4", - "hardware": "ASR9K Series", - "features": "Default", - "os": "iosxr", - "type": "network", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -28798,7 +28780,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ospf": { "poller": { diff --git a/tests/data/iosxr_asr9010.json b/tests/data/iosxr_asr9010.json index da20eb6a12..f0c2e8e3f7 100644 --- a/tests/data/iosxr_asr9010.json +++ b/tests/data/iosxr_asr9010.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.1017", - "sysDescr": "Cisco IOS XR Software (Cisco ASR9K Series), Version 6.4.2[Default]\nCopyright (c) 2018 by Cisco Systems, Inc.", - "sysContact": null, - "version": "6.4.2", - "hardware": "ASR9K Series", - "features": "Default", - "os": "iosxr", - "type": "network", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/iosxr_ncs5504.json b/tests/data/iosxr_ncs5504.json index 66c2a78a2e..3794512eed 100644 --- a/tests/data/iosxr_ncs5504.json +++ b/tests/data/iosxr_ncs5504.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.2413", - "sysDescr": "Cisco IOS XR Software (NCS-5500), Version 6.6.3 Copyright (c) 2013-2019 by Cisco Systems, Inc.", - "sysContact": null, - "version": "6.6.3", - "hardware": "NCS-5504", - "features": null, - "os": "iosxr", - "type": "network", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/iosxr_ncs5508.json b/tests/data/iosxr_ncs5508.json index db0f4e7dc3..80889adfc5 100644 --- a/tests/data/iosxr_ncs5508.json +++ b/tests/data/iosxr_ncs5508.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.2349", - "sysDescr": "Cisco IOS XR Software (NCS-5500), Version 7.0.1 Copyright (c) 2013-2019 by Cisco Systems, Inc.", - "sysContact": null, - "version": "7.0.1", - "hardware": "NCS-5508", - "features": null, - "os": "iosxr", - "type": "network", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/ipoman.json b/tests/data/ipoman.json index 2d690a7ede..6af6a2a044 100644 --- a/tests/data/ipoman.json +++ b/tests/data/ipoman.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2468.1.4.2.1", - "sysDescr": "", - "sysContact": null, - "version": "1.05", - "hardware": null, - "features": null, - "os": "ipoman", - "type": "power", - "serial": "1113016920004", - "icon": "ingrasys.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ird.json b/tests/data/ird.json index 17fbb6f7a7..b018f4d179 100644 --- a/tests/data/ird.json +++ b/tests/data/ird.json @@ -585,24 +585,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2021.250.10", - "sysDescr": "Linux DCH-4000P 2.4.20-uc0 #386 2013... 10... 24... ......... 14:08:33 CST armv3l", - "sysContact": null, - "version": "2.4.20-uc0", - "hardware": "Generic ARM", - "features": null, - "os": "ird", - "type": "network", - "serial": null, - "icon": "pbi.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -619,6 +601,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/ironware.json b/tests/data/ironware.json index 443d150c37..92d6047e2c 100644 --- a/tests/data/ironware.json +++ b/tests/data/ironware.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1991.1.3.51.7", - "sysDescr": "Extreme Networks NetIron CER, Extended route scalability, IronWare Version V6.2.0eT183 Compiled on Sep 30 2019 at 06:59:54 labeled as V6.2.00e", - "sysContact": null, - "version": "6.2.0eT183", - "hardware": "NetIron CER 2024F4X", - "features": null, - "os": "ironware", - "type": "network", - "serial": "CKM1234L567", - "icon": "brocade.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/istars.json b/tests/data/istars.json index d2ae4a6e8d..c5efe401be 100644 --- a/tests/data/istars.json +++ b/tests/data/istars.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.40614", - "sysDescr": "iStars_SWV4.25", - "sysContact": null, - "version": "iStars_SWV4.25 R1.1.1", - "hardware": null, - "features": null, - "os": "istars", - "type": "power", - "serial": null, - "icon": "istars.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/jetdirect.json b/tests/data/jetdirect.json index 66285a8ace..001d3fcdf1 100644 --- a/tests/data/jetdirect.json +++ b/tests/data/jetdirect.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.11.2.3.9.1", - "sysDescr": "HP ETHERNET MULTI-ENVIRONMENT,SN:AAA0A00000,FN:1G11F33,SVCID:26267,PID:Purchasing Color Laser", - "sysContact": null, - "version": null, - "hardware": "Color LaserJet M452nw", - "features": null, - "os": "jetdirect", - "type": "printer", - "serial": null, - "icon": "hp.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "toner": { "discovery": { diff --git a/tests/data/jetdirect_m252dw.json b/tests/data/jetdirect_m252dw.json index cd9ad7d9cc..6ef175d75d 100644 --- a/tests/data/jetdirect_m252dw.json +++ b/tests/data/jetdirect_m252dw.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.11.2.3.9.1", - "sysDescr": "HP ETHERNET MULTI-ENVIRONMENT,SN:VNB3J99999,FN:1F31B6C,SVCID:99999,PID:HP Color LaserJet Pro M252dw", - "sysContact": null, - "version": null, - "hardware": "Color LaserJet Pro M252dw", - "features": null, - "os": "jetdirect", - "type": "printer", - "serial": null, - "icon": "hp.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/jetdirect_m880.json b/tests/data/jetdirect_m880.json index 6111949058..aa94431983 100644 --- a/tests/data/jetdirect_m880.json +++ b/tests/data/jetdirect_m880.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.11.2.3.9.1", - "sysDescr": "HP ETHERNET MULTI-ENVIRONMENT,ROM none,JETDIRECT,JD149,EEPROM JDI99999999,CIDATE 05/28/2018", - "sysContact": null, - "version": null, - "hardware": "Color LaserJet flow MFP M880", - "features": null, - "os": "jetdirect", - "type": "printer", - "serial": null, - "icon": "hp.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/jetstream.json b/tests/data/jetstream.json index 5d6c4cb265..6974c67132 100644 --- a/tests/data/jetstream.json +++ b/tests/data/jetstream.json @@ -19,24 +19,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.11863.5.34", - "sysDescr": "JetStream 48-Port Gigabit L2 Managed Switch with 4 SFP Slots", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "jetstream", - "type": "network", - "serial": null, - "icon": "tplink.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -53,7 +35,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/jetstream_t1600g-18ts.json b/tests/data/jetstream_t1600g-18ts.json index 65ba82f82f..2f06e05383 100644 --- a/tests/data/jetstream_t1600g-18ts.json +++ b/tests/data/jetstream_t1600g-18ts.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.11863.5.86", - "sysDescr": "JetStream 16-Port Gigabit Smart Switch with 2 SFP Slots", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "jetstream", - "type": "network", - "serial": null, - "icon": "tplink.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/jetstream_vlans.json b/tests/data/jetstream_vlans.json index 75ad6a0b05..212cd49724 100644 --- a/tests/data/jetstream_vlans.json +++ b/tests/data/jetstream_vlans.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.11863.5.72", - "sysDescr": "JetStream 16-Port Gigabit L2 Managed Switch with 2 SFP Slots", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "jetstream", - "type": "network", - "serial": null, - "icon": "tplink.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/juniper-mss.json b/tests/data/juniper-mss.json index 7aacd2dda2..d637ad7b61 100644 --- a/tests/data/juniper-mss.json +++ b/tests/data/juniper-mss.json @@ -36,24 +36,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.14525.3.3.1", - "sysDescr": "Juniper Networks, Inc WLC880R 7.7.4.4 REL", - "sysContact": null, - "version": "7.7.4.4", - "hardware": "WLC880R", - "features": null, - "os": "juniper-mss", - "type": "appliance", - "serial": null, - "icon": "junos.png", - "location": null - } - ] - } + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/junos.json b/tests/data/junos.json index 12b88fe83f..9f44949933 100644 --- a/tests/data/junos.json +++ b/tests/data/junos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2636.1.1.1.2.41", - "sysDescr": "Juniper Networks, Inc. srx100h2 internet router, kernel JUNOS 12.3X48-D35.7, Build date: 2016-08-05 04:10:06 UTC Copyright (c) 1996-2016 Juniper Networks, Inc.", - "sysContact": null, - "version": "12.3R11.2", - "hardware": "Juniper SRX100H2", - "features": null, - "os": "junos", - "type": "network", - "serial": null, - "icon": "junos.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/junos_ex.json b/tests/data/junos_ex.json index aec6e48279..d2a3e9f00e 100644 --- a/tests/data/junos_ex.json +++ b/tests/data/junos_ex.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2636.1.1.1.4.131.2", - "sysDescr": "Juniper Networks, Inc. ex3400-48t Ethernet Switch, kernel JUNOS 15.1X53-D59.4, Build date: 2018-09-14 21:00:55 UTC Copyright (c) 1996-2018 Juniper Networks, Inc.", - "sysContact": null, - "version": "15.1X53-D59.4", - "hardware": "Juniper EX3400-48T", - "features": null, - "os": "junos", - "type": "network", - "serial": null, - "icon": "junos.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "bgp-peers": { "discovery": { diff --git a/tests/data/junos_ex4600mp.json b/tests/data/junos_ex4600mp.json index 13cf1195b2..55ce2c78fa 100644 --- a/tests/data/junos_ex4600mp.json +++ b/tests/data/junos_ex4600mp.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2636.1.1.1.4.63.9", - "sysDescr": "hostname.example.org", - "sysContact": null, - "version": "18.4R4", - "hardware": "Juniper Virtual Chassis Switch", - "features": null, - "os": "junos", - "type": "network", - "serial": "XR0123456789", - "icon": "junos.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/junos_mx.json b/tests/data/junos_mx.json index b731ba0661..261ce97f39 100644 --- a/tests/data/junos_mx.json +++ b/tests/data/junos_mx.json @@ -579,24 +579,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2636.1.1.1.2.57", - "sysDescr": "Juniper Networks, Inc. mx80 internet router, kernel JUNOS 16.2R2.8, Build date: 2017-07-06 04:21:20 UTC Copyright (c) 1996-2017 Juniper Networks, Inc.", - "sysContact": null, - "version": "16.2R2.8", - "hardware": "Juniper MX80", - "features": null, - "os": "junos", - "type": "network", - "serial": "G0290", - "icon": "junos.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -613,6 +595,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/junos_qfx5100.json b/tests/data/junos_qfx5100.json index 7d871b18b1..9c18f5cd26 100644 --- a/tests/data/junos_qfx5100.json +++ b/tests/data/junos_qfx5100.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2636.1.1.1.4.82.5", - "sysDescr": "Juniper Networks, Inc. qfx5100-48s-6q Ethernet Switch, kernel JUNOS 14.1X53-D40.8, Build date: 2016-11-09 02:23:05 UTC Copyright (c) 1996-2016 Juniper Networks, Inc.", - "sysContact": null, - "version": "14.1X53-D40.8", - "hardware": "Juniper QFX5100-48S-6Q Switch", - "features": null, - "os": "junos", - "type": "network", - "serial": "TA3716123456", - "icon": "junos.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/junos_rpm.json b/tests/data/junos_rpm.json index 11636519b6..d54d1b541e 100644 --- a/tests/data/junos_rpm.json +++ b/tests/data/junos_rpm.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2636.1.1.1.2.39", - "sysDescr": "Juniper SRX240B gsm-fw", - "sysContact": null, - "version": "12.1X46-D86", - "hardware": "Juniper SRX240H Internet Router", - "features": null, - "os": "junos", - "type": "network", - "serial": "AG3213AK0210", - "icon": "junos.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/junos_srx340.json b/tests/data/junos_srx340.json index e330f9d9e4..7f8c4bc1b7 100644 --- a/tests/data/junos_srx340.json +++ b/tests/data/junos_srx340.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2636.1.1.1.2.135", - "sysDescr": "Juniper Networks, Inc. srx340 internet router, kernel JUNOS 15.1X49-D120.3, Build date: 2017-11-04 21:55:34 UTC Copyright (c) 1996-2017 Juniper Networks, Inc.", - "sysContact": null, - "version": "15.1X49-D120.3", - "hardware": "Juniper SRX340", - "features": null, - "os": "junos", - "type": "network", - "serial": "", - "icon": "junos.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/junos_srx3600.json b/tests/data/junos_srx3600.json index e7f0e9c407..1fc755bead 100644 --- a/tests/data/junos_srx3600.json +++ b/tests/data/junos_srx3600.json @@ -9591,24 +9591,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2636.1.1.1.2.34", - "sysDescr": "Juniper Networks, Inc. srx3600 internet router, kernel JUNOS 12.1X46-D35.1 #0: 2015-05-14 23:47:27 UTC builder@dagmath.juniper.net:/volume/build/junos/12.1/service/12.1X46-D35.1/obj-powerpc/junos/bsd/kernels/JUNIPER-SRX/kernel Build date: 2015-05-15", - "sysContact": null, - "version": "12.1X46-D35.1", - "hardware": "Juniper SRX3600", - "features": null, - "os": "junos", - "type": "network", - "serial": null, - "icon": "junos.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -9625,7 +9607,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/junose.json b/tests/data/junose.json index 052bb3f348..8327ba8edd 100644 --- a/tests/data/junose.json +++ b/tests/data/junose.json @@ -16,5 +16,43 @@ ] }, "poller": "matches discovery" + }, + "os": { + "discovery": { + "devices": [ + { + "sysName": "", + "sysObjectID": ".1.3.6.1.4.1.4874", + "sysDescr": null, + "sysContact": null, + "version": null, + "hardware": null, + "features": null, + "os": "junose", + "type": "network", + "serial": null, + "icon": "junos.png", + "location": null + } + ] + }, + "poller": { + "devices": [ + { + "sysName": "", + "sysObjectID": ".1.3.6.1.4.1.4874", + "sysDescr": null, + "sysContact": null, + "version": null, + "hardware": "Juniper juniperUni", + "features": null, + "os": "junose", + "type": "network", + "serial": null, + "icon": "junos.png", + "location": null + } + ] + } } } diff --git a/tests/data/konica.json b/tests/data/konica.json index 472d532c0f..d8a2049f12 100644 --- a/tests/data/konica.json +++ b/tests/data/konica.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.18334.1.1.1.2.1.117.2.2", - "sysDescr": "KONICA MINOLTA bizhub C3110", - "sysContact": null, - "version": "1.80", - "hardware": "Develop ineo+ 280", - "features": null, - "os": "konica", - "type": "printer", - "serial": null, - "icon": "konica.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/konica_2.json b/tests/data/konica_2.json index d0cd974969..d12f554493 100644 --- a/tests/data/konica_2.json +++ b/tests/data/konica_2.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.18334.1.1.1.2.1.10008.1.1", - "sysDescr": "Konica Minolta bizhub 25e", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "konica", - "type": "printer", - "serial": null, - "icon": "konica.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/lcos_oap-321.json b/tests/data/lcos_oap-321.json index 4d878bbc45..c11648b07d 100644 --- a/tests/data/lcos_oap-321.json +++ b/tests/data/lcos_oap-321.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2356.11.8.301", - "sysDescr": "LANCOM OAP-321 10.12.0147 / 15.11.2017 4002024918100043", - "sysContact": null, - "version": "10.12.0147SU3 / 15.11.2017", - "hardware": "LANCOM OAP-321", - "features": null, - "os": "lcos", - "type": "wireless", - "serial": "4002024918100043", - "icon": "lancom.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/liebert.json b/tests/data/liebert.json index 8896e017b1..34956e18b6 100644 --- a/tests/data/liebert.json +++ b/tests/data/liebert.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.476.1.42", - "sysDescr": "Liebert GXT2-3000RT120", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "liebert", - "type": "power", - "serial": null, - "icon": "vertiv.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/linksys-ss_lgs318p.json b/tests/data/linksys-ss_lgs318p.json index e94846f2ce..483083296d 100644 --- a/tests/data/linksys-ss_lgs318p.json +++ b/tests/data/linksys-ss_lgs318p.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.3955.1000.3.18.2", - "sysDescr": "LGS318P 18-Port Gigabit PoE+ Smart Switch", - "sysContact": null, - "version": "SW: 1.1.1.9, FW: 1.0.0.5", - "hardware": "LGS318P V02", - "features": null, - "os": "linksys-ss", - "type": "network", - "serial": "14A10C95808734", - "icon": "linksys.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/linux.json b/tests/data/linux.json index 715b3db482..378f21b03f 100644 --- a/tests/data/linux.json +++ b/tests/data/linux.json @@ -113,23 +113,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux some.host.name 4.9.0 #1 SMP Mon Dec 12 14:44:53 CST 2016 x86_64", - "sysContact": null, - "version": "4.9.0", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/linux_asterisk-v1.json b/tests/data/linux_asterisk-v1.json index 6833392c37..3341af135d 100644 --- a/tests/data/linux_asterisk-v1.json +++ b/tests/data/linux_asterisk-v1.json @@ -96,24 +96,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux joseph.tingiris 3.10.0-693.17.1.el7.x86_64 #1 SMP Thu Jan 25 20:13:58 UTC 2018 x86_64", - "sysContact": null, - "version": "3.10.0-693.17.1.el7.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -130,6 +112,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/linux_fail2ban-legacy.json b/tests/data/linux_fail2ban-legacy.json index 2fed122acf..a503aae8e5 100644 --- a/tests/data/linux_fail2ban-legacy.json +++ b/tests/data/linux_fail2ban-legacy.json @@ -48,24 +48,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux server 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 20 20:32:50 UTC 2017 x86_64", - "sysContact": null, - "version": "3.10.0-693.5.2.el7.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -82,6 +64,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/linux_fail2ban-v1.json b/tests/data/linux_fail2ban-v1.json index d824fe24f7..be36145e46 100644 --- a/tests/data/linux_fail2ban-v1.json +++ b/tests/data/linux_fail2ban-v1.json @@ -48,24 +48,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux server 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 20 20:32:50 UTC 2017 x86_64", - "sysContact": null, - "version": "3.10.0-693.5.2.el7.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -82,6 +64,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/linux_fbsd-nfs-client-legacy.json b/tests/data/linux_fbsd-nfs-client-legacy.json index e51739691f..be1061e5f1 100644 --- a/tests/data/linux_fbsd-nfs-client-legacy.json +++ b/tests/data/linux_fbsd-nfs-client-legacy.json @@ -282,24 +282,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux server 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 20 20:32:50 UTC 2017 x86_64", - "sysContact": null, - "version": "3.10.0-693.5.2.el7.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -316,6 +298,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/linux_fbsd-nfs-client-v1.json b/tests/data/linux_fbsd-nfs-client-v1.json index 92767c0e81..572d94395d 100644 --- a/tests/data/linux_fbsd-nfs-client-v1.json +++ b/tests/data/linux_fbsd-nfs-client-v1.json @@ -282,24 +282,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux server 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 20 20:32:50 UTC 2017 x86_64", - "sysContact": null, - "version": "3.10.0-693.5.2.el7.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -316,6 +298,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/linux_fbsd-nfs-server-legacy.json b/tests/data/linux_fbsd-nfs-server-legacy.json index 99068e28a2..029a0e3ae8 100644 --- a/tests/data/linux_fbsd-nfs-server-legacy.json +++ b/tests/data/linux_fbsd-nfs-server-legacy.json @@ -210,24 +210,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux server 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 20 20:32:50 UTC 2017 x86_64", - "sysContact": null, - "version": "3.10.0-693.5.2.el7.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -244,6 +226,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/linux_fbsd-nfs-server-v1.json b/tests/data/linux_fbsd-nfs-server-v1.json index 99068e28a2..029a0e3ae8 100644 --- a/tests/data/linux_fbsd-nfs-server-v1.json +++ b/tests/data/linux_fbsd-nfs-server-v1.json @@ -210,24 +210,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux server 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 20 20:32:50 UTC 2017 x86_64", - "sysContact": null, - "version": "3.10.0-693.5.2.el7.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -244,6 +226,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/linux_freeradius.json b/tests/data/linux_freeradius.json index 08ec1a6f3d..a163b6de63 100644 --- a/tests/data/linux_freeradius.json +++ b/tests/data/linux_freeradius.json @@ -276,24 +276,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux SERVERNAME 3.10.0-514.6.1.el7.x86_64 #1 SMP Sat Dec 10 11:15:38 EST 2016 x86_64", - "sysContact": null, - "version": "3.10.0-514.6.1.el7.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -310,6 +292,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/linux_icecast.json b/tests/data/linux_icecast.json index a8e8f8440f..8509c0c779 100644 --- a/tests/data/linux_icecast.json +++ b/tests/data/linux_icecast.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux mp2-nyc1.telecurve.net 4.18.0-147.8.1.el8_1.x86_64 #1 SMP Thu Apr 9 13:49:54 UTC 2020 x86_64", - "sysContact": null, - "version": "4.18.0-147.8.1.el8_1.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/linux_mailcow-dockerized-v1.json b/tests/data/linux_mailcow-dockerized-v1.json index 63bf1c15ff..ebbab4c108 100644 --- a/tests/data/linux_mailcow-dockerized-v1.json +++ b/tests/data/linux_mailcow-dockerized-v1.json @@ -120,24 +120,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux mbx01 4.15.0-88-generic #88-Ubuntu SMP Tue Feb 11 20:11:34 UTC 2020 x86_64", - "sysContact": null, - "version": "4.15.0-88-generic", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -154,6 +136,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/linux_ntc.json b/tests/data/linux_ntc.json index 10c5d7b447..1a07c190a8 100644 --- a/tests/data/linux_ntc.json +++ b/tests/data/linux_ntc.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux web01.1.novalocal 3.10.0-693.21.1.el7.x86_64 #1 SMP Wed Mar 7 19:03:37 UTC 2018 x86_64", - "sysContact": null, - "version": "3.10.0-693.21.1.el7.x86_64", - "hardware": "Generic x86 64-bit", - "features": "CentOS 7.4.1708", - "os": "linux", - "type": "server", - "serial": null, - "icon": "centos.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/linux_ntp-client-legacy.json b/tests/data/linux_ntp-client-legacy.json index 24222f5978..b196769575 100644 --- a/tests/data/linux_ntp-client-legacy.json +++ b/tests/data/linux_ntp-client-legacy.json @@ -60,24 +60,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux server 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 20 20:32:50 UTC 2017 x86_64", - "sysContact": null, - "version": "3.10.0-693.5.2.el7.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -94,6 +76,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/linux_ntp-client-v1.json b/tests/data/linux_ntp-client-v1.json index 24222f5978..b196769575 100644 --- a/tests/data/linux_ntp-client-v1.json +++ b/tests/data/linux_ntp-client-v1.json @@ -60,24 +60,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux server 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 20 20:32:50 UTC 2017 x86_64", - "sysContact": null, - "version": "3.10.0-693.5.2.el7.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -94,6 +76,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/linux_opensips.json b/tests/data/linux_opensips.json index d32dde7a52..959f393166 100644 --- a/tests/data/linux_opensips.json +++ b/tests/data/linux_opensips.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux ip-10-0-0-60.ec2.internal 3.10.0-1062.12.1.el7.x86_64 #1 SMP Tue Feb 4 23:02:59 UTC 2020 x86_64", - "sysContact": null, - "version": "3.10.0-1062.12.1.el7.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/linux_portactivity-v1.json b/tests/data/linux_portactivity-v1.json index 185f393b3c..5dad12f3df 100644 --- a/tests/data/linux_portactivity-v1.json +++ b/tests/data/linux_portactivity-v1.json @@ -282,24 +282,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux server 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 20 20:32:50 UTC 2017 x86_64", - "sysContact": null, - "version": "3.10.0-693.5.2.el7.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -316,6 +298,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/linux_powerdns-legacy.json b/tests/data/linux_powerdns-legacy.json index ba0d6df072..ddaa46fbee 100644 --- a/tests/data/linux_powerdns-legacy.json +++ b/tests/data/linux_powerdns-legacy.json @@ -162,24 +162,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux server 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 20 20:32:50 UTC 2017 x86_64", - "sysContact": null, - "version": "3.10.0-693.5.2.el7.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -196,6 +178,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/linux_powerdns-v1.json b/tests/data/linux_powerdns-v1.json index 2ed724c5bd..6e27c6598a 100644 --- a/tests/data/linux_powerdns-v1.json +++ b/tests/data/linux_powerdns-v1.json @@ -162,24 +162,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux server 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 20 20:32:50 UTC 2017 x86_64", - "sysContact": null, - "version": "3.10.0-693.5.2.el7.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -196,6 +178,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/linux_raspberrypi.json b/tests/data/linux_raspberrypi.json index 0bee4e5d05..a00176516f 100644 --- a/tests/data/linux_raspberrypi.json +++ b/tests/data/linux_raspberrypi.json @@ -664,5 +664,26 @@ } ] } + }, + "os": { + "discovery": { + "devices": [ + { + "sysName": "", + "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", + "sysDescr": "Linux mso 4.19.97+ #1294 Thu Jan 30 13:10:54 GMT 2020 armv6l", + "sysContact": "", + "version": "4.19.97+", + "hardware": "Generic ARMv6", + "features": null, + "os": "linux", + "type": "server", + "serial": null, + "icon": "linux.svg", + "location": "" + } + ] + }, + "poller": "matches discovery" } } diff --git a/tests/data/linux_seafile-v1.json b/tests/data/linux_seafile-v1.json index fb147c9d08..df25d875a6 100644 --- a/tests/data/linux_seafile-v1.json +++ b/tests/data/linux_seafile-v1.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux SERVERNAME 4.19.0-6-amd64 #1 SMP Debian 4.19.67-2 (2019-08-28) x86_64", - "sysContact": null, - "version": "4.19.0-6-amd64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "applications": { "discovery": { diff --git a/tests/data/linux_ups-apcups-legacy.json b/tests/data/linux_ups-apcups-legacy.json index d92bd95873..b4d65ba540 100644 --- a/tests/data/linux_ups-apcups-legacy.json +++ b/tests/data/linux_ups-apcups-legacy.json @@ -72,24 +72,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux server 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 20 20:32:50 UTC 2017 x86_64", - "sysContact": null, - "version": "3.10.0-693.5.2.el7.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -106,6 +88,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/linux_ups-apcups-v1.json b/tests/data/linux_ups-apcups-v1.json index d92bd95873..b4d65ba540 100644 --- a/tests/data/linux_ups-apcups-v1.json +++ b/tests/data/linux_ups-apcups-v1.json @@ -72,24 +72,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux server 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 20 20:32:50 UTC 2017 x86_64", - "sysContact": null, - "version": "3.10.0-693.5.2.el7.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -106,6 +88,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/linux_ups-nut.json b/tests/data/linux_ups-nut.json index cb4208e035..52bd8f406a 100644 --- a/tests/data/linux_ups-nut.json +++ b/tests/data/linux_ups-nut.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux some.host.name 4.9.0 #1 SMP Mon Dec 12 14:44:53 CST 2016 x86_64", - "sysContact": null, - "version": "4.9.0", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/linux_zfs-legacy.json b/tests/data/linux_zfs-legacy.json index e1cd02c6b9..6e97d1e16f 100644 --- a/tests/data/linux_zfs-legacy.json +++ b/tests/data/linux_zfs-legacy.json @@ -390,24 +390,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux server 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 20 20:32:50 UTC 2017 x86_64", - "sysContact": null, - "version": "3.10.0-693.5.2.el7.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -424,6 +406,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/linux_zfs-v1.json b/tests/data/linux_zfs-v1.json index e1cd02c6b9..6e97d1e16f 100644 --- a/tests/data/linux_zfs-v1.json +++ b/tests/data/linux_zfs-v1.json @@ -390,24 +390,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux server 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 20 20:32:50 UTC 2017 x86_64", - "sysContact": null, - "version": "3.10.0-693.5.2.el7.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "linux", - "type": "server", - "serial": null, - "icon": "linux.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -424,6 +406,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/luminato.json b/tests/data/luminato.json index 7be53397f5..f12bce46b9 100644 --- a/tests/data/luminato.json +++ b/tests/data/luminato.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "luminato", - "sysObjectID": ".1.3.6.1.4.1.3715.17", - "sysDescr": "Teleste Luminato 8.2.6", - "sysContact": null, - "version": "8.2.6", - "hardware": "Luminato", - "features": null, - "os": "luminato", - "type": "network", - "serial": "HK01421528", - "icon": "teleste.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "luminato", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/marathonups.json b/tests/data/marathonups.json index ffa30cea96..fa11c8ae0c 100644 --- a/tests/data/marathonups.json +++ b/tests/data/marathonups.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2021.1.1.1", - "sysDescr": "Linux dnpower 2.\n34 2E 33 32 20 23 31 31 39 20 E4 BA 8C 20 35 E6 \n9C 88 20 32 30 20 31 31 3A 31 33 3A 33 36 20 43 \n53 54 20 32 30 31 34 20 6D 69 70 73", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "marathonups", - "type": "power", - "serial": null, - "icon": "marathonups.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/mbg-ltos6.json b/tests/data/mbg-ltos6.json index 6c099c42df..73e4cb6460 100644 --- a/tests/data/mbg-ltos6.json +++ b/tests/data/mbg-ltos6.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.5597.3", - "sysDescr": "Meinberg LANTIME V6.20.014", - "sysContact": null, - "version": "7.00.014", - "hardware": null, - "features": null, - "os": "mbg-ltos6", - "type": "timing", - "serial": "", - "icon": "meinberg.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/mcafeewebgateway.json b/tests/data/mcafeewebgateway.json index 1015b66768..1247e680e9 100644 --- a/tests/data/mcafeewebgateway.json +++ b/tests/data/mcafeewebgateway.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1230.2.7.1.1", - "sysDescr": "McAfee Web Gateway 7;VMWare;VMware, Inc.", - "sysContact": null, - "version": "9.2.4", - "hardware": null, - "features": null, - "os": "mcafeewebgateway", - "type": "firewall", - "serial": null, - "icon": "mcafeewebgateway.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/merakims.json b/tests/data/merakims.json index d2a367f121..a227ca31a9 100644 --- a/tests/data/merakims.json +++ b/tests/data/merakims.json @@ -18,23 +18,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": null, - "sysDescr": "Meraki MS", - "sysContact": null, - "version": null, - "hardware": "Meraki MS", - "features": null, - "os": "merakims", - "type": "network", - "serial": "9999999999", - "icon": "meraki.png", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/microsemipdsine.json b/tests/data/microsemipdsine.json index 0629687257..edbd44be51 100644 --- a/tests/data/microsemipdsine.json +++ b/tests/data/microsemipdsine.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.7428.1.1.1.23", - "sysDescr": "Midspan. Unit S/N=000076. App Ver=4.17.05.07, Sep 12 2011, 11:19:52. BOOT Ver=1.07, Jul 8 2009, 15:34:57", - "sysContact": null, - "version": "4.17.05.07", - "hardware": "Midspan", - "features": null, - "os": "microsemipdsine", - "type": "network", - "serial": "000076", - "icon": "microsemi.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/mimosa.json b/tests/data/mimosa.json index 4e769f9caa..94850c61f4 100644 --- a/tests/data/mimosa.json +++ b/tests/data/mimosa.json @@ -225,24 +225,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.43356.1.1.1", - "sysDescr": "Mimosa B5c Firmware v92329ce", - "sysContact": null, - "version": "2.3.3", - "hardware": "mimosaB5", - "features": null, - "os": "mimosa", - "type": "wireless", - "serial": "2119632000", - "icon": "mimosa.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -259,7 +241,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/mimosa_b5.json b/tests/data/mimosa_b5.json index cc9572b143..4318632948 100644 --- a/tests/data/mimosa_b5.json +++ b/tests/data/mimosa_b5.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.43356.1.1.1", - "sysDescr": "Mimosa B5c Firmware v92329ce", - "sysContact": null, - "version": "2.3.3", - "hardware": "mimosaB5", - "features": null, - "os": "mimosa", - "type": "wireless", - "serial": "0000000000", - "icon": "mimosa.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/mobileiron_core.json b/tests/data/mobileiron_core.json index a556213fc8..cf5b21c7f6 100644 --- a/tests/data/mobileiron_core.json +++ b/tests/data/mobileiron_core.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux misentry-001-ha-a.example.org 2.6.32-754.24.3.el6.x86_64 #1 SMP Thu Nov 14 15:35:16 UTC 2019 x86_64", - "sysContact": null, - "version": "2.6.32-754.24.3.el6.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "mobileiron", - "type": "appliance", - "serial": null, - "icon": "mobileiron.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/mobileiron_sentry.json b/tests/data/mobileiron_sentry.json index 82ea27f5cb..c087b74fca 100644 --- a/tests/data/mobileiron_sentry.json +++ b/tests/data/mobileiron_sentry.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux misentry-001-ha-a.example.org 2.6.32-754.24.3.el6.x86_64 #1 SMP Thu Nov 14 15:35:16 UTC 2019 x86_64", - "sysContact": null, - "version": "2.6.32-754.24.3.el6.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "mobileiron", - "type": "appliance", - "serial": null, - "icon": "mobileiron.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/motorola-cm.json b/tests/data/motorola-cm.json index 50e39ef5c7..d176493b07 100644 --- a/tests/data/motorola-cm.json +++ b/tests/data/motorola-cm.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1166.1.450.12.2", - "sysDescr": "<>", - "sysContact": null, - "version": "SB5101E-2.6.2.0-SCM00-NOSH", - "hardware": "SB5101E", - "features": null, - "os": "motorola-cm", - "type": "network", - "serial": null, - "icon": "motorola-cm.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/moxa-etherdevice_edsg512epoe.json b/tests/data/moxa-etherdevice_edsg512epoe.json index 59fcca857b..0861664090 100644 --- a/tests/data/moxa-etherdevice_edsg512epoe.json +++ b/tests/data/moxa-etherdevice_edsg512epoe.json @@ -384,24 +384,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8691.7.108", - "sysDescr": "EDS-G512E-8PoE-T", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "moxa-etherdevice", - "type": "network", - "serial": null, - "icon": "moxa.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -418,7 +400,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/moxa-etherdevice_edsp510a8poe.json b/tests/data/moxa-etherdevice_edsp510a8poe.json index 454ba569bb..3b3a10b9fe 100644 --- a/tests/data/moxa-etherdevice_edsp510a8poe.json +++ b/tests/data/moxa-etherdevice_edsp510a8poe.json @@ -360,24 +360,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8691.7.86", - "sysDescr": "EDS-P510A-8PoE-2GTXSFP-T", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "moxa-etherdevice", - "type": "network", - "serial": null, - "icon": "moxa.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -394,7 +376,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/mrv-od.json b/tests/data/mrv-od.json index 888984e8ee..db3fe546a9 100644 --- a/tests/data/mrv-od.json +++ b/tests/data/mrv-od.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.629.200.1.1.1", - "sysDescr": "OD-NM OD-5.10.1 (32333) (Jul 13 2016 - 08:18:22), U-Boot 2013.01.02.16-00155-gdebf., Linux kernel v3.2.78-1-12777-g012a77d (#7 Wed Mar 9 15:29:57 PST 2016), OD-NM (firmware 20.16) (00:20:1a:06:08:3f)", - "sysContact": null, - "version": "OD 5.2.1 (25684)", - "hardware": "OD-16-HD", - "features": null, - "os": "mrv-od", - "type": "network", - "serial": "012345EMF8K0", - "icon": "mrv.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/mypoweros.json b/tests/data/mypoweros.json index 2ae837f6c1..71551a8545 100644 --- a/tests/data/mypoweros.json +++ b/tests/data/mypoweros.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.5651.1.102.21", - "sysDescr": "MyPower (R) Operating System Software\nMyPower S3220 version 6.6.4.1.3(R)(integrity), compiled on Jul 25 2014, 20:23:14 Copyright (C) 2013 Maipu Communication Technology Co.,Ltd.All Rights Reserved.", - "sysContact": null, - "version": "6.6.4.1.3", - "hardware": "S3220", - "features": null, - "os": "mypoweros", - "type": "network", - "serial": null, - "icon": "maipu.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/netagent2.json b/tests/data/netagent2.json index f8d141d05b..e0752d10cc 100644 --- a/tests/data/netagent2.json +++ b/tests/data/netagent2.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.935", - "sysDescr": "NET Agent II", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "netagent2", - "type": "power", - "serial": null, - "icon": "netagent2.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/netagent2_1.json b/tests/data/netagent2_1.json index b3d6cdcf13..0a894852c7 100644 --- a/tests/data/netagent2_1.json +++ b/tests/data/netagent2_1.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.935.1.1.1", - "sysDescr": "", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "netagent2", - "type": "power", - "serial": null, - "icon": "netagent2.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/netapp_e2700.json b/tests/data/netapp_e2700.json index 904ee308bf..035574dd87 100644 --- a/tests/data/netapp_e2700.json +++ b/tests/data/netapp_e2700.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.789.1123.2", - "sysDescr": "NETAPP INF-01-00 0852", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "netapp", - "type": "storage", - "serial": null, - "icon": "netapp.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/netgear.json b/tests/data/netgear.json index cc53e10a95..cd6234232b 100644 --- a/tests/data/netgear.json +++ b/tests/data/netgear.json @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.4526.100.4.32", - "sysDescr": "GS724Tv4 ProSafe 24-port Gigabit Ethernet Smart Switch, 6.3.1.11, B1.0.0.4", - "sysContact": null, - "version": "6.3.1.11", - "hardware": "GS724Tv4", - "features": null, - "os": "netgear", - "type": "network", - "serial": null, - "icon": "netgear.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/netgear_3.json b/tests/data/netgear_3.json index 86bbde1813..386f6b4de0 100644 --- a/tests/data/netgear_3.json +++ b/tests/data/netgear_3.json @@ -107,24 +107,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.4526.100.11.22", - "sysDescr": "M4100-D12G ProSafe 12-port Gigabit L2+ Intelligent Edge Desktop Managed Switch, 10.0.2.26, B1.0.1.1", - "sysContact": null, - "version": "10.0.2.26", - "hardware": "M4100-D12G", - "features": null, - "os": "netgear", - "type": "network", - "serial": null, - "icon": "netgear.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -141,6 +123,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/netonix_wispswitch.json b/tests/data/netonix_wispswitch.json index 7cc894a14c..e547c4f5cc 100644 --- a/tests/data/netonix_wispswitch.json +++ b/tests/data/netonix_wispswitch.json @@ -591,24 +591,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.46242", - "sysDescr": "Netonix WS-12-250-AC", - "sysContact": null, - "version": "1.3.9", - "hardware": "WS-12-250-AC", - "features": null, - "os": "netonix", - "type": "network", - "serial": null, - "icon": "netonix.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -625,7 +607,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/netscaler-sdwan.json b/tests/data/netscaler-sdwan.json index dd32ddc838..647644c66e 100644 --- a/tests/data/netscaler-sdwan.json +++ b/tests/data/netscaler-sdwan.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.3845.31.4", - "sysDescr": "Citrix Virtual WAN Appliance", - "sysContact": null, - "version": "OS: 4.6, SW: 9.3.4.29.662777", - "hardware": "PRIVATESTRING01-CB410", - "features": null, - "os": "netscaler-sdwan", - "type": "appliance", - "serial": "FXPA6CSPG9", - "icon": "citrix.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/netscaler.json b/tests/data/netscaler.json index b2550b09da..4b3c5ffe75 100644 --- a/tests/data/netscaler.json +++ b/tests/data/netscaler.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.5951.1", - "sysDescr": "NetScaler NS11.1: Build 51.26.nc, Date: Jan 31 2017, 00:12:01", - "sysContact": null, - "version": "NS12.0", - "hardware": "NSMPX-8000-10G 4*CPU+6*E1K+2*IX+1*E1K+4*CVM 1620", - "features": "Build 57.19.nc", - "os": "netscaler", - "type": "loadbalancer", - "serial": "7FK7FCV4FH", - "icon": "citrix.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/netspire.json b/tests/data/netspire.json index b7ac995994..4dfee385c9 100644 --- a/tests/data/netspire.json +++ b/tests/data/netspire.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1732", - "sysDescr": "NetSpire CONAC01/4004:70FM r1.0", - "sysContact": null, - "version": null, - "hardware": "CONAC01/4004:70FM", - "features": null, - "os": "netspire", - "type": "appliance", - "serial": "141100002", - "icon": "openaccess.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/netsure.json b/tests/data/netsure.json index 8228b4238c..161a1f9331 100644 --- a/tests/data/netsure.json +++ b/tests/data/netsure.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.885.3", - "sysDescr": "Emerson Vortex Power System", - "sysContact": null, - "version": "4.0.0.1", - "hardware": null, - "features": null, - "os": "netsure", - "type": "power", - "serial": null, - "icon": "emerson.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/netvision-rfc.json b/tests/data/netvision-rfc.json index 79f516fab7..8571180daa 100644 --- a/tests/data/netvision-rfc.json +++ b/tests/data/netvision-rfc.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux localhost.localdomain 2.6.37.6-lsp-3.2.5_stm24_0012-spear3xx #105 Mon Dec 24 14:49:28 CST 2018 armv5tejl", - "sysContact": null, - "version": "7.20", - "hardware": null, - "features": null, - "os": "netvision-rfc", - "type": "power", - "serial": null, - "icon": "netvision.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/nexans.json b/tests/data/nexans.json index b4fd472336..3a44a0c84e 100644 --- a/tests/data/nexans.json +++ b/tests/data/nexans.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.266.1.3.22", - "sysDescr": "DualSwitch 1000 BM+ I af Desk 2SFP SECURE/SNMP/TELNET/WEB/V3.59", - "sysContact": null, - "version": "SECURE/SNMP/TELNET/WEB/V3.59", - "hardware": "DualSwitch 1000 BM+ I af Desk 2SFP", - "features": null, - "os": "nexans", - "type": "network", - "serial": null, - "icon": "nexans.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/nios.json b/tests/data/nios.json index 7581efb612..3fd67acc93 100644 --- a/tests/data/nios.json +++ b/tests/data/nios.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.7779.1.1402", - "sysDescr": "Linux 3.14.25 #1 SMP Thu Jun 16 18:19:37 EDT 2016 x86_64", - "sysContact": null, - "version": "8.0.11", - "hardware": "IB-825", - "features": null, - "os": "nios", - "type": "appliance", - "serial": "0805201904700392", - "icon": "infoblox.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/nios_status.json b/tests/data/nios_status.json index 922964f070..2d966902f6 100644 --- a/tests/data/nios_status.json +++ b/tests/data/nios_status.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.7779.1.1404", - "sysDescr": "Linux dcs-blox01.mountsinai.org 3.14.25 #1 SMP Fri Jan 25 03:42:05 EST 2019 x86_64", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "nios", - "type": "appliance", - "serial": null, - "icon": "infoblox.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/nokia-isam.json b/tests/data/nokia-isam.json index 34e6184c30..cf16f8f6c9 100644 --- a/tests/data/nokia-isam.json +++ b/tests/data/nokia-isam.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.637.61.1", - "sysDescr": "R5.7.02a NFXS-E FANT-F NOKIA ISAM Copyright (c) 2016 Nokia. All rights reserved. All use subject to applicable license agreement. Nokia and Alcatel-Lucent are registered trademarks of Nokia Corporation.", - "sysContact": null, - "version": "R5.7.02a", - "hardware": "NFXS-E", - "features": null, - "os": "nokia-isam", - "type": "network", - "serial": "FH1819A01A1", - "icon": "nokia.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ntron.json b/tests/data/ntron.json index f4a8002d57..ed0a6b1d7a 100644 --- a/tests/data/ntron.json +++ b/tests/data/ntron.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.28381.700.7", - "sysDescr": "N-TRON Switch e8:80:60", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "ntron", - "type": "network", - "serial": null, - "icon": "redlion.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/occamos_b6-256.json b/tests/data/occamos_b6-256.json index e187096732..83d4e81428 100644 --- a/tests/data/occamos_b6-256.json +++ b/tests/data/occamos_b6-256.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6066.1.52", - "sysDescr": "B6-256", - "sysContact": null, - "version": null, - "hardware": "B6-256", - "features": null, - "os": "occamos", - "type": "network", - "serial": null, - "icon": "calix.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/occamos_blc-6252.json b/tests/data/occamos_blc-6252.json index bb2a2cec89..22109a165f 100644 --- a/tests/data/occamos_blc-6252.json +++ b/tests/data/occamos_blc-6252.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6066.1.30", - "sysDescr": "BLC 6252 02", - "sysContact": null, - "version": null, - "hardware": "BLC 6252 02", - "features": null, - "os": "occamos", - "type": "network", - "serial": null, - "icon": "calix.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/okilan_9450g.json b/tests/data/okilan_9450g.json index b01b7804c5..fcd2640d35 100644 --- a/tests/data/okilan_9450g.json +++ b/tests/data/okilan_9450g.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2001.1.1.1.1", - "sysDescr": "OKI OkiLAN 9450g Rev.00.69 10/100/1000BASE Ethernet PrintServer: Attached to MC873 Rev.07.87 : Copyright (c) 2015 Oki Data Corporation. All rights reserved.", - "sysContact": null, - "version": "07.87", - "hardware": "MC873", - "features": "9450g Rev.00.69", - "os": "okilan", - "type": "printer", - "serial": null, - "icon": "oki.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/omnipcx.json b/tests/data/omnipcx.json index 9ef5258cd6..dd68c65d8a 100644 --- a/tests/data/omnipcx.json +++ b/tests/data/omnipcx.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.637.64.4400.1.1.10", - "sysDescr": "Linux telA001 2.6.32-ll-dhs3 #1 Fri Feb 23 16:51:51 IST 2018 i686", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "omnipcx", - "type": "appliance", - "serial": null, - "icon": "alcatellucent.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/omnitron-iconverter.json b/tests/data/omnitron-iconverter.json index de1e4eb771..83110cc9cf 100644 --- a/tests/data/omnitron-iconverter.json +++ b/tests/data/omnitron-iconverter.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.7342.5.1", - "sysDescr": "Omnitron iConverter GM4-HPOE 8991T11D v5.2.14 s/n 00827398 - GM4-PoE - x", - "sysContact": null, - "version": "5.2.14", - "hardware": "GM4-HPOE 8991T11D", - "features": null, - "os": "omnitron-iconverter", - "type": "management", - "serial": "00000000", - "icon": "omnitron.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/openbsd.json b/tests/data/openbsd.json index 5123eef9d3..0ed3208691 100644 --- a/tests/data/openbsd.json +++ b/tests/data/openbsd.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.30155.23.1", - "sysDescr": "User input...", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "openbsd", - "type": "server", - "serial": null, - "icon": "openbsd.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/openbsd_1.json b/tests/data/openbsd_1.json index 7517bdfc54..c6babd4de6 100644 --- a/tests/data/openbsd_1.json +++ b/tests/data/openbsd_1.json @@ -18,23 +18,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.12", - "sysDescr": "OpenBSD hostname 5.3 GENERIC.MP#58 i386", - "sysContact": null, - "version": "5.3", - "hardware": "Generic x86", - "features": null, - "os": "openbsd", - "type": "server", - "serial": null, - "icon": "openbsd.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/opengear.json b/tests/data/opengear.json index 9986512068..02845a4011 100644 --- a/tests/data/opengear.json +++ b/tests/data/opengear.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.25049.1.81", - "sysDescr": "Linux TS-LAB-1 3.10.0-uc0 #1 Mon Nov 14 16:53:28 EST 2016 armv4tl", - "sysContact": null, - "version": "4.3.0", - "hardware": "ACM550x", - "features": null, - "os": "opengear", - "type": "OOB Management", - "serial": "70081804019547", - "icon": "opengear.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/openwrt.json b/tests/data/openwrt.json index a02d5bae9f..06025ed5b8 100644 --- a/tests/data/openwrt.json +++ b/tests/data/openwrt.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux wap-study 5.4.35 #0 Sun Apr 26 12:19:33 2020 armv5tel", - "sysContact": null, - "version": "snapshot", - "hardware": "Marvell Kirkwood (Flattened Device Tree)", - "features": null, - "os": "openwrt", - "type": "network", - "serial": null, - "icon": "openwrt.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/opnsense.json b/tests/data/opnsense.json index d0cb8f33b7..a159a78364 100644 --- a/tests/data/opnsense.json +++ b/tests/data/opnsense.json @@ -18,23 +18,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.12325.1.1.2.1.1", - "sysDescr": "OPNsense OPNsense.7p.lan 18.1.1-a5575d7bd OPNsense FreeBSD 11.1-RELEASE-p6 amd64", - "sysContact": null, - "version": "18.1.1-a5575d7bd", - "hardware": "amd64", - "features": null, - "os": "opnsense", - "type": "firewall", - "serial": null, - "icon": "opnsense.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/opnsense_1.json b/tests/data/opnsense_1.json index 10188ca238..ed7736142f 100644 --- a/tests/data/opnsense_1.json +++ b/tests/data/opnsense_1.json @@ -18,23 +18,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.8", - "sysDescr": "FreeBSD fw1-eri1.OPN 11.2-RELEASE-p16-HBSD FreeBSD 11.2-RELEASE-p16-HBSD fc65add89c3(stable/20.1) amd64", - "sysContact": null, - "version": "20.1.2", - "hardware": "amd64/OpenSSL", - "features": null, - "os": "opnsense", - "type": "firewall", - "serial": null, - "icon": "opnsense.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/orvaldi-ups.json b/tests/data/orvaldi-ups.json index c11e24f927..eb5437d558 100644 --- a/tests/data/orvaldi-ups.json +++ b/tests/data/orvaldi-ups.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux SNMP-System", - "sysContact": null, - "version": "VERFW:01428.1400", - "hardware": "G2-6KL", - "features": null, - "os": "orvaldi-ups", - "type": "power", - "serial": "11112222333344", - "icon": "orvaldi.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/packetlight_pl-1000e.json b/tests/data/packetlight_pl-1000e.json index b47d7e5292..3b195fd847 100644 --- a/tests/data/packetlight_pl-1000e.json +++ b/tests/data/packetlight_pl-1000e.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.4515.100.1.1000.2", - "sysDescr": "PL-1000E", - "sysContact": null, - "version": "3.4.20-A5-A016-2409", - "hardware": "PL-1000E rev 02-02", - "features": null, - "os": "packetlight", - "type": "network", - "serial": "100800446", - "icon": "packetlight.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/packetlight_pl2000.json b/tests/data/packetlight_pl2000.json index 6bd3e33087..8e3ce726d8 100644 --- a/tests/data/packetlight_pl2000.json +++ b/tests/data/packetlight_pl2000.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.4515.100.1.2500.1", - "sysDescr": "PL-2000M", - "sysContact": null, - "version": "2.0.12-B2A2-A01C", - "hardware": "PL-2000M rev 02-28", - "features": null, - "os": "packetlight", - "type": "network", - "serial": "190400431", - "icon": "packetlight.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/panasonic-ns.json b/tests/data/panasonic-ns.json index 62bccd552c..94b6f30bcd 100644 --- a/tests/data/panasonic-ns.json +++ b/tests/data/panasonic-ns.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.258.601.3", - "sysDescr": "KX-NS1000 Ver00700128", - "sysContact": null, - "version": "Ver00700128", - "hardware": "KX-NS1000", - "features": null, - "os": "panasonic-ns", - "type": "server", - "serial": null, - "icon": "panasonic.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/panduit-eagle.json b/tests/data/panduit-eagle.json index c949487a36..e18eecf5f2 100644 --- a/tests/data/panduit-eagle.json +++ b/tests/data/panduit-eagle.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.3711.24", - "sysDescr": "Sinetica Eagle-i. Versions: App. 1.10.08, OS 6.3, Btldr 1.10.07, H/w ZBHIEIBB-01 v1.02.09", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "panduit-eagle", - "type": "power", - "serial": null, - "icon": "panduit.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/panduit.json b/tests/data/panduit.json index 047c25735a..984627e870 100644 --- a/tests/data/panduit.json +++ b/tests/data/panduit.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.19536.10.1", - "sysDescr": "SN:PDU Metered PN:Device Model:P42D04M", - "sysContact": null, - "version": "2.3.21", - "hardware": "P42D04M", - "features": "346-415V, 32A, 22.0kVA, 50/60Hz", - "os": "panduit", - "type": "power", - "serial": "CN187D6053", - "icon": "panduit.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { @@ -773,4 +756,4 @@ }, "poller": "matches discovery" } -} \ No newline at end of file +} diff --git a/tests/data/panos.json b/tests/data/panos.json index 37299988f1..842a59adab 100644 --- a/tests/data/panos.json +++ b/tests/data/panos.json @@ -282,24 +282,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.25461", - "sysDescr": "Palo Alto Networks PA-3000 series firewall", - "sysContact": null, - "version": "9.0.7", - "hardware": "PA-VM", - "features": null, - "os": "panos", - "type": "firewall", - "serial": "015351000009999", - "icon": "panos.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -316,7 +298,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/panos_vsys.json b/tests/data/panos_vsys.json index 580aba5903..ba3a1df6bc 100644 --- a/tests/data/panos_vsys.json +++ b/tests/data/panos_vsys.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.25461", - "sysDescr": "Palo Alto Networks PA-3000 series firewall", - "sysContact": null, - "version": "9.0.5", - "hardware": "PA-3020", - "features": null, - "os": "panos", - "type": "firewall", - "serial": null, - "icon": "panos.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/papouch-quido.json b/tests/data/papouch-quido.json index 4ff5d2a2f7..563267d762 100644 --- a/tests/data/papouch-quido.json +++ b/tests/data/papouch-quido.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".0.9.43.6.1.4.1", - "sysDescr": "Quidos SNMP", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "papouch-quido", - "type": "environment", - "serial": null, - "icon": "papouch-tme.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/paradyne_1752.json b/tests/data/paradyne_1752.json index 8568d28220..3d5c276d98 100644 --- a/tests/data/paradyne_1752.json +++ b/tests/data/paradyne_1752.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.3278.1.6", - "sysDescr": "SHDSL CPE", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "paradyne", - "type": "network", - "serial": null, - "icon": "paradyne.svg", - "location": null - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": null } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/patton-sn.json b/tests/data/patton-sn.json index d22d312928..d74db80b2b 100644 --- a/tests/data/patton-sn.json +++ b/tests/data/patton-sn.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1768.100.4.23.11", - "sysDescr": "SN4971/1E15VHardware Release 3 Version 1, Software R6.10 2017-09-08_RFE2645 H323 RBS SIP.", - "sysContact": null, - "version": "R6.10 2017-09-08_RFE2645 H323 RBS SIP", - "hardware": "SN4971/1E15V, HwRel: 3, HwVer: 1", - "features": null, - "os": "patton-sn", - "type": "network", - "serial": "00A0BA0BD1EC", - "icon": "generic.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/pcoweb-rittalchiller.json b/tests/data/pcoweb-rittalchiller.json index 7211dc94b1..4ab8549f73 100644 --- a/tests/data/pcoweb-rittalchiller.json +++ b/tests/data/pcoweb-rittalchiller.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9839.2606.1", - "sysDescr": "Rittal IT Chiller", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "pcoweb-rittalchiller", - "type": "environment", - "serial": null, - "icon": "rittal.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { @@ -1272,5 +1255,135 @@ ] }, "poller": "matches discovery" + }, + "mempools": { + "discovery": { + "mempools": [ + { + "mempool_index": "1", + "entPhysicalIndex": null, + "mempool_type": "ucd", + "mempool_class": "system", + "mempool_precision": 1024, + "mempool_descr": "Physical memory", + "mempool_perc": 48, + "mempool_perc_oid": null, + "mempool_used": 7254016, + "mempool_used_oid": null, + "mempool_free": 7962624, + "mempool_free_oid": ".1.3.6.1.4.1.2021.4.6.0", + "mempool_total": 15216640, + "mempool_total_oid": null, + "mempool_largestfree": null, + "mempool_lowestfree": null, + "mempool_deleted": 0, + "mempool_perc_warn": null + }, + { + "mempool_index": "3", + "entPhysicalIndex": null, + "mempool_type": "ucd", + "mempool_class": "buffers", + "mempool_precision": 1024, + "mempool_descr": "Memory buffers", + "mempool_perc": 94, + "mempool_perc_oid": null, + "mempool_used": 14336000, + "mempool_used_oid": ".1.3.6.1.4.1.2021.4.14.0", + "mempool_free": 880640, + "mempool_free_oid": null, + "mempool_total": 15216640, + "mempool_total_oid": null, + "mempool_largestfree": null, + "mempool_lowestfree": null, + "mempool_deleted": 0, + "mempool_perc_warn": null + }, + { + "mempool_index": "4", + "entPhysicalIndex": null, + "mempool_type": "ucd", + "mempool_class": "cached", + "mempool_precision": 1024, + "mempool_descr": "Cached memory", + "mempool_perc": 62, + "mempool_perc_oid": null, + "mempool_used": 9441280, + "mempool_used_oid": ".1.3.6.1.4.1.2021.4.15.0", + "mempool_free": 5775360, + "mempool_free_oid": null, + "mempool_total": 15216640, + "mempool_total_oid": null, + "mempool_largestfree": null, + "mempool_lowestfree": null, + "mempool_deleted": 0, + "mempool_perc_warn": null + } + ] + }, + "poller": { + "mempools": [ + { + "mempool_index": "1", + "entPhysicalIndex": null, + "mempool_type": "ucd", + "mempool_class": "system", + "mempool_precision": 1024, + "mempool_descr": "Physical memory", + "mempool_perc": 48, + "mempool_perc_oid": null, + "mempool_used": 7254016, + "mempool_used_oid": null, + "mempool_free": 7962624, + "mempool_free_oid": ".1.3.6.1.4.1.2021.4.6.0", + "mempool_total": 15216640, + "mempool_total_oid": null, + "mempool_largestfree": null, + "mempool_lowestfree": null, + "mempool_deleted": 0, + "mempool_perc_warn": null + }, + { + "mempool_index": "3", + "entPhysicalIndex": null, + "mempool_type": "ucd", + "mempool_class": "buffers", + "mempool_precision": 1024, + "mempool_descr": "Memory buffers", + "mempool_perc": 6, + "mempool_perc_oid": null, + "mempool_used": 880640, + "mempool_used_oid": ".1.3.6.1.4.1.2021.4.14.0", + "mempool_free": 14336000, + "mempool_free_oid": null, + "mempool_total": 15216640, + "mempool_total_oid": null, + "mempool_largestfree": null, + "mempool_lowestfree": null, + "mempool_deleted": 0, + "mempool_perc_warn": null + }, + { + "mempool_index": "4", + "entPhysicalIndex": null, + "mempool_type": "ucd", + "mempool_class": "cached", + "mempool_precision": 1024, + "mempool_descr": "Cached memory", + "mempool_perc": 38, + "mempool_perc_oid": null, + "mempool_used": 5775360, + "mempool_used_oid": ".1.3.6.1.4.1.2021.4.15.0", + "mempool_free": 9441280, + "mempool_free_oid": null, + "mempool_total": 15216640, + "mempool_total_oid": null, + "mempool_largestfree": null, + "mempool_lowestfree": null, + "mempool_deleted": 0, + "mempool_perc_warn": null + } + ] + } } } diff --git a/tests/data/pegasus.json b/tests/data/pegasus.json index c1463797a1..d3ad8df3a4 100644 --- a/tests/data/pegasus.json +++ b/tests/data/pegasus.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6368.2.403.912", - "sysDescr": "Pegasus T42", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "pegasus", - "type": "network", - "serial": null, - "icon": "pegasus.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/pepwave.json b/tests/data/pepwave.json index 59ee6a0315..5e0b67fddd 100644 --- a/tests/data/pepwave.json +++ b/tests/data/pepwave.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.27662", - "sysDescr": "Pepwave MAX HD4", - "sysContact": null, - "version": "8.0.0s010 build 4198", - "hardware": "Pepwave MAX HD4", - "features": null, - "os": "pepwave", - "type": "network", - "serial": "2935-3BAB-7549", - "icon": "peplink.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/pfsense.json b/tests/data/pfsense.json index d3a4e059df..baa7b4539b 100644 --- a/tests/data/pfsense.json +++ b/tests/data/pfsense.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.12325.1.1.2.1.1", - "sysDescr": "pfSense 2.3.2-RELEASE pfSense FreeBSD 10.3-RELEASE-p5 amd64", - "sysContact": null, - "version": "2.3.2-RELEASE", - "hardware": "amd64", - "features": null, - "os": "pfsense", - "type": "firewall", - "serial": null, - "icon": "pfsense.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/pfsense_frr-bgp.json b/tests/data/pfsense_frr-bgp.json index 6048fbf46d..bcfdf88b2f 100644 --- a/tests/data/pfsense_frr-bgp.json +++ b/tests/data/pfsense_frr-bgp.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.8", - "sysDescr": "pfSense localhost 2.4.5-RELEASE-p1 pfSense FreeBSD 11.3-STABLE amd64", - "sysContact": null, - "version": "2.4.5-RELEASE-p1", - "hardware": "amd64", - "features": null, - "os": "pfsense", - "type": "firewall", - "serial": null, - "icon": "pfsense.svg", - "location": null - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": null } ] - } + }, + "poller": "matches discovery" }, "bgp-peers": { "discovery": { diff --git a/tests/data/phybridge-flex.json b/tests/data/phybridge-flex.json index d1bf103de1..2b42f431ff 100644 --- a/tests/data/phybridge-flex.json +++ b/tests/data/phybridge-flex.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Phybridge FLEX 24 Switch 7.0.0", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "phybridge-flex", - "type": "network", - "serial": null, - "icon": "phybridge.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/picos.json b/tests/data/picos.json index 293c0da65d..05a6685566 100644 --- a/tests/data/picos.json +++ b/tests/data/picos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.35098.1.13.0", - "sysDescr": "Pica8, Inc. PicOS for as5812_54x", - "sysContact": null, - "version": null, - "hardware": "as5812_54x", - "features": null, - "os": "picos", - "type": "network", - "serial": "581254X1919216", - "icon": "picos.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/pixos.json b/tests/data/pixos.json index 52c066f73e..c5125b22b8 100644 --- a/tests/data/pixos.json +++ b/tests/data/pixos.json @@ -26,7 +26,7 @@ "sysDescr": "Cisco PIX", "sysContact": null, "version": null, - "hardware": null, + "hardware": "", "features": null, "os": "pixos", "type": "firewall", diff --git a/tests/data/planet-pdu.json b/tests/data/planet-pdu.json index b2c0aea570..c91f01e01a 100644 --- a/tests/data/planet-pdu.json +++ b/tests/data/planet-pdu.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.10456", - "sysDescr": "IPM-8220 1.30.4", - "sysContact": null, - "version": "1.30.4", - "hardware": "IPM-8220", - "features": null, - "os": "planet-pdu", - "type": "power", - "serial": null, - "icon": "planet.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/planetos_igs-10020mt.json b/tests/data/planetos_igs-10020mt.json index ad154f92f4..d10f1374ef 100644 --- a/tests/data/planetos_igs-10020mt.json +++ b/tests/data/planetos_igs-10020mt.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.10456.1.1516", - "sysDescr": "PLANET IGS-10020MT Managed Switch", - "sysContact": null, - "version": "2.28f130731", - "hardware": "IGS-10020MT", - "features": null, - "os": "planetos", - "type": "network", - "serial": null, - "icon": "planet.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/pmp.json b/tests/data/pmp.json index dc876ffda2..5eea5f9233 100644 --- a/tests/data/pmp.json +++ b/tests/data/pmp.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.161.19.250.256", - "sysDescr": "CANOPY 16.0.0.1 AP", - "sysContact": null, - "version": "16.0.0.1", - "hardware": "PMP 450 AP", - "features": "5.7GHz MIMO OFDM - Multipoint - Access Point", - "os": "pmp", - "type": "wireless", - "serial": null, - "icon": "cambium.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/pmp_450.json b/tests/data/pmp_450.json index 4b02bba24a..717cba83fb 100644 --- a/tests/data/pmp_450.json +++ b/tests/data/pmp_450.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.161.19.250.256", - "sysDescr": "CANOPY 15.0.0.1 AP-DES", - "sysContact": null, - "version": "15.0.0.1", - "hardware": "PMP 450 AP", - "features": "5.4GHzMIMO OFDM - Multipoint - Access Point", - "os": "pmp", - "type": "wireless", - "serial": null, - "icon": "cambium.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/pmp_450m.json b/tests/data/pmp_450m.json index 7eaf34f264..2707191784 100644 --- a/tests/data/pmp_450m.json +++ b/tests/data/pmp_450m.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.161.19.250.256", - "sysDescr": "CANOPY 16.0.0.1 AP", - "sysContact": null, - "version": "16.0.0.1", - "hardware": "PMP 450 AP", - "features": "5.7GHz MIMO OFDM - Multipoint - Access Point", - "os": "pmp", - "type": "wireless", - "serial": null, - "icon": "cambium.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/powerconnect_3011.json b/tests/data/powerconnect_3011.json index aae8fc4b6f..434dcda5d0 100644 --- a/tests/data/powerconnect_3011.json +++ b/tests/data/powerconnect_3011.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10895.3011", - "sysDescr": "PowerConnect 6248, 3.3.7.3, VxWorks 6.5", - "sysContact": null, - "version": "3.3.7.3", - "hardware": "PowerConnect 6248", - "features": null, - "os": "powerconnect", - "type": "network", - "serial": null, - "icon": "dell.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/powerconnect_3020.json b/tests/data/powerconnect_3020.json index e1756b5107..2b77e0e6c8 100644 --- a/tests/data/powerconnect_3020.json +++ b/tests/data/powerconnect_3020.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10895.3020", - "sysDescr": "PowerConnect 5424", - "sysContact": null, - "version": null, - "hardware": "PowerConnect 5424", - "features": null, - "os": "powerconnect", - "type": "network", - "serial": null, - "icon": "dell.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/powerconnect_3021.json b/tests/data/powerconnect_3021.json index a6db521935..32c18b5928 100644 --- a/tests/data/powerconnect_3021.json +++ b/tests/data/powerconnect_3021.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10895.3021", - "sysDescr": "PowerConnect 5448", - "sysContact": null, - "version": null, - "hardware": "PowerConnect 5448", - "features": null, - "os": "powerconnect", - "type": "network", - "serial": null, - "icon": "dell.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/powerconnect_3024.json b/tests/data/powerconnect_3024.json index 756346ae4a..d89febc9da 100644 --- a/tests/data/powerconnect_3024.json +++ b/tests/data/powerconnect_3024.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10895.3024", - "sysDescr": "Powerconnect 8024F, 5.1.8.2, VxWorks 6.6", - "sysContact": null, - "version": "5.1.8.2", - "hardware": "Powerconnect 8024F", - "features": null, - "os": "powerconnect", - "type": "network", - "serial": null, - "icon": "dell.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/powerconnect_3030.json b/tests/data/powerconnect_3030.json index 6b6f4606c8..ba5b03998c 100644 --- a/tests/data/powerconnect_3030.json +++ b/tests/data/powerconnect_3030.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10895.3030", - "sysDescr": "24G Ethernet Switch", - "sysContact": null, - "version": null, - "hardware": "24G", - "features": null, - "os": "powerconnect", - "type": "network", - "serial": null, - "icon": "dell.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/powerconnect_3031.json b/tests/data/powerconnect_3031.json index f78fad8522..0b973a3de8 100644 --- a/tests/data/powerconnect_3031.json +++ b/tests/data/powerconnect_3031.json @@ -36,24 +36,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10895.3031", - "sysDescr": "48G Ethernet Switch", - "sysContact": null, - "version": null, - "hardware": "48G", - "features": null, - "os": "powerconnect", - "type": "network", - "serial": null, - "icon": "dell.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/powerconnect_3042.json b/tests/data/powerconnect_3042.json index 4b85600abb..a7055af62d 100644 --- a/tests/data/powerconnect_3042.json +++ b/tests/data/powerconnect_3042.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10895.3042", - "sysDescr": "Dell Networking N4032, 6.3.2.4, Linux 3.7.10-20383c08", - "sysContact": null, - "version": "6.3.2.4", - "hardware": "Dell Networking N4032", - "features": null, - "os": "powerconnect", - "type": "network", - "serial": null, - "icon": "dell.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/powerconnect_3046.json b/tests/data/powerconnect_3046.json index 20c05452d8..1a337c178c 100644 --- a/tests/data/powerconnect_3046.json +++ b/tests/data/powerconnect_3046.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10895.3046", - "sysDescr": "Dell Networking N4064F, 6.5.4.3, Linux 3.7.10-8f4da1f6", - "sysContact": null, - "version": "6.5.4.3", - "hardware": "Dell Networking N4064F", - "features": null, - "os": "powerconnect", - "type": "network", - "serial": null, - "icon": "dell.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/powerconnect_3053.json b/tests/data/powerconnect_3053.json index 99d603e852..1119bba7fd 100644 --- a/tests/data/powerconnect_3053.json +++ b/tests/data/powerconnect_3053.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10895.3053", - "sysDescr": "Dell Networking N2024, 6.1.0.6, Linux 3.6.5-320b2282", - "sysContact": null, - "version": "6.1.0.6", - "hardware": "Dell Networking N2024", - "features": null, - "os": "powerconnect", - "type": "network", - "serial": null, - "icon": "dell.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/powerconnect_3054.json b/tests/data/powerconnect_3054.json index f54327c817..ed9c5c7194 100644 --- a/tests/data/powerconnect_3054.json +++ b/tests/data/powerconnect_3054.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10895.3054", - "sysDescr": "Dell Networking N2048, 6.1.1.7, Linux 3.6.5-601418a5", - "sysContact": null, - "version": "6.1.1.7", - "hardware": "Dell Networking N2048", - "features": null, - "os": "powerconnect", - "type": "network", - "serial": null, - "icon": "dell.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/powerconnect_3056.json b/tests/data/powerconnect_3056.json index f883c45a74..e76daab513 100644 --- a/tests/data/powerconnect_3056.json +++ b/tests/data/powerconnect_3056.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10895.3056", - "sysDescr": "Dell Networking N2048P, 6.1.0.6, Linux 3.6.5-320b2282", - "sysContact": null, - "version": "6.1.0.6", - "hardware": "Dell Networking N2048P", - "features": null, - "os": "powerconnect", - "type": "network", - "serial": null, - "icon": "dell.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/powerconnect_3058.json b/tests/data/powerconnect_3058.json index 4ce9f74cc9..c6df8e13bb 100644 --- a/tests/data/powerconnect_3058.json +++ b/tests/data/powerconnect_3058.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10895.3058", - "sysDescr": "Dell Networking N3048, 6.0.1.3, Linux 3.6.5-320b2282", - "sysContact": null, - "version": "6.0.1.3", - "hardware": "Dell Networking N3048", - "features": null, - "os": "powerconnect", - "type": "network", - "serial": null, - "icon": "dell.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/powerconnect_3064.json b/tests/data/powerconnect_3064.json index ce947b85c9..d91a89c8b8 100644 --- a/tests/data/powerconnect_3064.json +++ b/tests/data/powerconnect_3064.json @@ -19,24 +19,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10895.3064", - "sysDescr": "Dell EMC Networking N1524P, 6.6.0.13, Linux 3.6.5, Not Available", - "sysContact": null, - "version": "6.6.0.13", - "hardware": "Dell EMC Networking N1524P", - "features": "Dell EMC Networking Switch", - "os": "powerconnect", - "type": "network", - "serial": null, - "icon": "dell.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -53,6 +35,66 @@ "location": "" } ] - } + }, + "poller": "matches discovery" + }, + "mempools": { + "discovery": { + "mempools": [ + { + "mempool_index": "0", + "entPhysicalIndex": null, + "mempool_type": "powerconnect-cpu", + "mempool_class": "system", + "mempool_precision": 1, + "mempool_descr": "CPU Memory", + "mempool_perc": 46, + "mempool_perc_oid": null, + "mempool_used": 463640, + "mempool_used_oid": null, + "mempool_free": 551196, + "mempool_free_oid": ".1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.1.0", + "mempool_total": 1014836, + "mempool_total_oid": null, + "mempool_largestfree": null, + "mempool_lowestfree": null, + "mempool_deleted": 0, + "mempool_perc_warn": 90 + } + ] + }, + "poller": "matches discovery" + }, + "sensors": { + "discovery": { + "sensors": [ + { + "sensor_deleted": 0, + "sensor_class": "temperature", + "poller_type": "snmp", + "sensor_oid": ".1.3.6.1.4.1.674.10895.5000.2.6132.1.1.43.1.8.1.5.1.1", + "sensor_index": "1", + "sensor_type": "dnos", + "sensor_descr": "Unit 1 CPU temperature", + "group": null, + "sensor_divisor": 1, + "sensor_multiplier": 1, + "sensor_current": 27, + "sensor_limit": 47, + "sensor_limit_warn": null, + "sensor_limit_low": 17, + "sensor_limit_low_warn": null, + "sensor_alert": 1, + "sensor_custom": "No", + "entPhysicalIndex": null, + "entPhysicalIndex_measured": null, + "sensor_prev": null, + "user_func": null, + "state_name": null + } + ], + "state_indexes": [] + }, + "poller": "matches discovery" } } diff --git a/tests/data/powerconnect_3080.json b/tests/data/powerconnect_3080.json index 39273ba82e..23a4327786 100644 --- a/tests/data/powerconnect_3080.json +++ b/tests/data/powerconnect_3080.json @@ -19,24 +19,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10895.3080", - "sysDescr": "Dell EMC Networking N1124T-ON, 6.6.0.21, Linux 3.6.5, Not Available", - "sysContact": null, - "version": "6.6.0.21", - "hardware": "Dell EMC Networking N1124T-ON", - "features": "Dell EMC Networking Switch", - "os": "powerconnect", - "type": "network", - "serial": null, - "icon": "dell.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -53,6 +35,34 @@ "location": "" } ] - } + }, + "poller": "matches discovery" + }, + "mempools": { + "discovery": { + "mempools": [ + { + "mempool_index": "0", + "entPhysicalIndex": null, + "mempool_type": "powerconnect-cpu", + "mempool_class": "system", + "mempool_precision": 1, + "mempool_descr": "CPU Memory", + "mempool_perc": 42, + "mempool_perc_oid": null, + "mempool_used": 427504, + "mempool_used_oid": null, + "mempool_free": 587276, + "mempool_free_oid": ".1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.1.0", + "mempool_total": 1014780, + "mempool_total_oid": null, + "mempool_largestfree": null, + "mempool_lowestfree": null, + "mempool_deleted": 0, + "mempool_perc_warn": 90 + } + ] + }, + "poller": "matches discovery" } } diff --git a/tests/data/powerconnect_3082.json b/tests/data/powerconnect_3082.json index 7aa8593173..34a63d5cf8 100644 --- a/tests/data/powerconnect_3082.json +++ b/tests/data/powerconnect_3082.json @@ -19,24 +19,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.674.10895.3082", - "sysDescr": "Dell EMC Networking N1148T-ON, 6.6.0.21, Linux 3.6.5, Not Available", - "sysContact": null, - "version": "6.6.0.21", - "hardware": "Dell EMC Networking N1148T-ON", - "features": "Dell EMC Networking Switch", - "os": "powerconnect", - "type": "network", - "serial": null, - "icon": "dell.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -53,6 +35,34 @@ "location": "" } ] - } + }, + "poller": "matches discovery" + }, + "mempools": { + "discovery": { + "mempools": [ + { + "mempool_index": "0", + "entPhysicalIndex": null, + "mempool_type": "powerconnect-cpu", + "mempool_class": "system", + "mempool_precision": 1, + "mempool_descr": "CPU Memory", + "mempool_perc": 43, + "mempool_perc_oid": null, + "mempool_used": 433008, + "mempool_used_oid": null, + "mempool_free": 581772, + "mempool_free_oid": ".1.3.6.1.4.1.674.10895.5000.2.6132.1.1.1.1.4.1.0", + "mempool_total": 1014780, + "mempool_total_oid": null, + "mempool_largestfree": null, + "mempool_lowestfree": null, + "mempool_deleted": 0, + "mempool_perc_warn": 90 + } + ] + }, + "poller": "matches discovery" } } diff --git a/tests/data/procera.json b/tests/data/procera.json index 4fbd39a261..26907df3df 100644 --- a/tests/data/procera.json +++ b/tests/data/procera.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.15397.2", - "sysDescr": "Linux hostname 3.4.71-pl-xeon-plos_64 #1 SMP Mon Oct 12 15:21:49 CEST 2015 x86_64", - "sysContact": null, - "version": "18.1.8.2", - "hardware": "PL7810-INT-FWA3210", - "features": null, - "os": "procera", - "type": "network", - "serial": "000ABCD0123", - "icon": "procera.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/procurve.json b/tests/data/procurve.json index ef09905906..391bd2bf4b 100644 --- a/tests/data/procurve.json +++ b/tests/data/procurve.json @@ -547,9 +547,9 @@ "sysName": "", "sysObjectID": ".1.3.6.1.4.1.11.2.3.7.8.5.2", "sysDescr": "HP Stack, revision KA.15.03.3004, ROM KA.15.05 (/sw/code/build/tam(KA_15_03))", - "sysContact": null, + "sysContact": "", "version": "KA.15.03.3004", - "hardware": null, + "hardware": "", "features": null, "os": "procurve", "type": "network", @@ -559,24 +559,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.11.2.3.7.8.5.2", - "sysDescr": "HP Stack, revision KA.15.03.3004, ROM KA.15.05 (/sw/code/build/tam(KA_15_03))", - "sysContact": "", - "version": "KA.15.03.3004", - "hardware": null, - "features": null, - "os": "procurve", - "type": "network", - "serial": null, - "icon": "hpe.svg", - "location": "" - } - ] - } + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/procurve_2520.json b/tests/data/procurve_2520.json index 1a1888fe23..93339d46d4 100644 --- a/tests/data/procurve_2520.json +++ b/tests/data/procurve_2520.json @@ -547,9 +547,9 @@ "sysName": "", "sysObjectID": ".1.3.6.1.4.1.11.2.3.7.8.5.2", "sysDescr": "HP Stack, revision KA.15.03.3004, ROM KA.15.05 (/sw/code/build/tam(KA_15_03))", - "sysContact": null, + "sysContact": "", "version": "KA.15.03.3004", - "hardware": null, + "hardware": "", "features": null, "os": "procurve", "type": "network", @@ -559,24 +559,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.11.2.3.7.8.5.2", - "sysDescr": "HP Stack, revision KA.15.03.3004, ROM KA.15.05 (/sw/code/build/tam(KA_15_03))", - "sysContact": "", - "version": "KA.15.03.3004", - "hardware": null, - "features": null, - "os": "procurve", - "type": "network", - "serial": null, - "icon": "hpe.svg", - "location": "" - } - ] - } + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/protelevision-t1.json b/tests/data/protelevision-t1.json index b26afb9235..f0811fb6fb 100644 --- a/tests/data/protelevision-t1.json +++ b/tests/data/protelevision-t1.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.18086.8", - "sysDescr": "DVB-T transmitter", - "sysContact": null, - "version": "SWPTTDVBTT2_P3_1_02_157 build 1441109757", - "hardware": "PT3080", - "features": null, - "os": "protelevision-t1", - "type": "network", - "serial": "3303302", - "icon": "protelevision.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ptp670.json b/tests/data/ptp670.json index 96e0d3f6e4..7ff06b32d3 100644 --- a/tests/data/ptp670.json +++ b/tests/data/ptp670.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.17713.11", - "sysDescr": "Cambium PTP 50670 PTP Wireless Ethernet Bridge, Version 50670-02-00", - "sysContact": null, - "version": "50670-02-00", - "hardware": "PTP 670 master (B0P01.01-C-FPS)", - "features": null, - "os": "ptp670", - "type": "wireless", - "serial": null, - "icon": "cambium.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/pulse.json b/tests/data/pulse.json index be3ce27377..bae11ea1b7 100644 --- a/tests/data/pulse.json +++ b/tests/data/pulse.json @@ -36,24 +36,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.12532.255.2.1", - "sysDescr": "Pulse Secure, LLC,Pulse Connect Secure,VMware-VA-DTE,8.2R5 (build 49363)", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "pulse", - "type": "firewall", - "serial": null, - "icon": "pulse.png", - "location": null - } - ] - } + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/qtech.json b/tests/data/qtech.json index 5e789ad7c6..e48e50802f 100644 --- a/tests/data/qtech.json +++ b/tests/data/qtech.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.27514.1.1.2.7", - "sysDescr": "QSW-3500-24-AC Device, Compiled Feb 22 10:28:35 2011\n SoftWare Version QSW-3500-24-AC_6.0.220.41\n BootRom Version QSW-3500-24-AC_2.0.2\n HardWare Version R01\n Copyright (C) 2010 by QTECH LLC\n All rights reserved", - "sysContact": null, - "version": "6.0.220.41", - "hardware": "QSW-3500-24-AC", - "features": null, - "os": "qtech", - "type": "network", - "serial": null, - "icon": "qtech.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/qtech_qsw-3400.json b/tests/data/qtech_qsw-3400.json index adeb725949..3c9e603d5a 100644 --- a/tests/data/qtech_qsw-3400.json +++ b/tests/data/qtech_qsw-3400.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.27514.1.1.1.221", - "sysDescr": "QSW-3400-28T-AC Device, Compiled Jun 17 14:34:45 2013\n SoftWare Version 6.2.201.11\n BootRom Version 4.30.8\n HardWare Version 2.0\n Device serial number 00019711401010007262\n Copyright (C) 2013 by QTECH LLC\n All rights reserved", - "sysContact": null, - "version": "6.2.201.11", - "hardware": "QSW-3400-28T-AC", - "features": null, - "os": "qtech", - "type": "network", - "serial": "00019711401010007262", - "icon": "qtech.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/qtech_qsw-3450.json b/tests/data/qtech_qsw-3450.json index 2f8eb0aebb..3c338ac0f9 100644 --- a/tests/data/qtech_qsw-3450.json +++ b/tests/data/qtech_qsw-3450.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.27514.1.1.1.228", - "sysDescr": "QSW-3450-28T-AC Device, Compiled Dec 30 11:22:40 2014\n SoftWare Version 7.0.3.5(R0237.0034)\n BootRom Version 7.1.36\n HardWare Version R01\n Serial No.:00030661509010026177\n Copyright (C) 2014 by QTECH LLC\n All rights reserved", - "sysContact": null, - "version": "7.0.3.5(R0237.0034)", - "hardware": "QSW-3450-28T-AC", - "features": null, - "os": "qtech", - "type": "network", - "serial": "00030661509010026177", - "icon": "qtech.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/quanta.json b/tests/data/quanta.json index 51dff8aba6..18e990442b 100644 --- a/tests/data/quanta.json +++ b/tests/data/quanta.json @@ -36,24 +36,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.4413", - "sysDescr": "LB4M 48x1G 2x10G, *, VxWorks 6.6", - "sysContact": null, - "version": "VxWorks 6.6", - "hardware": "LB4M 48x1G 2x10G", - "features": "*", - "os": "quanta", - "type": "network", - "serial": null, - "icon": "quanta.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/quantastor.json b/tests/data/quantastor.json index 5d3e3a6869..d2443727c2 100644 --- a/tests/data/quantastor.json +++ b/tests/data/quantastor.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux san01 5.3.0-62-generic #56~18.04.1-Ubuntu SMP Wed Jun 24 16:17:03 UTC 2020 x86_64", - "sysContact": null, - "version": "5.7.2.006+1483656", - "hardware": "HP Gen8 ServBP 25+2", - "features": null, - "os": "quantastor", - "type": "storage", - "serial": "1b2cc97f", - "icon": "quantastor.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/radlan.json b/tests/data/radlan.json index 6a46fa9906..8872be5d4d 100644 --- a/tests/data/radlan.json +++ b/tests/data/radlan.json @@ -10937,24 +10937,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.207.1.4.126", - "sysDescr": "ATI AT-8000S", - "sysContact": null, - "version": "3.0.0.44", - "hardware": "AT-8000S/24", - "features": null, - "os": "radlan", - "type": "network", - "serial": null, - "icon": "alliedtelesis.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -10971,7 +10953,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/radwin_5200-0150.json b/tests/data/radwin_5200-0150.json index 7386ba63ef..f00a5e77f4 100644 --- a/tests/data/radwin_5200-0150.json +++ b/tests/data/radwin_5200-0150.json @@ -179,24 +179,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.4458.20.6.1.1", - "sysDescr": "Wireless Link", - "sysContact": null, - "version": "4.9.00_b0016_Jan 8 2017", - "hardware": "RW5000/HSU/5550/F58/FCC/SFF/INT/23 - RW-5550-0H50", - "features": "Ver. 6", - "os": "radwin", - "type": "wireless", - "serial": "P10700I500F00005", - "icon": "radwin.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -213,7 +195,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/radwin_5550-0150.json b/tests/data/radwin_5550-0150.json index 1c86dd9537..288a92c17a 100644 --- a/tests/data/radwin_5550-0150.json +++ b/tests/data/radwin_5550-0150.json @@ -179,24 +179,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.4458.20.6.1.1", - "sysDescr": "Wireless Link", - "sysContact": null, - "version": "4.9.00_b0016_Jan 8 2017", - "hardware": "RW5000/HSU/5550/F58/FCC/INT - RW-5550-0150", - "features": "Ver. 9", - "os": "radwin", - "type": "wireless", - "serial": "P07100I500A00824", - "icon": "radwin.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -213,7 +195,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/radwin_5550-0h50.json b/tests/data/radwin_5550-0h50.json index fa0fcedca5..c28cbfd66b 100644 --- a/tests/data/radwin_5550-0h50.json +++ b/tests/data/radwin_5550-0h50.json @@ -179,24 +179,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.4458.20.6.1.1", - "sysDescr": "Wireless Link", - "sysContact": null, - "version": "4.9.00_b0016_Jan 8 2017", - "hardware": "RW5000/HSU/5550/F58/FCC/SFF/INT/23 - RW-5550-0H50", - "features": "Ver. 6", - "os": "radwin", - "type": "wireless", - "serial": "P10700I500A00377", - "icon": "radwin.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -213,7 +195,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/raisecom-ros.json b/tests/data/raisecom-ros.json index f1c76af18e..89cdcccdda 100644 --- a/tests/data/raisecom-ros.json +++ b/tests/data/raisecom-ros.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8886.23.191", - "sysDescr": "ROS_.RAX711-C-R.2020614.(null)", - "sysContact": null, - "version": "ROS_6.2.0_20200614", - "hardware": "RAX711-C-R P100R001C00", - "features": null, - "os": "raisecom-ros", - "type": "network", - "serial": "103002031910S20907S0003G", - "icon": "raisecom.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/raisecom.json b/tests/data/raisecom.json index 18674d77b8..d949171f1a 100644 --- a/tests/data/raisecom.json +++ b/tests/data/raisecom.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8886.18.4.10", - "sysDescr": "ROAP Version ISCOM5508-EPSC_ROAP_2.61.3(a)_20161019.(Compiled Oct 19 2016, 19:12:24)", - "sysContact": null, - "version": "8.2.29_20180611", - "hardware": "RAX711-C-DC/D-02 version A.02", - "features": null, - "os": "raisecom", - "type": "network", - "serial": "123002030702S18B08S0001G", - "icon": "raisecom.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/raritan-pdu.json b/tests/data/raritan-pdu.json index f061f493a9..b25549648c 100644 --- a/tests/data/raritan-pdu.json +++ b/tests/data/raritan-pdu.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.13742.4", - "sysDescr": "Raritan Dominion PX - Firmware Version 010507-11172", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "raritan-pdu", - "type": "power", - "serial": null, - "icon": "raritan.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/ray.json b/tests/data/ray.json index 054fe66306..2bf2f41b37 100644 --- a/tests/data/ray.json +++ b/tests/data/ray.json @@ -36,24 +36,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.33555.1.1", - "sysDescr": "RAy - Microwave Link", - "sysContact": null, - "version": "4.1.51.0", - "hardware": "RAY10EU", - "features": "H1", - "os": "ray", - "type": "wireless", - "serial": "9879015", - "icon": "ray.png", - "location": null - } - ] - } + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/ray3.json b/tests/data/ray3.json index cd36835ad2..b00ab5ffa9 100644 --- a/tests/data/ray3.json +++ b/tests/data/ray3.json @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.33555.4.1", - "sysDescr": "Microwave Link", - "sysContact": null, - "version": "1.0.19.0", - "hardware": "RAy3-24", - "features": "L", - "os": "ray3", - "type": "wireless", - "serial": "1801456327", - "icon": "ray.png", - "location": "" - } - ] - } + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/recoveryos.json b/tests/data/recoveryos.json index 3a5fea9ae1..d38860dd3b 100644 --- a/tests/data/recoveryos.json +++ b/tests/data/recoveryos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux unitrends 3.10.0-862.14.4.el7.x86_64 #1 SMP Wed Sep 26 15:12:11 UTC 2018 x86_64", - "sysContact": null, - "version": "3.10.0-862.14.4.el7.x86_64", - "hardware": "VMware, Inc. [VMware Virtual Platform]", - "features": "RecoveryOS 7", - "os": "recoveryos", - "type": "server", - "serial": null, - "icon": "unitrends.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/recoveryos_8024s.json b/tests/data/recoveryos_8024s.json index b40380e7e5..bf9209c836 100644 --- a/tests/data/recoveryos_8024s.json +++ b/tests/data/recoveryos_8024s.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux unitrends-1 2.6.32-573.26.1.el6.x86_64 #1 SMP Wed May 4 00:57:44 UTC 2016 x86_64", - "sysContact": null, - "version": "2.6.32-573.26.1.el6.x86_64", - "hardware": "Generic x86 64-bit", - "features": null, - "os": "recoveryos", - "type": "server", - "serial": null, - "icon": "unitrends.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/riello.json b/tests/data/riello.json index 44c2d1d488..b3599caabf 100644 --- a/tests/data/riello.json +++ b/tests/data/riello.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.5491.304", - "sysDescr": "Netman 204", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "riello", - "type": "power", - "serial": null, - "icon": "riello.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/riello_mct20.json b/tests/data/riello_mct20.json index d967ee0d1f..917b6d279d 100644 --- a/tests/data/riello_mct20.json +++ b/tests/data/riello_mct20.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.5491.308", - "sysDescr": "Netman 204", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "riello", - "type": "power", - "serial": null, - "icon": "riello.png", - "location": null - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": null } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/rittal-cmc-iii-pu.json b/tests/data/rittal-cmc-iii-pu.json index 50737f9a25..50984d9b1c 100644 --- a/tests/data/rittal-cmc-iii-pu.json +++ b/tests/data/rittal-cmc-iii-pu.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2606.7", - "sysDescr": "Rittal CMC III PU Compact SN HW V6.02 - SW V3.15.70_4", - "sysContact": null, - "version": "V3.15.70_4", - "hardware": "CMCIII-PU Compact", - "features": null, - "os": "rittal-cmc-iii-pu", - "type": "environment", - "serial": "", - "icon": "rittal.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/rittal-cmc-iii-pu_compact.json b/tests/data/rittal-cmc-iii-pu_compact.json index 8992210cb2..2ebd9cd255 100644 --- a/tests/data/rittal-cmc-iii-pu_compact.json +++ b/tests/data/rittal-cmc-iii-pu_compact.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2606.7", - "sysDescr": "Rittal CMC III PU Compact SN HW V6.02 - SW V3.15.70_4", - "sysContact": null, - "version": "V3.15.70_4", - "hardware": "CMCIII-PU Compact", - "features": null, - "os": "rittal-cmc-iii-pu", - "type": "environment", - "serial": "", - "icon": "rittal.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/rittal-cmc.json b/tests/data/rittal-cmc.json index 3b8ba0c285..5eda9db892 100644 --- a/tests/data/rittal-cmc.json +++ b/tests/data/rittal-cmc.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2606.4", - "sysDescr": "Rittal CMC-TC/LCP-InlineEC SN 07627 HW V3.20 - SW V6.50.00", - "sysContact": null, - "version": "6.50.00", - "hardware": "3.20", - "features": null, - "os": "rittal-cmc", - "type": "environment", - "serial": "07627", - "icon": "rittal.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/riverbed.json b/tests/data/riverbed.json index 7b8ffb35c2..e1d7cf00af 100644 --- a/tests/data/riverbed.json +++ b/tests/data/riverbed.json @@ -19,24 +19,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.17163.1.1", - "sysDescr": "Linux hostname 2.6.32 #1 SMP Tue May 10 23:49:24 PDT 2016 x86_64", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "riverbed", - "type": "network", - "serial": null, - "icon": "riverbed.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -53,6 +35,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/routeros.json b/tests/data/routeros.json index 7464494ba0..e771b5f481 100644 --- a/tests/data/routeros.json +++ b/tests/data/routeros.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.14988.1", - "sysDescr": "router", - "sysContact": null, - "version": "6.40.5", - "hardware": null, - "features": "Level 1", - "os": "routeros", - "type": "network", - "serial": "71B1060EE89D", - "icon": "mikrotik.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/routeros_crs317.json b/tests/data/routeros_crs317.json index f39bcdd7dc..3352fa73bf 100644 --- a/tests/data/routeros_crs317.json +++ b/tests/data/routeros_crs317.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.14988.1", - "sysDescr": "RouterOS CRS317-1G-16S+", - "sysContact": null, - "version": "6.44.2", - "hardware": "CRS317-1G-16S+", - "features": "Level 6", - "os": "routeros", - "type": "network", - "serial": "8ED5087EB201", - "icon": "mikrotik.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/routeros_rblhgr.json b/tests/data/routeros_rblhgr.json index 4fa631b747..8e0e8fd2e4 100644 --- a/tests/data/routeros_rblhgr.json +++ b/tests/data/routeros_rblhgr.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.14988.1", - "sysDescr": "RouterOS RBLHGR", - "sysContact": null, - "version": "6.45.7", - "hardware": "RBLHGR", - "features": "Level 3", - "os": "routeros", - "type": "network", - "serial": "A33309596248", - "icon": "mikrotik.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/routeros_wifi.json b/tests/data/routeros_wifi.json index 2678b258f7..f6a6f3a586 100644 --- a/tests/data/routeros_wifi.json +++ b/tests/data/routeros_wifi.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.14988.1", - "sysDescr": "RouterOS RBLHGG-60ad", - "sysContact": null, - "version": "6.44", - "hardware": "RBLHGG-60ad", - "features": "Level 3", - "os": "routeros", - "type": "network", - "serial": "90C709063CC4", - "icon": "mikrotik.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/rs.json b/tests/data/rs.json index 6bec1a3102..5d9cd8f260 100644 --- a/tests/data/rs.json +++ b/tests/data/rs.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2566.127.1.2.167", - "sysDescr": "Sx800 OSEDelta 4.6", - "sysContact": null, - "version": "1.46.2", - "hardware": "Sx800 OSEDelta 4.6", - "features": null, - "os": "rs", - "type": "network", - "serial": "000000", - "icon": "rs.svg", - "location": null - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": null } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/ruckuswireless-hotzone.json b/tests/data/ruckuswireless-hotzone.json index 3b5417f95d..8c86ef8d3e 100644 --- a/tests/data/ruckuswireless-hotzone.json +++ b/tests/data/ruckuswireless-hotzone.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.25053.3.1.4.71", - "sysDescr": "Ruckus Wireless Inc (C) 2006", - "sysContact": null, - "version": "9.13.3.0.145 (US)", - "hardware": "R500", - "features": null, - "os": "ruckuswireless-hotzone", - "type": "wireless", - "serial": "", - "icon": "ruckus.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/ruckuswireless-sz.json b/tests/data/ruckuswireless-sz.json index 6032a1b51a..65ffc7103b 100644 --- a/tests/data/ruckuswireless-sz.json +++ b/tests/data/ruckuswireless-sz.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.25053.3.1.11.1", - "sysDescr": "SmartZone", - "sysContact": null, - "version": "3.6.2.0.78 (US)", - "hardware": "SZ104", - "features": "Licenses: 40/76", - "os": "ruckuswireless-sz", - "type": "wireless", - "serial": "211838000212", - "icon": "ruckus.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/ruckuswireless-unleashed.json b/tests/data/ruckuswireless-unleashed.json index 18fb59f2ac..b24aa34f58 100644 --- a/tests/data/ruckuswireless-unleashed.json +++ b/tests/data/ruckuswireless-unleashed.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.25053.3.1.5.15", - "sysDescr": "Ruckus Wireless T300", - "sysContact": null, - "version": "200.6.10.1 build 312 (US)", - "hardware": "T300", - "features": null, - "os": "ruckuswireless-unleashed", - "type": "wireless", - "serial": "231603507471", - "icon": "ruckus.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/ruckuswireless_zd1100.json b/tests/data/ruckuswireless_zd1100.json index aa9450c151..57d1e6f10b 100644 --- a/tests/data/ruckuswireless_zd1100.json +++ b/tests/data/ruckuswireless_zd1100.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.25053.3.1.5.2", - "sysDescr": "Ruckus Wireless ZD1106", - "sysContact": null, - "version": "9.7.2.0 build 20 (US)", - "hardware": "ZD1106", - "features": "Licenses: 13/12", - "os": "ruckuswireless", - "type": "wireless", - "serial": "431323000588", - "icon": "ruckus.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/ruckuswireless_zd1200.json b/tests/data/ruckuswireless_zd1200.json index cfa543f2a4..ae4b11375f 100644 --- a/tests/data/ruckuswireless_zd1200.json +++ b/tests/data/ruckuswireless_zd1200.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.25053.3.1.5.15", - "sysDescr": "Ruckus Wireless ZD1200", - "sysContact": null, - "version": "9.13.3.0 build 145 (US)", - "hardware": "ZD1200", - "features": "Licenses: 8/10", - "os": "ruckuswireless", - "type": "wireless", - "serial": "051608001610", - "icon": "ruckus.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/ruijie.json b/tests/data/ruijie.json index f8b34bd678..e91a5df8ec 100644 --- a/tests/data/ruijie.json +++ b/tests/data/ruijie.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.4881.1.1.10.1.150", - "sysDescr": "Ruijie 10G Routing Switch(S6220-48XS4QXS) By Ruijie Networks", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "ruijie", - "type": "network", - "serial": null, - "icon": "ruijie.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/rutos-2xx.json b/tests/data/rutos-2xx.json index db31a10048..fa65575e32 100644 --- a/tests/data/rutos-2xx.json +++ b/tests/data/rutos-2xx.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux Teltonika-RUT240.com 3.18.44 #1 Fri Jun 7 08:39:02 UTC 2019 mips", - "sysContact": null, - "version": "RUT2XX_R_00.01.07.1", - "hardware": "RUT240", - "features": null, - "os": "rutos-2xx", - "type": "network", - "serial": "1101612740", - "icon": "teltonika.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/rutos.json b/tests/data/rutos.json index 83661397b1..1f41f8f40c 100644 --- a/tests/data/rutos.json +++ b/tests/data/rutos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux Teltonika-RUT955.com 3.18.44 #1 Tue Mar 12 11:58:56 UTC 2019 mips", - "sysContact": null, - "version": "3.18.44", - "hardware": "Generic MIPS", - "features": null, - "os": "rutos", - "type": "network", - "serial": null, - "icon": "teltonika.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/saf-cfm.json b/tests/data/saf-cfm.json index 324cf33792..1b454b2bce 100644 --- a/tests/data/saf-cfm.json +++ b/tests/data/saf-cfm.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.7571.100.1.1.2.22", - "sysDescr": "SAF microwave radio", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "saf-cfm", - "type": "wireless", - "serial": null, - "icon": "saf.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/saf-integra-b.json b/tests/data/saf-integra-b.json index b1e247a72b..dbfb5ae178 100644 --- a/tests/data/saf-integra-b.json +++ b/tests/data/saf-integra-b.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.7571.100.1.1.7.1", - "sysDescr": "Prod: Integra;Vers: 3.6.18;Timestamp: 2017-06-12 16:26:01;kernel: 3.15.0;rootfs: 0.0.5;fpga: 0.0.5;devicetree: 0.0.5;P/C: D18BSR03H;S/N: 382920100006", - "sysContact": null, - "version": "3.6.18", - "hardware": "Integra", - "features": null, - "os": "saf-integra-b", - "type": "wireless", - "serial": "382920100006", - "icon": "saf.png", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/saf-integra-e.json b/tests/data/saf-integra-e.json index 8a9ba53e12..ee2050a79e 100644 --- a/tests/data/saf-integra-e.json +++ b/tests/data/saf-integra-e.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.7571.100.1.1.7.9", - "sysDescr": "Prod: Integra-E;Vers: 3.17.10;Timestamp: 2020-05-05 13:34:59;kernel: 4.14.0;rootfs: 0.0.5;fpga: 0.0.5;devicetree: 0.0.5;radio: RAVRAVRAVRAVRAV;uboot: 2017.01.01;eth_switch_fw: 6.5.15.5;P/C: D80R0U01L;S/N: 393300200125", - "sysContact": null, - "version": "3.17.10", - "hardware": "Integra-E", - "features": null, - "os": "saf-integra-e", - "type": "wireless", - "serial": "393300200125", - "icon": "saf.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/saf-integra-w.json b/tests/data/saf-integra-w.json index 68ea79c4e0..9a86d52c0a 100644 --- a/tests/data/saf-integra-w.json +++ b/tests/data/saf-integra-w.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.7571.100.1.1.7.2", - "sysDescr": "Prod: Integra-W;Vers: 3.6.17-mux;Timestamp: 2017-05-24 16:00:47;kernel: 3.15.0;rootfs: 0.0.5;fpga: 0.0.5;devicetree: 0.0.5;P/C: D18WSR03L;S/N: 391340100285", - "sysContact": null, - "version": "3.6.17-mux", - "hardware": "Integra-W", - "features": null, - "os": "saf-integra-w", - "type": "wireless", - "serial": "391340100285", - "icon": "saf.png", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/saf_lumina.json b/tests/data/saf_lumina.json index f043d092fe..2b27114eb4 100644 --- a/tests/data/saf_lumina.json +++ b/tests/data/saf_lumina.json @@ -305,24 +305,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.7571.100.1.1.5.1", - "sysDescr": "SAF microwave radio;CFIP Lumina FODU v2.64.33;Model:2;HW:15;SN: 000000000000;PC: I11HJT05HA;IDU PCB: I0BMDB05_R07", - "sysContact": null, - "version": "2.64.33", - "hardware": "CFIP Lumina FODU", - "features": null, - "os": "saf", - "type": "wireless", - "serial": "000000000000", - "icon": "saf.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -339,6 +321,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/saf_phoenix.json b/tests/data/saf_phoenix.json index 2a840adf0a..12aec8606c 100644 --- a/tests/data/saf_phoenix.json +++ b/tests/data/saf_phoenix.json @@ -305,24 +305,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.7571.100.1.1.5.1", - "sysDescr": "SAF microwave radio;CFIP PhoeniX IDU v1.63.46;Model:3;HW:6;SN: 000000000000;PC: S0GIPT11", - "sysContact": null, - "version": "1.63.46", - "hardware": "CFIP PhoeniX IDU", - "features": null, - "os": "saf", - "type": "wireless", - "serial": "000000000000", - "icon": "saf.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -339,6 +321,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/schleifenbauer.json b/tests/data/schleifenbauer.json index 072377f8e4..59d1e25481 100644 --- a/tests/data/schleifenbauer.json +++ b/tests/data/schleifenbauer.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.31034.11.1", - "sysDescr": "Schleifenbauer", - "sysContact": null, - "version": "250 (180821PL1736)", - "hardware": "SSDCHIN1307-002", - "features": null, - "os": "schleifenbauer", - "type": "power", - "serial": "SVNL00056319", - "icon": "schleifenbauer.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/schleifenbauer_dpm27e.json b/tests/data/schleifenbauer_dpm27e.json index 2411303bb8..23d6b4ade2 100644 --- a/tests/data/schleifenbauer_dpm27e.json +++ b/tests/data/schleifenbauer_dpm27e.json @@ -6,7 +6,7 @@ "sysName": "", "sysObjectID": ".1.3.6.1.4.1.31034.11.3", "sysDescr": "Schleifenbauer", - "sysContact": null, + "sysContact": "", "version": "250 (180914PL1760)", "hardware": "", "features": null, @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.31034.11.3", - "sysDescr": "Schleifenbauer", - "sysContact": "", - "version": "250 (180914PL1760)", - "hardware": null, - "features": null, - "os": "schleifenbauer", - "type": "power", - "serial": "SVNL00655429", - "icon": "schleifenbauer.svg", - "location": "" - } - ] - } + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/screenos.json b/tests/data/screenos.json index e2bd6f3c87..e96c1f57b4 100644 --- a/tests/data/screenos.json +++ b/tests/data/screenos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.3224.1.29", - "sysDescr": "SSG5-Serial version 6.3.0r24.0 (SN: 0000000000000000, Firewall+VPN)", - "sysContact": null, - "version": "6.3.0r24.0", - "hardware": "SSG5-Serial", - "features": "Firewall+VPN", - "os": "screenos", - "type": "firewall", - "serial": "0000000000000000", - "icon": "screenos.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/scs-ks.json b/tests/data/scs-ks.json index a189cd5ba5..3976928c62 100644 --- a/tests/data/scs-ks.json +++ b/tests/data/scs-ks.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9839", - "sysDescr": "CAREL cpCO controller", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "scs-ks", - "type": "environment", - "serial": null, - "icon": "carel.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/secureplatform.json b/tests/data/secureplatform.json index d165adf09e..0f0e3b5a30 100644 --- a/tests/data/secureplatform.json +++ b/tests/data/secureplatform.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.10", - "sysDescr": "Linux hostname #1 2.6.18-92cp SMP Thu Apr 12 03:28:54 IDT 2012 i686", - "sysContact": null, - "version": "R75.40", - "hardware": null, - "features": null, - "os": "secureplatform", - "type": "firewall", - "serial": null, - "icon": "checkpoint.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/sensatronics-em1.json b/tests/data/sensatronics-em1.json index f1585ab5a9..37296b288e 100644 --- a/tests/data/sensatronics-em1.json +++ b/tests/data/sensatronics-em1.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.16174.1.1.3", - "sysDescr": "Sensatronics EM1", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "sensatronics-em1", - "type": "sensor", - "serial": null, - "icon": "sensatronics.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/sensatronics-ittm.json b/tests/data/sensatronics-ittm.json index 230e14448c..c3be17c91a 100644 --- a/tests/data/sensatronics-ittm.json +++ b/tests/data/sensatronics-ittm.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.16174.1.1.1", - "sysDescr": "IT", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "sensatronics-ittm", - "type": "environment", - "serial": null, - "icon": "sensatronics.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/sentry3.json b/tests/data/sentry3.json index f5e7eecf20..f08f10a34e 100644 --- a/tests/data/sentry3.json +++ b/tests/data/sentry3.json @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1718.3", - "sysDescr": "Sentry Switched CDU", - "sysContact": null, - "version": "7.1a", - "hardware": "CW-24V2C458C1", - "features": null, - "os": "sentry3", - "type": "power", - "serial": "ADLH0001862", - "icon": "servertech.png", - "location": null - } - ] - } + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/sentry4.json b/tests/data/sentry4.json index 9b25d54222..25ee768048 100644 --- a/tests/data/sentry4.json +++ b/tests/data/sentry4.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1718.4", - "sysDescr": "Sentry Smart PDU", - "sysContact": null, - "version": "Version 8.0n", - "hardware": "C2S42CE-YCMFAM00", - "features": null, - "os": "sentry4", - "type": "power", - "serial": "", - "icon": "servertech.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/serverscheck.json b/tests/data/serverscheck.json index 3247b68774..c9a0859986 100644 --- a/tests/data/serverscheck.json +++ b/tests/data/serverscheck.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.17095", - "sysDescr": "Temperature & Sensor Gateway", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "serverscheck", - "type": "network", - "serial": null, - "icon": "serverscheck.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/siklu.json b/tests/data/siklu.json index 14282e01d8..45f2f6e684 100644 --- a/tests/data/siklu.json +++ b/tests/data/siklu.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.31926", - "sysDescr": "EH-1200TL", - "sysContact": null, - "version": "3.7.6.24444 2018-07-19 15:13:12", - "hardware": "EH-1200TL", - "features": null, - "os": "siklu", - "type": "wireless", - "serial": "F410060602", - "icon": "siklu.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/siteboss.json b/tests/data/siteboss.json index 839d1d513e..66d28a9ee5 100644 --- a/tests/data/siteboss.json +++ b/tests/data/siteboss.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.3052.12.3.2", - "sysDescr": "SiteBoss 530 2.10.540 STD", - "sysContact": null, - "version": "2.10.540 STD", - "hardware": "SiteBoss 530", - "features": null, - "os": "siteboss", - "type": "server", - "serial": null, - "icon": "siteboss.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/siteboss550.json b/tests/data/siteboss550.json index ced93b3b7a..4cb3bb287a 100644 --- a/tests/data/siteboss550.json +++ b/tests/data/siteboss550.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.3052.10.3.2", - "sysDescr": "SiteBoss 550 2.11.280 STD", - "sysContact": null, - "version": "2.11.280 STD", - "hardware": "SiteBoss 550", - "features": null, - "os": "siteboss550", - "type": "server", - "serial": null, - "icon": "siteboss.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/sitemonitor.json b/tests/data/sitemonitor.json index adc8d7e469..965b14db4a 100644 --- a/tests/data/sitemonitor.json +++ b/tests/data/sitemonitor.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.32050.1.1", - "sysDescr": "PacketFlux SiteMonitor Base II", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "sitemonitor", - "type": "appliance", - "serial": null, - "icon": "packetflux.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/sixnet.json b/tests/data/sixnet.json index d500a15aa1..e992e38176 100644 --- a/tests/data/sixnet.json +++ b/tests/data/sixnet.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.20540.2.1", - "sysDescr": "SLX-8MS-1 - Industrial Ethernet Managed Switch", - "sysContact": null, - "version": "5.0.168", - "hardware": null, - "features": null, - "os": "sixnet", - "type": "network", - "serial": null, - "icon": "sixnet.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/sm-os.json b/tests/data/sm-os.json index 26abf24dd7..65863edbd0 100644 --- a/tests/data/sm-os.json +++ b/tests/data/sm-os.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.3373.1103", - "sysDescr": "ALFOplus2 - SIAE Microelettronica", - "sysContact": null, - "version": "N50052 01.05.00", - "hardware": "(GC8503)", - "features": null, - "os": "sm-os", - "type": "wireless", - "serial": null, - "icon": "siae.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/sm-os_gc8607.json b/tests/data/sm-os_gc8607.json index 0946733f76..36e2395838 100644 --- a/tests/data/sm-os_gc8607.json +++ b/tests/data/sm-os_gc8607.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.3373.1103", - "sysDescr": "ALFOplus2 - SIAE Microelettronica", - "sysContact": null, - "version": "N50052 01.05.00", - "hardware": "ALFOPlus2 (GC8607)", - "features": null, - "os": "sm-os", - "type": "wireless", - "serial": "00000000000000A", - "icon": "siae.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/smartax-mdu.json b/tests/data/smartax-mdu.json index ff54b6be89..387300873d 100644 --- a/tests/data/smartax-mdu.json +++ b/tests/data/smartax-mdu.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2011.2.185", - "sysDescr": "Huawei Integrated Access Software", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "smartax-mdu", - "type": "network", - "serial": null, - "icon": "huawei.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/smartax.json b/tests/data/smartax.json index dff1b9662f..a8c6589c64 100644 --- a/tests/data/smartax.json +++ b/tests/data/smartax.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2011.2.115", - "sysDescr": "Huawei Integrated Access Software", - "sysContact": null, - "version": "MA5680V800R017C00B058", - "hardware": "MA5600T", - "features": null, - "os": "smartax", - "type": "network", - "serial": "020ANHT0E3016082", - "icon": "huawei.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/snr-erd.json b/tests/data/snr-erd.json index c7ed11b387..c7ccbc3d43 100644 --- a/tests/data/snr-erd.json +++ b/tests/data/snr-erd.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.40418.2.6", - "sysDescr": "SNR-ERD-4; SW: 2.5.9 ; HW:4.5; LD:1.0", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "snr-erd", - "type": "network", - "serial": null, - "icon": "snr.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/snr.json b/tests/data/snr.json index 24c05a5428..50ad6ddf2f 100644 --- a/tests/data/snr.json +++ b/tests/data/snr.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.40418.7.53", - "sysDescr": "SNR-S2990X-24FQ Device, Compiled Jan 10 13:47:05 2019", - "sysContact": null, - "version": "7.5.3.2(R0010.0044)", - "hardware": "1.0.1", - "features": null, - "os": "snr", - "type": "network", - "serial": null, - "icon": "snr.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { @@ -6838,7 +6821,7 @@ "group": "Optical TX", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 0, + "sensor_current": -0, "sensor_limit": null, "sensor_limit_warn": null, "sensor_limit_low": null, diff --git a/tests/data/socomec.json b/tests/data/socomec.json index 056e2f93b6..642a7a8f3c 100644 --- a/tests/data/socomec.json +++ b/tests/data/socomec.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.4555.2.30", - "sysDescr": "PDU SNMP Agent", - "sysContact": null, - "version": "FW 00 / SW 01.09.0f", - "hardware": "NRT-OP-PDU1-28", - "features": null, - "os": "socomec", - "type": "power", - "serial": "YD17190028 A", - "icon": "socomecpdu.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/solidserver.json b/tests/data/solidserver.json index 0c65152193..20a29540cb 100644 --- a/tests/data/solidserver.json +++ b/tests/data/solidserver.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2440", - "sysDescr": "EfficientIP SOLIDserver", - "sysContact": null, - "version": "6.0.2.P0a", - "hardware": "SOLIDserver-260", - "features": null, - "os": "solidserver", - "type": "server", - "serial": "FXLQ3K2", - "icon": "eip.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/sonicwall.json b/tests/data/sonicwall.json index 347ae1d8a6..4a12922c9c 100644 --- a/tests/data/sonicwall.json +++ b/tests/data/sonicwall.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8741.1", - "sysDescr": "SonicWALL TZ 210 (SonicOS Enhanced 5.9.1.6-5o)", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "sonicwall", - "type": "firewall", - "serial": null, - "icon": "sonicwall.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/sonicwall_sma-400.json b/tests/data/sonicwall_sma-400.json index 46d5ba8c7d..f0070f83ba 100644 --- a/tests/data/sonicwall_sma-400.json +++ b/tests/data/sonicwall_sma-400.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8741.6", - "sysDescr": "SonicWall SMA 400 (8.6.0.3-11sv)", - "sysContact": null, - "version": "(Firmware 8.6.0.3-11sv / ROM 5.0.0.5)", - "hardware": "SMA 400", - "features": null, - "os": "sonicwall", - "type": "firewall", - "serial": "18B1697FEE2C", - "icon": "sonicwall.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/sonus-sbc.json b/tests/data/sonus-sbc.json index 1e1ecab332..c4f7fb5979 100644 --- a/tests/data/sonus-sbc.json +++ b/tests/data/sonus-sbc.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.177.15.1.1.2", - "sysDescr": "Sonus SBC Portfolio", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "sonus-sbc", - "type": "appliance", - "serial": null, - "icon": "ribbon.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/sophos-xg.json b/tests/data/sophos-xg.json index ab5a408483..140e3b752c 100644 --- a/tests/data/sophos-xg.json +++ b/tests/data/sophos-xg.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2604.5", - "sysDescr": "Linux localhost 4.14.38 #2 SMP Fri Jun 5 23:03:53 UTC 2020 x86_64", - "sysContact": null, - "version": "18.0.1 MR-1-Build396", - "hardware": "SFVH_SO01_SFOS", - "features": null, - "os": "sophos-xg", - "type": "appliance", - "serial": "C01001GF24TPDE1", - "icon": "sophos-xg.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/sslvis.json b/tests/data/sslvis.json index add651b0da..ac38352c45 100644 --- a/tests/data/sslvis.json +++ b/tests/data/sslvis.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.3417.1.5.1", - "sysDescr": "Blue Coat SSL Visibility Appliance SV800-500M", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "sslvis", - "type": "network", - "serial": null, - "icon": "bluecoat.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ssu2000.json b/tests/data/ssu2000.json index 1ec70e652c..ce3f4dea36 100644 --- a/tests/data/ssu2000.json +++ b/tests/data/ssu2000.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.601.3.1.1", - "sysDescr": "SSU-2000, Synchronization Supply Unit", - "sysContact": null, - "version": "14313012-003-5", - "hardware": "Communication Module 23413012-000-0", - "features": "NTP ena", - "os": "ssu2000", - "type": "appliance", - "serial": "R04334", - "icon": "microsemi.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/stoneos.json b/tests/data/stoneos.json index a1d403407b..fab9be8f90 100644 --- a/tests/data/stoneos.json +++ b/tests/data/stoneos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.28557.1.126", - "sysDescr": "Hillstone Security Appliance SG-6000-E3965", - "sysContact": null, - "version": "5.5", - "hardware": "SG-6000-E3965", - "features": null, - "os": "stoneos", - "type": "network", - "serial": "", - "icon": "hillstone.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/swos.json b/tests/data/swos.json index 3236914fd6..aedab34819 100644 --- a/tests/data/swos.json +++ b/tests/data/swos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.14988.2", - "sysDescr": "CSS106-1G-4P-1S SwOS v2.11", - "sysContact": null, - "version": "v2.11", - "hardware": "CSS106-1G-4P-1S", - "features": null, - "os": "swos", - "type": "network", - "serial": null, - "icon": "mikrotik.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/tait-infra93.json b/tests/data/tait-infra93.json index 18add77b6e..2742d2482d 100644 --- a/tests/data/tait-infra93.json +++ b/tests/data/tait-infra93.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.3570.2.2", - "sysDescr": "Tait Communications, TB9300/TB7300, DMR Base Station, QBC30BSM, Version: dmr-3.05.00.0007", - "sysContact": null, - "version": "dmr-3.05.00.0007", - "hardware": "TB9300/TB7300", - "features": null, - "os": "tait-infra93", - "type": "network", - "serial": "18271180", - "icon": "tait.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/teldat.json b/tests/data/teldat.json index 49437f9098..70c593566c 100644 --- a/tests/data/teldat.json +++ b/tests/data/teldat.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2007.1.1.199", - "sysDescr": "Router model M1L 1FELAN 4FESW IPSec SNA VoIP T+ 34 156 CPU QorIQ P101X S/N: 819/01144 Teldat (c)1996 - 2018", - "sysContact": null, - "version": "11.01.00.20.18", - "hardware": "312 (rev 2)", - "features": null, - "os": "teldat", - "type": "network", - "serial": "1144", - "icon": "teldat.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/terra_sti410c.json b/tests/data/terra_sti410c.json index 3794b34014..cbaa41ceab 100644 --- a/tests/data/terra_sti410c.json +++ b/tests/data/terra_sti410c.json @@ -36,24 +36,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.30631.1.9", - "sysDescr": "Terra DVB-T/T2/C to IP streamer sti410C", - "sysContact": null, - "version": null, - "hardware": "sti410C", - "features": null, - "os": "terra", - "type": "appliance", - "serial": null, - "icon": "terra.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/terra_sti440.json b/tests/data/terra_sti440.json index ba5521f016..9c5494e1f0 100644 --- a/tests/data/terra_sti440.json +++ b/tests/data/terra_sti440.json @@ -36,24 +36,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.30631.1.18", - "sysDescr": "Terra four channel DVB-T/T2/C to IP streamer sti440", - "sysContact": null, - "version": null, - "hardware": "sti440", - "features": null, - "os": "terra", - "type": "appliance", - "serial": null, - "icon": "terra.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/thomson-cm.json b/tests/data/thomson-cm.json index 74e8244a2a..108a7b5cf5 100644 --- a/tests/data/thomson-cm.json +++ b/tests/data/thomson-cm.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2863.205.43014.420.4.0.82.4.5", - "sysDescr": "Thomson DOCSIS Cable Modem <>", - "sysContact": null, - "version": "ST52.04.05", - "hardware": "TCM420", - "features": null, - "os": "thomson-cm", - "type": "network", - "serial": null, - "icon": "thomson-cm.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/timos.json b/tests/data/timos.json index f7c619130d..fcc5113b00 100644 --- a/tests/data/timos.json +++ b/tests/data/timos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6527.6.2.1.2.6.1", - "sysDescr": "TiMOS-C-10.0.R4 cpm/hops Nokia SAS-R 7210 Copyright (c) 2000-2018 Nokia.\nAll rights reserved. All use subject to applicable license agreements.\r\nBuilt on Mon Apr 30 12:30:30 IST 2018 by sasbuild in /home/sasbuild/10.0B1/R4/panos/main", - "sysContact": null, - "version": "10.0.R4", - "hardware": "7210 SAS-R6", - "features": null, - "os": "timos", - "type": "network", - "serial": "NS1806C3752", - "icon": "nokia.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/topvision.json b/tests/data/topvision.json index 7e20ebc902..d197f11aaa 100644 --- a/tests/data/topvision.json +++ b/tests/data/topvision.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.32285.11.1.1.1.4.1", - "sysDescr": "CC8800D-E;hardware version:V2.2.4;software version:V2.3.0.54-C.BT;firm-Software version:430B3-V2.3.0.17BT;Chip version:BCM3218 2.44, 0.1.13, 0.2.2, 0.2.2", - "sysContact": null, - "version": "2.3.0.54-C.BT", - "hardware": "2.2.4", - "features": null, - "os": "topvision", - "type": "network", - "serial": "1705CC8800D360039", - "icon": "sumavision.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/transition.json b/tests/data/transition.json index 4b8db5f721..e905838353 100644 --- a/tests/data/transition.json +++ b/tests/data/transition.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.868.1.5.2.6", - "sysDescr": "S3290-42 GigaBit Ethernet Switch", - "sysContact": null, - "version": null, - "hardware": "SM8TAT2SA", - "features": null, - "os": "transition", - "type": "network", - "serial": null, - "icon": "transition.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/trendnet.json b/tests/data/trendnet.json index 58cfad015e..ed2dbe26fe 100644 --- a/tests/data/trendnet.json +++ b/tests/data/trendnet.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.28866.2.49", - "sysDescr": "TEG-S80ES", - "sysContact": null, - "version": null, - "hardware": "TEG-S80ES", - "features": null, - "os": "trendnet", - "type": "network", - "serial": null, - "icon": "trendnet.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/truenas.json b/tests/data/truenas.json index 27ec8048cb..a455475760 100644 --- a/tests/data/truenas.json +++ b/tests/data/truenas.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.8072.3.2.8", - "sysDescr": "TrueNAS-11.2-U7 (b088e78e8d). Hardware: amd64 Intel(R) Xeon(R) CPU E5-2620 v2 @ 2.10GHz running at 2100. Software: FreeBSD 11.2-STABLE (revision 199506)", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "truenas", - "type": "storage", - "serial": null, - "icon": "truenas.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/truenas_11-3.json b/tests/data/truenas_11-3.json index 94314b6cf7..8c3fe9a71a 100644 --- a/tests/data/truenas_11-3.json +++ b/tests/data/truenas_11-3.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.50536.3.1", - "sysDescr": "FreeNAS-11.3-U2.1 (6a6a2dfda7). Hardware: amd64 Intel(R) Core(TM) i5-7267U CPU @ 3.10GHz running at 3095. Software: FreeBSD 11.3-RELEASE-p7 (revision 199506)", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "truenas", - "type": "storage", - "serial": null, - "icon": "truenas.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ts-bspdu.json b/tests/data/ts-bspdu.json index 1a17ae730e..52906f7189 100644 --- a/tests/data/ts-bspdu.json +++ b/tests/data/ts-bspdu.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.42610.1.4.4", - "sysDescr": "PWT_v3.10.6", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "ts-bspdu", - "type": "power", - "serial": null, - "icon": "bladeshelterpdu.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ubiquoss-pon_9500.json b/tests/data/ubiquoss-pon_9500.json index a0f56eefe7..dcc13a19b5 100644 --- a/tests/data/ubiquoss-pon_9500.json +++ b/tests/data/ubiquoss-pon_9500.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.7800.1.152", - "sysDescr": "C9500", - "sysContact": null, - "version": null, - "hardware": "C9500", - "features": null, - "os": "ubiquoss-pon", - "type": "network", - "serial": "U34M16450002", - "icon": "generic.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/ucos_2.json b/tests/data/ucos_2.json index bbe7ede719..dd199426de 100644 --- a/tests/data/ucos_2.json +++ b/tests/data/ucos_2.json @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.12.3.1.3.1062", - "sysDescr": "Cisco NX-OS(tm) ucs, Software (ucs-6100-k9-system), Version 5.0(3)N2(3.13b), RELEASE SOFTWARE Copyright (c) 2002-2013 by Cisco Systems, Inc. Compiled 6/28/2017 0:00:00", - "sysContact": null, - "version": null, - "hardware": "ciscoModules.3.1.3.1062", - "features": null, - "os": "ucos", - "type": "collaboration", - "serial": null, - "icon": "cisco.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/ucos_cer.json b/tests/data/ucos_cer.json index 7cbb4a8bea..b80797a09e 100644 --- a/tests/data/ucos_cer.json +++ b/tests/data/ucos_cer.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.1348", - "sysDescr": "Linux release:2.6.32-573.18.1.el6.x86_64 machine:x86_64", - "sysContact": null, - "version": "11.5.4.50000-6", - "hardware": "ciscoUCVirtualMachine", - "features": "CER", - "os": "ucos", - "type": "collaboration", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/ucos_cuc.json b/tests/data/ucos_cuc.json index a2bebe4f93..10240453bb 100644 --- a/tests/data/ucos_cuc.json +++ b/tests/data/ucos_cuc.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.1348", - "sysDescr": "Hardware:VMware, 1 Intel(R) Xeon(R) CPU E5-2660 0 @ 2.20GHz, 4096 MB Memory: Software:UCOS 6.0.0.0-2.i386", - "sysContact": null, - "version": "10.5.2.18900-15", - "hardware": "ciscoUCVirtualMachine", - "features": "CUC", - "os": "ucos", - "type": "collaboration", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/ucos_cucm.json b/tests/data/ucos_cucm.json index cffff1981e..4037aa7e6d 100644 --- a/tests/data/ucos_cucm.json +++ b/tests/data/ucos_cucm.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.1348", - "sysDescr": "Linux release:2.6.32-573.18.1.el6.x86_64 machine:x86_64", - "sysContact": null, - "version": "11.5.1.15900-18", - "hardware": "ciscoUCVirtualMachine", - "features": "CUCM", - "os": "ucos", - "type": "collaboration", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/ucos_uccx.json b/tests/data/ucos_uccx.json index ad1cf1e7ea..5c9707f1d9 100644 --- a/tests/data/ucos_uccx.json +++ b/tests/data/ucos_uccx.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.9.1.1348", - "sysDescr": "Linux release:2.6.32-573.18.1.el6.x86_64 machine:x86_64", - "sysContact": null, - "version": "11.6.2.10000-38", - "hardware": "ciscoUCVirtualMachine", - "features": "UCCX", - "os": "ucos", - "type": "collaboration", - "serial": null, - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/unifi.json b/tests/data/unifi.json index cf26698de9..1f37422d22 100644 --- a/tests/data/unifi.json +++ b/tests/data/unifi.json @@ -575,24 +575,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.10002.1", - "sysDescr": "Linux 3.3.8 #1 Wed Jan 18 09:26:53 PST 2017 mips", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "unifi", - "type": "wireless", - "serial": null, - "icon": "ubiquiti.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -609,7 +591,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "mempools": { "discovery": { diff --git a/tests/data/valere.json b/tests/data/valere.json index 862035a80d..7154d26c5b 100644 --- a/tests/data/valere.json +++ b/tests/data/valere.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.13858", - "sysDescr": "Sys Description", - "sysContact": null, - "version": "4.01.40", - "hardware": "BC2000", - "features": "vpwrDcPowerRectifier, vpwrDcPowerRectifier", - "os": "valere", - "type": "power", - "serial": null, - "icon": "eltek.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/vigintos.json b/tests/data/vigintos.json index 7ce4c7d87b..23d43f54d5 100644 --- a/tests/data/vigintos.json +++ b/tests/data/vigintos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.27993.5", - "sysDescr": "Host Controller", - "sysContact": null, - "version": "Host Controller MD2021-261/15", - "hardware": null, - "features": null, - "os": "vigintos", - "type": "network", - "serial": null, - "icon": "vigintos.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/viprinux.json b/tests/data/viprinux.json index c92db1e2a7..e952d68786 100644 --- a/tests/data/viprinux.json +++ b/tests/data/viprinux.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": null, - "sysDescr": "Viprinet VPN Router", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "viprinux", - "type": "network", - "serial": null, - "icon": "viprinux.png", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/viptela_vedge1000.json b/tests/data/viptela_vedge1000.json index f49ddd940a..4c03b69cf9 100644 --- a/tests/data/viptela_vedge1000.json +++ b/tests/data/viptela_vedge1000.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.41916.3.2.4", - "sysDescr": "Viptela SNMP agent", - "sysContact": null, - "version": "17.2.2", - "hardware": "Viptela vEdge-1000", - "features": null, - "os": "viptela", - "type": "network", - "serial": "11OG440170513", - "icon": "cisco.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/vivotek.json b/tests/data/vivotek.json index 97cd30411a..e00e6b9d24 100644 --- a/tests/data/vivotek.json +++ b/tests/data/vivotek.json @@ -439,24 +439,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.23465", - "sysDescr": "Mega-Pixel Network Camera", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "vivotek", - "type": "camera", - "serial": null, - "icon": "vivotek.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -473,6 +455,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/vmware-esxi.json b/tests/data/vmware-esxi.json index dec5179ba5..d98349e162 100644 --- a/tests/data/vmware-esxi.json +++ b/tests/data/vmware-esxi.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6876.4.1", - "sysDescr": "VMware ESXi 7.0.0 build-15843807 VMware, Inc. x86_64", - "sysContact": null, - "version": "7.0.0", - "hardware": "HP ProLiant DL380p Gen8", - "features": "build 15843807", - "os": "vmware-esxi", - "type": "server", - "serial": "CZ162913BZ", - "icon": "vmware.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/vmware-vcsa.json b/tests/data/vmware-vcsa.json index a13cb7fe66..910094ddf2 100644 --- a/tests/data/vmware-vcsa.json +++ b/tests/data/vmware-vcsa.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.6876.4.6", - "sysDescr": "VMware-vCenter-Server-Appliance 7.0.0.10100 generic build 16386292 VMware, Inc. x86_64", - "sysContact": null, - "version": "7.0.0.10100", - "hardware": null, - "features": "build 16386292", - "os": "vmware-vcsa", - "type": "server", - "serial": null, - "icon": "vmware.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/voss_7432cq.json b/tests/data/voss_7432cq.json index eec61c9ea3..17ad3db318 100644 --- a/tests/data/voss_7432cq.json +++ b/tests/data/voss_7432cq.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1916.2.302", - "sysDescr": "VSP-7432CQ (8.0.5.0)", - "sysContact": null, - "version": "8.0.5.0", - "hardware": "VSP-7432CQ", - "features": null, - "os": "voss", - "type": "network", - "serial": "1914Q-20413", - "icon": "extremevoss.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/voss_8404.json b/tests/data/voss_8404.json index 918f1a6205..67d7c34543 100644 --- a/tests/data/voss_8404.json +++ b/tests/data/voss_8404.json @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2272.208", - "sysDescr": "VSP-8404 (5.1.1.1)", - "sysContact": null, - "version": "5.1.1.1", - "hardware": "VSP-8404", - "features": null, - "os": "voss", - "type": "network", - "serial": null, - "icon": "extremevoss.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/voss_8404c.json b/tests/data/voss_8404c.json index 6dc7c56221..7bbc535951 100644 --- a/tests/data/voss_8404c.json +++ b/tests/data/voss_8404c.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2272.220", - "sysDescr": "VSP-8404C (6.1.2.1)", - "sysContact": null, - "version": "6.1.2.1", - "hardware": "VSP-8404C", - "features": null, - "os": "voss", - "type": "network", - "serial": "17JP2240CR05", - "icon": "extremevoss.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/voss_8608.json b/tests/data/voss_8608.json index 14a8651b58..ddb3847cc2 100644 --- a/tests/data/voss_8608.json +++ b/tests/data/voss_8608.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2272.212", - "sysDescr": "VSP-8608 (6.2.0.2)", - "sysContact": null, - "version": "6.2.0.2", - "hardware": "VSP-8608", - "features": null, - "os": "voss", - "type": "network", - "serial": "18ND1240D10P", - "icon": "extremevoss.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/voss_9012.json b/tests/data/voss_9012.json index 42bdeba3c9..6bca78984e 100644 --- a/tests/data/voss_9012.json +++ b/tests/data/voss_9012.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2272.201", - "sysDescr": "VSP-9012 (4.1.4.1) (GA)", - "sysContact": null, - "version": "4.1.4.1", - "hardware": "VSP-9012", - "features": null, - "os": "voss", - "type": "network", - "serial": "LBNNTMRJ0003NP", - "icon": "extremevoss.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/voss_xa1440.json b/tests/data/voss_xa1440.json index a769134598..81c70656eb 100644 --- a/tests/data/voss_xa1440.json +++ b/tests/data/voss_xa1440.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1916.2.337", - "sysDescr": "XA1440 (8.2.0.0_B020) (PRIVATE)", - "sysContact": null, - "version": "8.2.0.0_B020", - "hardware": "XA1440", - "features": null, - "os": "voss", - "type": "network", - "serial": "1931C-W0153", - "icon": "extremevoss.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/vrp_5720-32x-ei.json b/tests/data/vrp_5720-32x-ei.json index ab9260af90..a7fdffe979 100644 --- a/tests/data/vrp_5720-32x-ei.json +++ b/tests/data/vrp_5720-32x-ei.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2011.2.23.294", - "sysDescr": "S5720-32X-EI-24S-AC\nHuawei Versatile Routing Platform Software \r\n VRP (R) software,Version 5.170 (S5720 V200R010C00SPC600) \r\n Copyright (C) 2007 Huawei Technologies Co., Ltd.", - "sysContact": null, - "version": "5.170 (V200R010C00SPC600) [4]", - "hardware": "S5720-32X-EI-24S-AC", - "features": null, - "os": "vrp", - "type": "network", - "serial": null, - "icon": "huawei.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/vrp_5720-vrf.json b/tests/data/vrp_5720-vrf.json index 1bf619b6de..505f0b838e 100644 --- a/tests/data/vrp_5720-vrf.json +++ b/tests/data/vrp_5720-vrf.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2011.2.23.291", - "sysDescr": "S5720-56C-PWR-EI-AC\nHuawei Versatile Routing Platform Software \r\n VRP (R) software,Version 5.170 (S5720 V200R010C00SPC600) \r\n Copyright (C) 2007 Huawei Technologies Co., Ltd.", - "sysContact": null, - "version": "5.170 (V200R010C00SPC600) [4]", - "hardware": "S5720-56C-PWR-EI-AC", - "features": null, - "os": "vrp", - "type": "network", - "serial": null, - "icon": "huawei.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/vrp_5720.json b/tests/data/vrp_5720.json index 549c528e75..a45024c360 100644 --- a/tests/data/vrp_5720.json +++ b/tests/data/vrp_5720.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2011.2.23.291", - "sysDescr": "S5720-56C-PWR-EI-AC\nHuawei Versatile Routing Platform Software \r\n VRP (R) software,Version 5.170 (S5720 V200R010C00SPC600) \r\n Copyright (C) 2007 Huawei Technologies Co., Ltd.", - "sysContact": null, - "version": "5.170 (V200R010C00SPC600) [4]", - "hardware": "S5720-56C-PWR-EI-AC", - "features": null, - "os": "vrp", - "type": "network", - "serial": null, - "icon": "huawei.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/vrp_ac6605-26.json b/tests/data/vrp_ac6605-26.json index cff23161f8..8c837b8511 100644 --- a/tests/data/vrp_ac6605-26.json +++ b/tests/data/vrp_ac6605-26.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2011.2.240.6", - "sysDescr": "Huawei AC6605-26-PWR Huawei Versatile Routing Platform Software VRP (R) software,Version 5.170 (AC6605-26-PWR V200R010C00SPC500) Copyright (C) 2011-2019 Huawei Technologies Co., Ltd", - "sysContact": null, - "version": "5.170 (V200R010C00SPC500) [4]", - "hardware": "AC6605-26-PWR", - "features": null, - "os": "vrp", - "type": "network", - "serial": "21023579169WJ6000038", - "icon": "huawei.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/vrp_ar169sfp.json b/tests/data/vrp_ar169sfp.json index f1535d23ab..227ca3f7ea 100644 --- a/tests/data/vrp_ar169sfp.json +++ b/tests/data/vrp_ar169sfp.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2011.2.224.62", - "sysDescr": "Huawei AR169F Huawei Versatile Routing Platform Software VRP (R) software,Version 5.170 (AR160 V200R009C00SPC500) Copyright (C) 2011-2018 Huawei Technologies Co., Ltd", - "sysContact": null, - "version": "5.170 (V200R009C00SPC500) [ARV200R009SPH025]", - "hardware": "AR169F", - "features": null, - "os": "vrp", - "type": "network", - "serial": "21500101573GK1000299", - "icon": "huawei.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/vrp_ce12804-entity.json b/tests/data/vrp_ce12804-entity.json index bc2f5467c2..566c1294ec 100644 --- a/tests/data/vrp_ce12804-entity.json +++ b/tests/data/vrp_ce12804-entity.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2011.2.239.1", - "sysDescr": "Huawei Versatile Routing Platform Software\nVRP (R) software, Version 8.150 (CE12800 V200R002C50SPC800) \r\nCopyright (C) 2012-2017 Huawei Technologies Co., Ltd. \r\nHUAWEICE12804", - "sysContact": null, - "version": "8.150 (V200R002C50SPC800) [CE12804,CE12804-AC,CE12804 AC Assembly Chassis(with CMUs and Fans)]", - "hardware": "CE12800", - "features": null, - "os": "vrp", - "type": "network", - "serial": null, - "icon": "huawei.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/vrp_ce12804-withvrf.json b/tests/data/vrp_ce12804-withvrf.json index 5f0eb67b0e..4852a1de03 100644 --- a/tests/data/vrp_ce12804-withvrf.json +++ b/tests/data/vrp_ce12804-withvrf.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2011.2.239.1", - "sysDescr": "Huawei Versatile Routing Platform Software\nVRP (R) software, Version 8.150 (CE12800 V200R002C50SPC800) \r\nCopyright (C) 2012-2017 Huawei Technologies Co., Ltd. \r\nHUAWEICE12804", - "sysContact": null, - "version": "8.150 (V200R002C50SPC800) [patch]", - "hardware": "CE12800", - "features": null, - "os": "vrp", - "type": "network", - "serial": null, - "icon": "huawei.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/vrp_nac.json b/tests/data/vrp_nac.json index 6c3681e630..5f9ba67951 100644 --- a/tests/data/vrp_nac.json +++ b/tests/data/vrp_nac.json @@ -57750,24 +57750,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2011.2.23.291", - "sysDescr": "S5720-56C-PWR-EI-AC\nHuawei Versatile Routing Platform Software \r\n VRP (R) software,Version 5.170 (S5720 V200R010C00SPC600) \r\n Copyright (C) 2007 Huawei Technologies Co., Ltd.", - "sysContact": null, - "version": "5.170 (V200R010C00SPC600) [1]", - "hardware": "S5720-56C-PWR-EI-AC", - "features": null, - "os": "vrp", - "type": "network", - "serial": null, - "icon": "huawei.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -57784,6 +57766,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/vrp_ne.json b/tests/data/vrp_ne.json index f670dc8d02..755139fd28 100644 --- a/tests/data/vrp_ne.json +++ b/tests/data/vrp_ne.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2011.2.62.30", - "sysDescr": "Huawei Versatile Routing Platform Software", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "vrp", - "type": "network", - "serial": null, - "icon": "huawei.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/vxoa.json b/tests/data/vxoa.json index defe0e3083..8cf33d9b4b 100644 --- a/tests/data/vxoa.json +++ b/tests/data/vxoa.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.23867.1.2.48", - "sysDescr": "Silver Peak Systems, Inc. ECS\nLinux hostname 2.6.38.6-rc1 #1 VXOA 8.1.9.8_77260 SMP Tue Dec 31 14:19:17 PST 2019 x86_64", - "sysContact": null, - "version": "8.1.9.8_77260", - "hardware": "ECS", - "features": null, - "os": "vxoa", - "type": "network", - "serial": "00-1B-BC-AA-AA-AA", - "icon": "silverpeak.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/webmon_edge.json b/tests/data/webmon_edge.json index 9b610c3899..a5545389e7 100644 --- a/tests/data/webmon_edge.json +++ b/tests/data/webmon_edge.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.994.3.4", - "sysDescr": "WebMon Edge", - "sysContact": null, - "version": "1.19.0", - "hardware": null, - "features": null, - "os": "webmon", - "type": "environment", - "serial": null, - "icon": "dantel.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/webmon_matrix.json b/tests/data/webmon_matrix.json index 4788bb727b..6b2a7dcf1f 100644 --- a/tests/data/webmon_matrix.json +++ b/tests/data/webmon_matrix.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.994.3.4", - "sysDescr": "WebMon Matrix", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "webmon", - "type": "environment", - "serial": null, - "icon": "dantel.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/wisi-tangram.json b/tests/data/wisi-tangram.json index 4c47292525..780fc1372f 100644 --- a/tests/data/wisi-tangram.json +++ b/tests/data/wisi-tangram.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.7465", - "sysDescr": null, - "sysContact": null, - "version": "3.2.8", - "hardware": "GT01W", - "features": null, - "os": "wisi-tangram", - "type": "network", - "serial": "", - "icon": "wisi.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/wti-power.json b/tests/data/wti-power.json index 99bee6265d..d72eff93ca 100644 --- a/tests/data/wti-power.json +++ b/tests/data/wti-power.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.2634.6.8", - "sysDescr": "Linux 10.40.254.74 2.6.33-ts-powerpc #478 Mon Jun 27 16:48:56 PDT 2011 ppc", - "sysContact": null, - "version": null, - "hardware": "VMR-8HD20", - "features": null, - "os": "wti-power", - "type": "power", - "serial": null, - "icon": "wti.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "sensors": { "discovery": { diff --git a/tests/data/wut_57606.json b/tests/data/wut_57606.json index bbce31e410..4dfc63867e 100644 --- a/tests/data/wut_57606.json +++ b/tests/data/wut_57606.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.5040.1.2.9", - "sysDescr": "", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "wut", - "type": "environment", - "serial": null, - "icon": "wut.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/wut_57613.json b/tests/data/wut_57613.json index 7a23928257..e6c01de6a7 100644 --- a/tests/data/wut_57613.json +++ b/tests/data/wut_57613.json @@ -5,25 +5,7 @@ { "sysName": "", "sysObjectID": ".1.3.6.1.4.1.5040.1.2.16", - "sysDescr": null, - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "wut", - "type": "environment", - "serial": null, - "icon": "wut.svg", - "location": "" - } - ] - }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.5040.1.2.16", - "sysDescr": null, + "sysDescr": "", "sysContact": "", "version": null, "hardware": null, @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/wut_57720.json b/tests/data/wut_57720.json index 2ad7c478a4..92700d42f2 100644 --- a/tests/data/wut_57720.json +++ b/tests/data/wut_57720.json @@ -5,25 +5,7 @@ { "sysName": "", "sysObjectID": ".1.3.6.1.4.1.5040.1.2.42", - "sysDescr": null, - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "wut", - "type": "environment", - "serial": null, - "icon": "wut.svg", - "location": "" - } - ] - }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.5040.1.2.42", - "sysDescr": null, + "sysDescr": "", "sysContact": "", "version": null, "hardware": null, @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/xerox.json b/tests/data/xerox.json index db485eda44..7839bb43f3 100644 --- a/tests/data/xerox.json +++ b/tests/data/xerox.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.253.8.62.1.35.2.3.1.1", - "sysDescr": "Xerox AltaLink C8045; SS 100.002.057.09608, NC 100.002.09608, UI 100.002.09608, ME 063.022.000, CC 100.002.09608, DF 007.019.000, FI ------, FA 003.012.013, CCOS 100.007.09608, NCOS 100.007.09608, SC 013.014.002, SU 100.002.09608", - "sysContact": null, - "version": null, - "hardware": "AltaLink C8045", - "features": null, - "os": "xerox", - "type": "printer", - "serial": null, - "icon": "xerox.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "toner": { "discovery": { diff --git a/tests/data/xerox_apeosport.json b/tests/data/xerox_apeosport.json index 7b63cc8a9f..c1ff56a23b 100644 --- a/tests/data/xerox_apeosport.json +++ b/tests/data/xerox_apeosport.json @@ -18,23 +18,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.297.1.11.93.1.35.34.7.1", - "sysDescr": "FUJI XEROX ApeosPort-VI C4471;ESS1.0.217,IOT 52.54.1,FIN C5.5.0,ADF 23.20.0,PANEL 10.17.4,BOOT 1.0.63,SJFI3.8.0,SSMI1.26.0,CNTS 12.1.12,Plugin 1.1.2", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "xerox", - "type": "printer", - "serial": "TC101180620073", - "icon": "xerox.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/xirrus_aos.json b/tests/data/xirrus_aos.json index c9453fbe16..c6ae7bb40d 100644 --- a/tests/data/xirrus_aos.json +++ b/tests/data/xirrus_aos.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.21013.1.188", - "sysDescr": "Xirrus XD4-130 WiFi Array", - "sysContact": null, - "version": null, - "hardware": null, - "features": null, - "os": "xirrus_aos", - "type": "wireless", - "serial": null, - "icon": "xirrus.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/xos_x480.json b/tests/data/xos_x480.json index f25773a618..f9f4424b6f 100644 --- a/tests/data/xos_x480.json +++ b/tests/data/xos_x480.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1916.2.139", - "sysDescr": "ExtremeXOS (X480-24x(10G4X)) version 15.3.5.2 v1535b2-patch1-13 by release-manager on Thu Dec 15 11:08:24 EST 2016", - "sysContact": null, - "version": "15.3.5.2", - "hardware": "Summit X480-24x(10G4X)", - "features": "v1535b2-patch1-13", - "os": "xos", - "type": "network", - "serial": null, - "icon": "extreme.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/xos_x650.json b/tests/data/xos_x650.json index 03f44cdf33..c542119833 100644 --- a/tests/data/xos_x650.json +++ b/tests/data/xos_x650.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.1916.2.118", - "sysDescr": "ExtremeXOS (X650-24x(SSns)) version 15.3.5.2 v1535b2-patch1-14 by release-manager on Fri Jun 16 08:43:13 EDT 2017", - "sysContact": null, - "version": "15.3.5.2", - "hardware": "Summit X650-24x(SSns)", - "features": "v1535b2-patch1-14", - "os": "xos", - "type": "network", - "serial": null, - "icon": "extreme.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,6 +17,7 @@ "location": "" } ] - } + }, + "poller": "matches discovery" } } diff --git a/tests/data/zmtel.json b/tests/data/zmtel.json index ee0d8529ce..04a0822f5f 100644 --- a/tests/data/zmtel.json +++ b/tests/data/zmtel.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.38595.10", - "sysDescr": "--", - "sysContact": null, - "version": "MT-32803-1.2.3-R8-GP", - "hardware": "OT-350 V1.0", - "features": "eNodeB: 1403 Physical Cell: 36 DL Modulation: 28 UL Modulation: 22 bootROM: 10.5-16886P LTE Band: 42_43", - "os": "zmtel", - "type": "network", - "serial": "OTIZT173501415", - "icon": "greenpacket.png", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/zxdsl.json b/tests/data/zxdsl.json index 592b468a2b..1b7db46680 100644 --- a/tests/data/zxdsl.json +++ b/tests/data/zxdsl.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.3902.1004.9806.22.1.1.1", - "sysDescr": "ZTE ACCESS NODE AGENT", - "sysContact": null, - "version": null, - "hardware": "ZXDSL 9806V", - "features": null, - "os": "zxdsl", - "type": "network", - "serial": null, - "icon": "zte.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/zynos.json b/tests/data/zynos.json index 03264b2250..a3ee066a4c 100644 --- a/tests/data/zynos.json +++ b/tests/data/zynos.json @@ -46,24 +46,6 @@ }, "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.890.1.15", - "sysDescr": "XGS4600-32F", - "sysContact": null, - "version": "V4.50(ABBI.1)", - "hardware": "XGS4600-32F", - "features": null, - "os": "zynos", - "type": "network", - "serial": "S999999999999", - "icon": "zyxel.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -80,7 +62,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/zynos_es.json b/tests/data/zynos_es.json index 4a609481f5..68dde9001f 100644 --- a/tests/data/zynos_es.json +++ b/tests/data/zynos_es.json @@ -25,7 +25,7 @@ "sysObjectID": ".1.3.6.1.4.1.890.1.5.8.27", "sysDescr": "ES-2024PWR", "sysContact": null, - "version": null, + "version": "", "hardware": "ES-2024PWR", "features": null, "os": "zynos", @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.890.1.5.8.27", - "sysDescr": "ES-2024PWR", - "sysContact": null, - "version": null, - "hardware": "ES-2024PWR", - "features": null, - "os": "zynos", - "type": "network", - "serial": null, - "icon": "zyxel.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/zynos_gs1900-fdb.json b/tests/data/zynos_gs1900-fdb.json index fefbb40f9d..74d321e10c 100644 --- a/tests/data/zynos_gs1900-fdb.json +++ b/tests/data/zynos_gs1900-fdb.json @@ -1,24 +1,6 @@ { "os": { "discovery": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.890.1.15", - "sysDescr": "GS1900-48", - "sysContact": null, - "version": "V2.40(AAHN.0)", - "hardware": "GS1900-48", - "features": null, - "os": "zynos", - "type": "network", - "serial": "S192L02000374", - "icon": "zyxel.svg", - "location": "" - } - ] - }, - "poller": { "devices": [ { "sysName": "", @@ -35,7 +17,8 @@ "location": "" } ] - } + }, + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/zynos_gs1900.json b/tests/data/zynos_gs1900.json index 2c9c3ab3e9..4ec4a374da 100644 --- a/tests/data/zynos_gs1900.json +++ b/tests/data/zynos_gs1900.json @@ -24,8 +24,8 @@ "sysName": "", "sysObjectID": ".1.3.6.1.4.1.890.1.15", "sysDescr": "GS1900-8", - "sysContact": null, - "version": null, + "sysContact": "", + "version": "", "hardware": "GS1900-8", "features": null, "os": "zynos", @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.890.1.15", - "sysDescr": "GS1900-8", - "sysContact": "", - "version": null, - "hardware": "GS1900-8", - "features": null, - "os": "zynos", - "type": "network", - "serial": null, - "icon": "zyxel.svg", - "location": "" - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/zynos_gs2200.json b/tests/data/zynos_gs2200.json index 565391996f..a6a28fe64f 100644 --- a/tests/data/zynos_gs2200.json +++ b/tests/data/zynos_gs2200.json @@ -25,7 +25,7 @@ "sysObjectID": ".1.3.6.1.4.1.890.1.5.8.55", "sysDescr": "GS2200-24", "sysContact": null, - "version": null, + "version": "", "hardware": "GS2200-24", "features": null, "os": "zynos", @@ -36,23 +36,6 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.890.1.5.8.55", - "sysDescr": "GS2200-24", - "sysContact": null, - "version": null, - "hardware": "GS2200-24", - "features": null, - "os": "zynos", - "type": "network", - "serial": null, - "icon": "zyxel.svg", - "location": null - } - ] - } + "poller": "matches discovery" } } diff --git a/tests/data/zynos_gs4012.json b/tests/data/zynos_gs4012.json index 79a670b738..399b7cf702 100644 --- a/tests/data/zynos_gs4012.json +++ b/tests/data/zynos_gs4012.json @@ -6,8 +6,8 @@ "sysName": "", "sysObjectID": ".1.3.6.1.4.1.890.1.5.8.20", "sysDescr": "GS-4012F", - "sysContact": null, - "version": null, + "sysContact": "", + "version": "", "hardware": "GS-4012F", "features": null, "os": "zynos", @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.890.1.5.8.20", - "sysDescr": "GS-4012F", - "sysContact": "", - "version": null, - "hardware": "GS-4012F", - "features": null, - "os": "zynos", - "type": "network", - "serial": "0Z0724031894", - "icon": "zyxel.svg", - "location": "" - } - ] - } + "poller": "matches discovery" }, "processors": { "discovery": { diff --git a/tests/data/zynos_mgs3712.json b/tests/data/zynos_mgs3712.json index 1d1cec706c..efcdb9f790 100644 --- a/tests/data/zynos_mgs3712.json +++ b/tests/data/zynos_mgs3712.json @@ -6,8 +6,8 @@ "sysName": "", "sysObjectID": ".1.3.6.1.4.1.890.1.5.8.47", "sysDescr": "MGS-3712", - "sysContact": null, - "version": null, + "sysContact": "", + "version": "", "hardware": "MGS-3712", "features": null, "os": "zynos", @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.890.1.5.8.47", - "sysDescr": "MGS-3712", - "sysContact": "", - "version": null, - "hardware": "MGS-3712", - "features": null, - "os": "zynos", - "type": "network", - "serial": "S100Z16017355", - "icon": "zyxel.svg", - "location": "" - } - ] - } + "poller": "matches discovery" }, "ports": { "discovery": { diff --git a/tests/data/zywall.json b/tests/data/zywall.json index 1a810926b2..72a8198698 100644 --- a/tests/data/zywall.json +++ b/tests/data/zywall.json @@ -18,24 +18,7 @@ } ] }, - "poller": { - "devices": [ - { - "sysName": "", - "sysObjectID": ".1.3.6.1.4.1.890.1.15", - "sysDescr": "ZyWALL 2X", - "sysContact": null, - "version": null, - "hardware": "ZyWALL 2X", - "features": null, - "os": "zywall", - "type": "firewall", - "serial": null, - "icon": "zyxel.svg", - "location": null - } - ] - } + "poller": "matches discovery" }, "processors": { "discovery": {