Fix test regressions introduced while tests were broken (#16399)

* AuthSSOTest: clear roles cache

* PollingJob: When a poller module doesn't exist, return null instead of false.  Skip all other checks and disable polling in that case.

* Sensors: Guess high and low limits separately as needed

* Sensors: drac test psu current data was wrong, referencing the snmprec, 8 / 10 and 0 / 10 should be the values
NOTE: drac is messed up and runs a billion snmp queriess for no reason

* please phpstan

* Sensors: limits reference old code
move to "creating"

* Fix gw-eydfa accidental assignment

* Fix ies5000 test data now that the bad state is removed

* Fix ies5000 test data part 2

* Move sensor discovery reset into discover_device()

* infinera remove duplicate sensor (also a lot of trailing whitespace apparently)

* Fix innovaphone bad yaml discovery

* module tests should be using null when test data doesn't exist, not an empty array

* When discovery or polling is not supported, dump null instead of an array.
Account for nulls in testing

* update ISE serial

* Janitza was seemingly wrong before

* Remove some private data

* bgp-peers requires ipv4-addresses and ipv6-addresses for bgpPeerIface

* fix polycomLens broken state sensor discovery

* Raritan pdu and pdu2 test data was combined in one test file, split it out

* scs-ks duplicate temperature sensor indexes

* sentry3 someone tried to avoid breaking stuff but just broke things more

* smartos-dcp-m fix incorrect numeric oids

* ssu2000 apparently test data was wrong, must have fixed a bug in the code.

* timos remove duplicate dbm sensor definitions

* bgpPeerIface is working in tests now

* Fix moxa-etherdevice when mibs are a bit different

* xw_to_dbm negative values should return null

* Update cisco test data due previous fixes/changes

* One more bgpPeerIface

* Add orderBy to ospf module db dumps

* Remove links test data for now

* Improve handling of bad data in ipv6-addresses module

LibreNMS/Interfaces/Module.php

@@ -83,9 +83,7 @@ interface Module
      * Make sure to hide transient fields, such as id and date.
      * You should always order the data by a non-transient column.
      * Some id fields may need to be joined to tie back to non-transient data.
-     * Module may return false if testing is not supported or required.
-     *
-     * @return array|false
+     * Module may return null if testing is not supported or required.
      */
-    public function dump(Device $device);
+    public function dump(Device $device, string $type): ?array;
 }

LibreNMS/Modules/Availability.php

@@ -116,8 +116,12 @@ class Availability implements Module
     /**
      * @inheritDoc
      */
-    public function dump(Device $device)
+    public function dump(Device $device, string $type): ?array
     {
+        if ($type == 'discovery') {
+            return null;
+        }
+
         return [
             'availability' => $device->availability()->orderBy('duration')
                 ->get()->map->makeHidden(['availability_id', 'device_id']),

LibreNMS/Modules/Core.php

@@ -138,9 +138,9 @@ class Core implements Module
     /**
      * @inheritDoc
      */
-    public function dump(Device $device)
+    public function dump(Device $device, string $type): ?array
     {
-        return false; // all data here is stored in the devices table and covered by the os module
+        return null; // all data here is stored in the devices table and covered by the os module
     }
 
     /**

LibreNMS/Modules/EntityPhysical.php

@@ -74,7 +74,7 @@ class EntityPhysical implements Module
     /**
      * @inheritDoc
      */
-    public function dump(Device $device)
+    public function dump(Device $device, string $type): ?array
     {
         return [
             'entPhysical' => $device->entityPhysical()->orderBy('entPhysicalIndex')

LibreNMS/Modules/Isis.php

@@ -205,7 +205,7 @@ class Isis implements Module
     /**
      * @inheritDoc
      */
-    public function dump(Device $device)
+    public function dump(Device $device, string $type): ?array
     {
         return [
             'isis_adjacencies' => $device->isisAdjacencies()->orderBy('index')

LibreNMS/Modules/LegacyModule.php

@@ -42,7 +42,7 @@ class LegacyModule implements Module
     /** @var array */
     private $module_deps = [
         'arp-table' => ['ports'],
-        'bgp-peers' => ['ports', 'vrf'],
+        'bgp-peers' => ['ports', 'vrf', 'ipv4-addresses', 'ipv6-addresses'],
         'cisco-mac-accounting' => ['ports'],
         'fdb-table' => ['ports', 'vlans'],
         'vlans' => ['ports'],
@@ -130,12 +130,19 @@ class LegacyModule implements Module
     /**
      * @inheritDoc
      */
-    public function dump(Device $device)
+    public function dump(Device $device, string $type): ?array
     {
+        if ($type == 'discovery' && ! \LibreNMS\Util\Module::legacyDiscoveryExists($this->name)) {
+            return null;
+        }
+        if ($type == 'poller' && ! \LibreNMS\Util\Module::legacyPollingExists($this->name)) {
+            return null;
+        }
+
         $data = [];
         $dump_rules = $this->moduleDumpDefinition();
         if (empty($dump_rules)) {
-            return false; // not supported for this legacy module
+            return null; // not supported for this legacy module
         }
 
         foreach ($dump_rules as $table => $info) {

LibreNMS/Modules/Mempools.php

@@ -161,7 +161,7 @@ class Mempools implements Module
     /**
      * @inheritDoc
      */
-    public function dump(Device $device)
+    public function dump(Device $device, string $type): ?array
     {
         return [
             'mempools' => $device->mempools()->orderBy('mempool_type')->orderBy('mempool_id')

LibreNMS/Modules/Mpls.php

@@ -198,7 +198,7 @@ class Mpls implements Module
     /**
      * @inheritDoc
      */
-    public function dump(Device $device)
+    public function dump(Device $device, string $type): ?array
     {
         return [
             'mpls_lsps' => $device->mplsLsps()->orderBy('vrf_oid')->orderBy('lsp_oid')

LibreNMS/Modules/Nac.php

@@ -130,8 +130,12 @@ class Nac implements Module
     /**
      * @inheritDoc
      */
-    public function dump(Device $device)
+    public function dump(Device $device, string $type): ?array
     {
+        if ($type == 'discovery') {
+            return null;
+        }
+
         return [
             'ports_nac' => $device->portsNac()->orderBy('ports.ifIndex')->orderBy('mac_address')
                 ->leftJoin('ports', 'ports_nac.port_id', 'ports.port_id')

LibreNMS/Modules/Netstats.php

@@ -243,9 +243,9 @@ class Netstats implements Module
     /**
      * @inheritDoc
      */
-    public function dump(Device $device)
+    public function dump(Device $device, string $type): ?array
     {
-        return false; // no database data to dump (may add rrd later)
+        return null; // no database data to dump (may add rrd later)
     }
 
     private function statName(string $oid): string

LibreNMS/Modules/Os.php

@@ -125,7 +125,7 @@ class Os implements Module
     /**
      * @inheritDoc
      */
-    public function dump(Device $device)
+    public function dump(Device $device, string $type): ?array
     {
         // get data fresh from the database
         return [

LibreNMS/Modules/Ospf.php

@@ -267,16 +267,27 @@ class Ospf implements Module
     /**
      * @inheritDoc
      */
-    public function dump(Device $device)
+    public function dump(Device $device, string $type): ?array
     {
+        if ($type == 'discovery') {
+            return null;
+        }
+
         return [
             'ospf_ports' => $device->ospfPorts()
                 ->leftJoin('ports', 'ospf_ports.port_id', 'ports.port_id')
                 ->select(['ospf_ports.*', 'ifIndex'])
+                ->orderBy('ospf_port_id')->orderBy('context_name')
                 ->get()->map->makeHidden(['id', 'device_id', 'port_id']),
-            'ospf_instances' => $device->ospfInstances->map->makeHidden(['id', 'device_id']),
-            'ospf_areas' => $device->ospfAreas->map->makeHidden(['id', 'device_id']),
-            'ospf_nbrs' => $device->ospfNbrs->map->makeHidden(['id', 'device_id']),
+            'ospf_instances' => $device->ospfInstances()
+                ->orderBy('ospf_instance_id')->orderBy('context_name')
+                ->get()->map->makeHidden(['id', 'device_id']),
+            'ospf_areas' => $device->ospfAreas()
+                ->orderBy('ospfAreaId')->orderBy('context_name')
+                ->get()->map->makeHidden(['id', 'device_id']),
+            'ospf_nbrs' => $device->ospfNbrs()
+                ->orderBy('ospf_nbr_id')->orderBy('context_name')
+                ->get()->map->makeHidden(['id', 'device_id']),
         ];
     }
 }

LibreNMS/Modules/PortsStack.php

@@ -117,8 +117,12 @@ class PortsStack implements Module
     /**
      * @inheritDoc
      */
-    public function dump(Device $device)
+    public function dump(Device $device, string $type): ?array
     {
+        if ($type == 'poller') {
+            return null;
+        }
+
         return [
             'ports_stack' => $device->portsStack()
                 ->orderBy('high_ifIndex')->orderBy('low_ifIndex')

LibreNMS/Modules/PrinterSupplies.php

@@ -152,7 +152,7 @@ class PrinterSupplies implements Module
     /**
      * @inheritDoc
      */
-    public function dump(Device $device)
+    public function dump(Device $device, string $type): ?array
     {
         return [
             'printer_supplies' => $device->printerSupplies()->orderBy('supply_oid')->orderBy('supply_index')

LibreNMS/Modules/Slas.php

@@ -119,7 +119,7 @@ class Slas implements Module
     /**
      * @inheritDoc
      */
-    public function dump(Device $device)
+    public function dump(Device $device, string $type): ?array
     {
         return [
             'slas' => $device->slas()->orderBy('sla_nr')

LibreNMS/Modules/Stp.php

@@ -104,7 +104,7 @@ class Stp implements Module
     /**
      * @inheritDoc
      */
-    public function dump(Device $device)
+    public function dump(Device $device, string $type): ?array
     {
         return [
             'stp' => $device->stpInstances()->orderBy('bridgeAddress')

LibreNMS/Modules/Vminfo.php

@@ -109,7 +109,7 @@ class Vminfo implements \LibreNMS\Interfaces\Module
     /**
      * @inheritDoc
      */
-    public function dump(Device $device)
+    public function dump(Device $device, string $type): ?array
     {
         return [
             'vminfo' => $device->vminfo()->orderBy('vmwVmVMID')

LibreNMS/Modules/Xdsl.php

@@ -120,7 +120,7 @@ class Xdsl implements Module
     /**
      * @inheritDoc
      */
-    public function dump(Device $device)
+    public function dump(Device $device, string $type): ?array
     {
         return [
             'ports_adsl' => $device->portsAdsl()->orderBy('ifIndex')

LibreNMS/Polling/ModuleStatus.php

@@ -30,7 +30,7 @@ use App\Models\Device;
 class ModuleStatus
 {
     public function __construct(
-        public bool $global,
+        public ?bool $global,
         public ?bool $os = null,
         public ?bool $device = null,
         public ?bool $manual = null,
@@ -39,6 +39,10 @@ class ModuleStatus
 
     public function isEnabled(): bool
     {
+        if ($this->global === null) {
+            return false; // this module does not have polling
+        }
+
         if ($this->manual !== null) {
             return $this->manual;
         }
@@ -57,7 +61,7 @@ class ModuleStatus
     public function reason(): string
     {
         if ($this->manual !== null) {
-            return 'mannually';
+            return 'manually';
         }
 
         if ($this->device !== null) {

LibreNMS/Util/Module.php

@@ -61,7 +61,7 @@ class Module
     public static function pollingStatus(string $module_name, Device $device, ?bool $manual = null): ModuleStatus
     {
         return new ModuleStatus(
-            Config::get("poller_modules.$module_name", false),
+            Config::get("poller_modules.$module_name"),
             Config::get("os.{$device->os}.poller_modules.$module_name"),
             $device->getAttrib("poll_$module_name"),
             $manual,

LibreNMS/Util/ModuleTestHelper.php

@@ -733,8 +733,8 @@ class ModuleTestHelper
 
         // only dump data for the given modules (and modules that support dumping)
         foreach ($modules as $module) {
-            $module_data = Module::fromName($module)->dump(DeviceCache::get($device_id));
-            if ($module_data !== false) {
+            $module_data = Module::fromName($module)->dump(DeviceCache::get($device_id), $type);
+            if ($module_data !== null) {
                 $data[$module][$type] = $this->dumpToArray($module_data);
             }
         }
@@ -774,7 +774,7 @@ class ModuleTestHelper
             if (isset($this->discovery_module_output[$module])) {
                 return $this->discovery_module_output[$module];
             } else {
-                return "Module $module not run. Modules: " . implode(',', array_keys($this->poller_module_output));
+                return "Module $module not run. Modules: " . implode(',', array_keys($this->discovery_module_output));
             }
         }
 

app/Discovery/Sensor.php

@@ -68,7 +68,6 @@ class Sensor
         $this->discovered[$sensor->syncGroup()] = false;
 
         Log::debug("Discovered Sensor: $sensor");
-        Log::info("$sensor->sensor_descr: Cur $sensor->sensor_current, Low: $sensor->sensor_limit_low, Low Warn: $sensor->sensor_limit_low_warn, Warn: $sensor->sensor_limit_warn, High: $sensor->sensor_limit");
 
         return $this;
     }

app/Models/Sensor.php

@@ -98,30 +98,34 @@ class Sensor extends DeviceRelatedModel implements Keyable
         return self::$icons;
     }
 
-    public function guessLimits(): void
+    public function guessLimits(bool $high, bool $low): void
     {
-        $this->sensor_limit_low = match ($this->sensor_class) {
-            'temperature' => $this->sensor_current - 10,
-            'voltage' => $this->sensor_current * 0.85,
-            'humidity' => 30,
-            'fanspeed' => $this->sensor_current * 0.80,
-            'power_factor' => -1,
-            'signal' => -80,
-            'airflow', 'snr', 'frequency', 'pressure', 'cooling' => $this->sensor_current * 0.95,
-            default => null,
-        };
+        if ($high) {
+            $this->sensor_limit = match ($this->sensor_class) {
+                'temperature' => $this->sensor_current + 20,
+                'voltage' => $this->sensor_current * 1.15,
+                'humidity' => 70,
+                'fanspeed' => $this->sensor_current * 1.80,
+                'power_factor' => 1,
+                'signal' => -30,
+                'load' => 80,
+                'airflow', 'snr', 'frequency', 'pressure', 'cooling' => $this->sensor_current * 1.05,
+                default => null,
+            };
+        }
 
-        $this->sensor_limit = match ($this->sensor_class) {
-            'temperature' => $this->sensor_current + 20,
-            'voltage' => $this->sensor_current * 1.15,
-            'humidity' => 70,
-            'fanspeed' => $this->sensor_current * 1.80,
-            'power_factor' => 1,
-            'signal' => -30,
-            'load' => 80,
-            'airflow', 'snr', 'frequency', 'pressure', 'cooling' => $this->sensor_current * 1.05,
-            default => null,
-        };
+        if ($low) {
+            $this->sensor_limit_low = match ($this->sensor_class) {
+                'temperature' => $this->sensor_current - 10,
+                'voltage' => $this->sensor_current * 0.85,
+                'humidity' => 30,
+                'fanspeed' => $this->sensor_current * 0.80,
+                'power_factor' => -1,
+                'signal' => -80,
+                'airflow', 'snr', 'frequency', 'pressure', 'cooling' => $this->sensor_current * 0.95,
+                default => null,
+            };
+        }
     }
 
     // ---- Define Relationships ----

app/Observers/SensorObserver.php

@@ -6,6 +6,7 @@ use App\Models\Eventlog;
 use App\Models\Sensor;
 use Illuminate\Foundation\Application;
 use Illuminate\Support\Facades\Log;
+use LibreNMS\Config;
 use LibreNMS\Enum\Severity;
 
 class SensorObserver
@@ -19,14 +20,6 @@ class SensorObserver
 
     public function saving(Sensor $sensor): void
     {
-        // fix inverted limits
-        if ($sensor->sensor_limit !== null && $sensor->sensor_limit_low !== null && $sensor->sensor_limit_low > $sensor->sensor_limit) {
-            Log::error('Fixing swapped sensor limits');
-
-            // Fix high/low thresholds (i.e. on negative numbers)
-            [$sensor->sensor_limit, $sensor->sensor_limit_low] = [$sensor->sensor_limit_low, $sensor->sensor_limit];
-        }
-
         if ($this->runningInConsole && ! $sensor->isDirty()) {
             echo '.';
         }
@@ -34,9 +27,23 @@ class SensorObserver
 
     public function creating(Sensor $sensor): void
     {
-        $guess_limits = \LibreNMS\Config::get('sensors.guess_limits', true);
-        if ($guess_limits && $sensor->sensor_current !== null && $sensor->sensor_limit === null && $sensor->sensor_limit_low === null) {
-            $sensor->guessLimits();
+        // fix inverted warn limits
+        if ($sensor->sensor_limit_warn !== null && $sensor->sensor_limit_low_warn !== null && $sensor->sensor_limit_low_warn > $sensor->sensor_limit_warn) {
+            Log::error('Fixing swapped sensor warn limits');
+
+            // Fix high/low thresholds (i.e. on negative numbers)
+            [$sensor->sensor_limit_warn, $sensor->sensor_limit_low_warn] = [$sensor->sensor_limit_low_warn, $sensor->sensor_limit_warn];
+        }
+
+        if (Config::get('sensors.guess_limits') && $sensor->sensor_current !== null) {
+            $sensor->guessLimits($sensor->sensor_limit === null, $sensor->sensor_limit_low === null);
+        }
+
+        // Fix high/low thresholds (i.e. on negative numbers)
+        if ($sensor->sensor_limit !== null && $sensor->sensor_limit_low > $sensor->sensor_limit) {
+            Log::error('Fixing swapped sensor limits');
+
+            [$sensor->sensor_limit, $sensor->sensor_limit_low] = [$sensor->sensor_limit_low, $sensor->sensor_limit];
         }
     }
 
@@ -49,6 +56,7 @@ class SensorObserver
     public function created(Sensor $sensor): void
     {
         EventLog::log('Sensor Added: ' . $sensor->sensor_class . ' ' . $sensor->sensor_type . ' ' . $sensor->sensor_index . ' ' . $sensor->sensor_descr, $sensor->device_id, 'sensor', Severity::Notice, $sensor->sensor_id);
+        Log::info("$sensor->sensor_descr: Cur $sensor->sensor_current, Low: $sensor->sensor_limit_low, Low Warn: $sensor->sensor_limit_low_warn, Warn: $sensor->sensor_limit_warn, High: $sensor->sensor_limit");
 
         if ($this->runningInConsole) {
             echo '+';

discovery.php

@@ -104,8 +104,6 @@ if (! empty(\LibreNMS\Config::get('distributed_poller_group'))) {
 global $device;
 foreach (dbFetchRows("SELECT * FROM `devices` WHERE disabled = 0 $where ORDER BY device_id DESC", $sqlparams) as $device) {
     $device_start = microtime(true);
-    DeviceCache::setPrimary($device['device_id']);
-    App::forgetInstance('sensor-discovery');
 
     if (discover_device($device, $module_override)) {
         $discovered_devices++;

includes/common.php

@@ -739,7 +739,15 @@ function string_to_float($value)
  */
 function uw_to_dbm($value)
 {
-    return $value <= 0 ? -60 : 10 * log10($value / 1000);
+    if ($value < 0) {
+        return null;
+    }
+
+    if ($value == 0) {
+        return -60;
+    }
+
+    return 10 * log10($value / 1000);
 }
 
 /**
@@ -748,7 +756,15 @@ function uw_to_dbm($value)
  */
 function mw_to_dbm($value)
 {
-    return $value <= 0 ? -60 : 10 * log10($value);
+    if ($value < 0) {
+        return null;
+    }
+
+    if ($value == 0) {
+        return -60;
+    }
+
+    return 10 * log10($value);
 }
 
 /**

includes/definitions/discovery/infinera-xtm.yaml

@@ -13,7 +13,7 @@ modules:
                 total: LUM-SYSINFO-MIB::sysinfoBoardMemoryTotalMem
                 free: LUM-SYSINFO-MIB::sysinfoBoardMemoryFreeMem
                 percent_used: LUM-SYSINFO-MIB::sysinfoBoardMemoryUsageMemPercent
-                descr: '{{ LUM-SYSINFO-MIB::sysinfoBoardMemoryName }}'   
+                descr: '{{ LUM-SYSINFO-MIB::sysinfoBoardMemoryName }}'
 
     processors:
         data:
@@ -70,12 +70,12 @@ modules:
                     states:
                         - { descr: notPresent, graph: 0, value: 1, generic: 0 }
                         - { descr: down, graph: 0, value: 2, generic: 2 }
-                        - { descr: up, graph: 0, value: 3, generic: 0 }     
+                        - { descr: up, graph: 0, value: 3, generic: 0 }
                     skip_values:
                         -
                             oid: equipmentBoardAdminStatus
                             op: '='
-                            value: 1                                 
+                            value: 1
                 -
                     oid: equipmentBoardTable
                     value: equipmentBoardTempHighExceeded
@@ -86,7 +86,7 @@ modules:
                     state_name: BoardTempHighExceeded
                     states:
                         - { descr: alarm, graph: 0, value: 2, generic: 2 }
-                        - { descr: ok, graph: 0, value: 1, generic: 0 }  
+                        - { descr: ok, graph: 0, value: 1, generic: 0 }
 
                 -
                     oid: equipmentPowerTable
@@ -98,7 +98,7 @@ modules:
                     state_name: PSUOperStatus
                     states:
                         - { descr: alarm, graph: 0, value: 2, generic: 2 }
-                        - { descr: ok, graph: 0, value: 1, generic: 0 }                
+                        - { descr: ok, graph: 0, value: 1, generic: 0 }
 
                 -
                     oid:  equipmentFanTable
@@ -110,7 +110,7 @@ modules:
                     state_name: FanOperStatus
                     states:
                         - { descr: alarm, graph: 0, value: 2, generic: 2 }
-                        - { descr: ok, graph: 0, value: 1, generic: 0 }      
+                        - { descr: ok, graph: 0, value: 1, generic: 0 }
 
                 -
                     oid: oaIfTable
@@ -123,12 +123,12 @@ modules:
                     states:
                         - { descr: notPresent, graph: 0, value: 1, generic: 0 }
                         - { descr: down, graph: 0, value: 2, generic: 2 }
-                        - { descr: up, graph: 0, value: 3, generic: 0 }     
+                        - { descr: up, graph: 0, value: 3, generic: 0 }
                     skip_values:
                         -
                             oid: oaIfAdminStatus
                             op: '='
-                            value: 1  
+                            value: 1
 
                 -
                     oid: oaIfTable
@@ -140,12 +140,12 @@ modules:
                     state_name: AmpSaturationFault
                     states:
                         - { descr: alarm, graph: 0, value: 2, generic: 2 }
-                        - { descr: ok, graph: 0, value: 1, generic: 0 }  
+                        - { descr: ok, graph: 0, value: 1, generic: 0 }
                     skip_values:
                         -
                             oid: oaIfAdminStatus
                             op: '='
-                            value: 1                          
+                            value: 1
                 -
                     oid: oaIfTable
                     value: oaIfLaserTempOutOfRange
@@ -156,12 +156,12 @@ modules:
                     state_name: AmpTempExceeded
                     states:
                         - { descr: alarm, graph: 0, value: 2, generic: 2 }
-                        - { descr: ok, graph: 0, value: 1, generic: 0 }   
+                        - { descr: ok, graph: 0, value: 1, generic: 0 }
                     skip_values:
                         -
                             oid: oaIfAdminStatus
                             op: '='
-                            value: 1                              
+                            value: 1
 
                 -
                     oid: oaIfTable
@@ -173,13 +173,13 @@ modules:
                     state_name: AmpLoS
                     states:
                         - { descr: alarm, graph: 0, value: 2, generic: 2 }
-                        - { descr: ok, graph: 0, value: 1, generic: 0 }   
+                        - { descr: ok, graph: 0, value: 1, generic: 0 }
                     skip_values:
                         -
                             oid: oaIfAdminStatus
                             op: '='
-                            value: 1                          
-                                                                                                                                                        
+                            value: 1
+
                 -
                     oid: oaIfTable
                     value: oaIfTxSignalStatus
@@ -191,12 +191,12 @@ modules:
                     states:
                         - { descr: down, graph: 0, value: 1, generic: 2 }
                         - { descr: degraded, graph: 0, value: 2, generic: 2 }
-                        - { descr: ok, graph: 0, value: 3, generic: 0 }   
+                        - { descr: ok, graph: 0, value: 3, generic: 0 }
                     skip_values:
                         -
                             oid: oaIfAdminStatus
                             op: '='
-                            value: 1                          
+                            value: 1
 
                 -
                     oid: oaIfTable
@@ -209,12 +209,12 @@ modules:
                     states:
                         - { descr: down, graph: 0, value: 1, generic: 2 }
                         - { descr: degraded, graph: 0, value: 2, generic: 2 }
-                        - { descr: ok, graph: 0, value: 3, generic: 0 }  
+                        - { descr: ok, graph: 0, value: 3, generic: 0 }
                     skip_values:
                         -
                             oid: oaIfAdminStatus
                             op: '='
-                            value: 1                           
+                            value: 1
 
                 -
                     oid: oaIfTable
@@ -226,12 +226,12 @@ modules:
                     state_name: AmpLoS
                     states:
                         - { descr: alarm, graph: 0, value: 2, generic: 2 }
-                        - { descr: ok, graph: 0, value: 1, generic: 0 } 
+                        - { descr: ok, graph: 0, value: 1, generic: 0 }
                     skip_values:
                         -
                             oid: oaIfAdminStatus
                             op: '='
-                            value: 1                              
+                            value: 1
 
                 -
                     oid: oaVoaClientIfTable
@@ -243,12 +243,12 @@ modules:
                     states:
                         - { descr: notPresent, graph: 0, value: 1, generic: 0 }
                         - { descr: down, graph: 0, value: 2, generic: 2 }
-                        - { descr: up, graph: 0, value: 3, generic: 0 }  
+                        - { descr: up, graph: 0, value: 3, generic: 0 }
                     skip_values:
                         -
                             oid: oaVoaClientIfAdminStatus
                             op: '='
-                            value: 1                
+                            value: 1
 
                 -
                     oid: oaVoaLineIfTable
@@ -260,12 +260,12 @@ modules:
                     states:
                         - { descr: notPresent, graph: 0, value: 1, generic: 0 }
                         - { descr: down, graph: 0, value: 2, generic: 2 }
-                        - { descr: up, graph: 0, value: 3, generic: 0 }  
+                        - { descr: up, graph: 0, value: 3, generic: 0 }
                     skip_values:
                         -
                             oid: oaVoaLineIfAdminStatus
                             op: '='
-                            value: 1                                                                       
+                            value: 1
 
                 -
                     oid: ocmIfTable
@@ -278,12 +278,12 @@ modules:
                     states:
                         - { descr: notPresent, graph: 0, value: 1, generic: 0 }
                         - { descr: down, graph: 0, value: 2, generic: 2 }
-                        - { descr: up, graph: 0, value: 3, generic: 0 }  
+                        - { descr: up, graph: 0, value: 3, generic: 0 }
                     skip_values:
                         -
                             oid: ocmIfAdminStatus
                             op: '='
-                            value: 1                            
+                            value: 1
 
                 -
                     oid: ocmIfTable
@@ -295,7 +295,7 @@ modules:
                     state_name: OCMSwitch
                     states:
                         - { descr: alarm, graph: 0, value: 2, generic: 2 }
-                        - { descr: ok, graph: 0, value: 1, generic: 0 }       
+                        - { descr: ok, graph: 0, value: 1, generic: 0 }
 
                 -
                     oid: ocmIfTable
@@ -307,7 +307,7 @@ modules:
                     state_name: OCMModule
                     states:
                         - { descr: alarm, graph: 0, value: 2, generic: 2 }
-                        - { descr: ok, graph: 0, value: 1, generic: 0 }      
+                        - { descr: ok, graph: 0, value: 1, generic: 0 }
 
                 -
                     oid: ifOtnOtuTable
@@ -319,7 +319,7 @@ modules:
                     state_name: OTNLoF
                     states:
                         - { descr: alarm, graph: 0, value: 2, generic: 2 }
-                        - { descr: ok, graph: 0, value: 1, generic: 0 }      
+                        - { descr: ok, graph: 0, value: 1, generic: 0 }
 
                 -
                     oid: ifOtnOtuTable
@@ -331,7 +331,7 @@ modules:
                     state_name: OTNLoMF
                     states:
                         - { descr: alarm, graph: 0, value: 2, generic: 2 }
-                        - { descr: ok, graph: 0, value: 1, generic: 0 }                                                                                         
+                        - { descr: ok, graph: 0, value: 1, generic: 0 }
 
                 -
                     oid: ifOtnOtuTable
@@ -343,7 +343,7 @@ modules:
                     state_name: OTNIndicationSignal
                     states:
                         - { descr: alarm, graph: 0, value: 2, generic: 2 }
-                        - { descr: ok, graph: 0, value: 1, generic: 0 }   
+                        - { descr: ok, graph: 0, value: 1, generic: 0 }
 
                 -
                     oid: ifOtnMonSmTable
@@ -355,7 +355,7 @@ modules:
                     state_name: OTNBDIState
                     states:
                         - { descr: alarm, graph: 0, value: 2, generic: 2 }
-                        - { descr: ok, graph: 0, value: 1, generic: 0 }         
+                        - { descr: ok, graph: 0, value: 1, generic: 0 }
 
                 -
                     oid: ifOtnMonSmTable
@@ -367,7 +367,7 @@ modules:
                     state_name: OTNIAEState
                     states:
                         - { descr: alarm, graph: 0, value: 2, generic: 2 }
-                        - { descr: ok, graph: 0, value: 1, generic: 0 }      
+                        - { descr: ok, graph: 0, value: 1, generic: 0 }
 
                 -
                     oid: ifOtnMonSmTable
@@ -379,7 +379,7 @@ modules:
                     state_name: OTNBIAEState
                     states:
                         - { descr: alarm, graph: 0, value: 2, generic: 2 }
-                        - { descr: ok, graph: 0, value: 1, generic: 0 }                                                                
+                        - { descr: ok, graph: 0, value: 1, generic: 0 }
 
                 -
                     oid: wdmCtrlChannelTable
@@ -411,12 +411,12 @@ modules:
                     state_name: WDMChannelLoSStatus
                     states:
                         - { descr: alarm, graph: 0, value: 2, generic: 2 }
-                        - { descr: ok, graph: 0, value: 1, generic: 0 }  
+                        - { descr: ok, graph: 0, value: 1, generic: 0 }
                     skip_values:
                         -
                             oid: wdmCtrlChannelAdminStatus
                             op: '='
-                            value: 1   
+                            value: 1
 
                 -
                     oid: ifBasicAdminTable
@@ -429,12 +429,12 @@ modules:
                     states:
                         - { descr: notPresent, graph: 0, value: 1, generic: 0 }
                         - { descr: down, graph: 0, value: 2, generic: 2 }
-                        - { descr: up, graph: 0, value: 3, generic: 0 }  
+                        - { descr: up, graph: 0, value: 3, generic: 0 }
                     skip_values:
                         -
                             oid: ifBasicAdminAdminStatus
                             op: '='
-                            value: 1      
+                            value: 1
 
                 -
                     oid: dcnIfTable
@@ -446,12 +446,12 @@ modules:
                     states:
                         - { descr: notPresent, graph: 0, value: 1, generic: 0 }
                         - { descr: down, graph: 0, value: 2, generic: 2 }
-                        - { descr: up, graph: 0, value: 3, generic: 0 }  
+                        - { descr: up, graph: 0, value: 3, generic: 0 }
                     skip_values:
                         -
                             oid: dcnIfAdminStatus
                             op: '='
-                            value: 1                                                
+                            value: 1
 
 
         temperature:
@@ -466,7 +466,7 @@ modules:
                     entPhysicalIndex: 'sr-{{ $index }}'
                     high_limit:  equipmentSubrackTempThreshold
                     low_limit: 3
-                    
+
                 -
                     oid: equipmentBoardTable
                     value: equipmentBoardTemp
@@ -475,8 +475,8 @@ modules:
                     descr: 'Temperature {{ $equipmentBoardSubrack }}:{{ $equipmentBoardName }}'
                     group: Board Temperature
                     entPhysicalIndex: 'board-{{ $index }}'
-                    high_limit: equipmentBoardTempThreshold  
-                    low_limit: equipmentBoardTempLowThreshold              
+                    high_limit: equipmentBoardTempThreshold
+                    low_limit: equipmentBoardTempLowThreshold
 
                 -
                     oid: oaIfTable
@@ -484,20 +484,20 @@ modules:
                     divisor: 10
                     num_oid: '.1.3.6.1.4.1.8708.2.19.2.2.1.1.43.{{ $index }}'
                     descr: 'Temperature {{ $oaIfSubrack }}:{{ $oaIfName }}'
-                    group: Amplifier Laser Temperature     
+                    group: Amplifier Laser Temperature
                     entPhysicalIndex: 'oa-{{ $index }}'
 
                 -
                     oid:  ifPhysicalTrxTable
                     value: ifPhysicalTrxLaserTemp
-                    divisor: 10   
+                    divisor: 10
                     num_oid: '.1.3.6.1.4.1.8708.2.47.2.2.1.1.5.{{ $index }}'
                     descr: 'Laser Temperature {{ $ifPhysicalTrxName }}'
                     group: Laser Temperature
-                    entPhysicalIndex: 'laser-{{ $index }}' 
-                    skip_values: [2147483646, 2147483647, -2147483648]        
+                    entPhysicalIndex: 'laser-{{ $index }}'
+                    skip_values: [2147483646, 2147483647, -2147483648]
+
 
-                                
 
 
         dbm:
@@ -505,95 +505,86 @@ modules:
                 skip_values: 0
             data:
                 -
-                    oid: oaIfTable 
+                    oid: oaIfTable
                     value: oaIfRxPowerLevel
                     divisor: 10
                     num_oid: '.1.3.6.1.4.1.8708.2.19.2.2.1.1.20.{{ $index }}'
                     descr: 'Amplifier Rx {{ $oaIfSubrack }}:{{ $oaIfName }}'
-                    group: Amplifier Laser dBm  
-                    index: oa-rx-dbm.{{ $index }}     
-                    entPhysicalIndex: 'oa-{{ $index }}'                   
+                    group: Amplifier Laser dBm
+                    index: oa-rx-dbm.{{ $index }}
+                    entPhysicalIndex: 'oa-{{ $index }}'
 
                 -
-                    oid: oaIfTable 
+                    oid: oaIfTable
                     value: oaIfTxPowerLevel
                     divisor: 10
                     num_oid: '.1.3.6.1.4.1.8708.2.19.2.2.1.1.19.{{ $index }}'
                     descr: 'Amplifier Tx {{ $oaIfSubrack }}:{{ $oaIfName }}'
-                    group: Amplifier Laser dBm   
-                    index: oa-tx-dbm.{{ $index }}   
-                    entPhysicalIndex: 'oa-{{ $index }}'              
+                    group: Amplifier Laser dBm
+                    index: oa-tx-dbm.{{ $index }}
+                    entPhysicalIndex: 'oa-{{ $index }}'
 
                 -
-                    oid: oaIfTable 
+                    oid: oaIfTable
                     value: oaIfActualGain
                     divisor: 10
                     num_oid: '.1.3.6.1.4.1.8708.2.19.2.2.1.1.51.{{ $index }}'
                     descr: 'Amplifier Gain {{ $oaIfSubrack }}:{{ $oaIfName }}'
-                    group: Amplifier Laser Gain dBm   
-                    index: oa-gain-dbm.{{ $index }}    
-                    entPhysicalIndex: 'oa-{{ $index }}'    
+                    group: Amplifier Laser Gain dBm
+                    index: oa-gain-dbm.{{ $index }}
+                    entPhysicalIndex: 'oa-{{ $index }}'
 
                 -
-                    oid: ifPerfL0Table 
+                    oid: ifPerfL0Table
                     value: ifPerfL0RxPower
                     divisor: 10
                     num_oid: '.1.3.6.1.4.1.8708.2.56.2.6.1.1.4.{{ $index }}'
                     descr: 'Laser Rx {{ $ifPerfL0Name }}'
-                    group: Laser dBm   
-                    index: laser-rx-dbm.{{ $index }}    
-                    entPhysicalIndex: 'laser-{{ $index }}' 
-                    skip_values: [2147483646, -2147483648]    
+                    group: Laser dBm
+                    index: laser-rx-dbm.{{ $index }}
+                    entPhysicalIndex: 'laser-{{ $index }}'
+                    skip_values: [2147483646, -2147483648]
 
                 -
-                    oid: ifPerfL0Table 
+                    oid: ifPerfL0Table
                     value: ifPerfL0TxPower
                     divisor: 10
                     num_oid: '.1.3.6.1.4.1.8708.2.56.2.6.1.1.5.{{ $index }}'
                     descr: 'Laser Tx {{ $ifPerfL0Name }}'
-                    group: Laser dBm   
-                    index: laser-tx-dbm.{{ $index }}    
+                    group: Laser dBm
+                    index: laser-tx-dbm.{{ $index }}
                     entPhysicalIndex: 'laser-{{ $index }}'
-                    skip_values: [2147483646, -2147483648]                                                 
+                    skip_values: [2147483646, -2147483648]
 
         current:
             data:
                 -
                     oid: oaIfTable
                     value: oaIfLaserBias
-                    divisor: 10000   
+                    divisor: 10000
                     num_oid: '.1.3.6.1.4.1.8708.2.19.2.2.1.1.22.{{ $index }}'
                     descr: 'Amplifier current {{ $oaIfSubrack }}:{{ $oaIfName }}'
                     group: Amplifier Laser Current
                     entPhysicalIndex: 'oa-{{ $index }}'
 
-                -
-                    oid: oaIfTable
-                    value: oaIfLaserBias
-                    divisor: 10000   
-                    num_oid: '.1.3.6.1.4.1.8708.2.19.2.2.1.1.22.{{ $index }}'
-                    descr: 'Amplifier current {{ $oaIfSubrack }}:{{ $oaIfName }}'
-                    group: Amplifier Laser Current
-                    entPhysicalIndex: 'oa-{{ $index }}'                    
-
                 -
                     oid:  ifPhysicalTrxTable
                     value: ifPhysicalTrxLaserBias
-                    divisor: 10000   
+                    divisor: 10000
                     num_oid: '.1.3.6.1.4.1.8708.2.47.2.2.1.1.4.{{ $index }}'
                     descr: 'Laser current {{ $ifPhysicalTrxName }}'
                     group: Laser Current
-                    entPhysicalIndex: 'laser-{{ $index }}' 
-                    skip_values: [2147483646, 2147483647, -2147483648, 4294967293, 4294967294, 2147483648]    
+                    entPhysicalIndex: 'laser-{{ $index }}'
+                    skip_values: [2147483646, 2147483647, -2147483648, 4294967293, 4294967294, 2147483648]
 
         chromatic_dispersion:
             data:
                 -
-                    oid: ifPerfL0Table 
+                    oid: ifPerfL0Table
                     value: ifPerfL0ChromaticDispersion
                     num_oid: '.1.3.6.1.4.1.8708.2.56.2.6.1.1.7.{{ $index }}'
                     descr: 'Laser CD {{ $ifPerfL0Name }}'
-                    group: Laser Chromatic Dispersion   
-                    index: laser-cd.{{ $index }}    
+                    group: Laser Chromatic Dispersion
+                    index: laser-cd.{{ $index }}
                     entPhysicalIndex: 'laser-{{ $index }}'
-                    skip_values: [2147483646, 2147483647, -2147483648]                      
+                    skip_values: [2147483646, 2147483647, -2147483648]

includes/definitions/discovery/innovaphone.yaml

@@ -36,7 +36,7 @@ modules:
                         - { descr: up,   graph: 0, value: 2, generic: 0 }
                 -
                     oid: l3Table
-                    value: l3Label
+                    value: l3Protocol
                     num_oid: '.1.3.6.1.4.1.6666.1.4.1.2.{{ $index }}'
                     descr: 'ISDN signaling protocol {{ $l3Label }}'
                     state_name: l3Label
@@ -53,13 +53,16 @@ modules:
                     value: l3NumBchanActive
                     num_oid: '.1.3.6.1.4.1.6666.1.4.1.4.{{ $index }}'
                     descr: 'Active calls {{ $l3Label }}'
+                    index: 'l3NumBchanActive.{{ $index }}'
                 -
                     oid: l3Table
                     value: l3CallsBoot
                     num_oid: '.1.3.6.1.4.1.6666.1.4.1.5.{{ $index }}'
                     descr: "Calls since boot {{ $l3Label }}"
+                    index: 'l3CallsBoot.{{ $index }}'
                 -
                     oid: l3Table
                     value: l3NumBchan
                     num_oid: '.1.3.6.1.4.1.6666.1.4.1.3.{{ $index }}'
                     descr: 'Available Channels {{ $l3Label }}'
+                    index: 'l3NumBchan.{{ $index }}'

includes/definitions/discovery/polycomLens.yaml

@@ -12,6 +12,8 @@ modules:
                     value: identityStatus
                     num_oid: '.1.3.6.1.4.1.13885.101.1.1.6.{{ $index }}'
                     descr: 'Overall System status'
+                    index: "identityStatus.{{ $index }}"
+                    state_name: polycomEndpointGeneric
                     states:
                         - { value: 1, descr: disabled, graph: 1, generic: 3 }
                         - { value: 2, descr: ok, graph: 1, generic: 0 }
@@ -21,6 +23,8 @@ modules:
                     value: serviceH323Status
                     num_oid: '.1.3.6.1.4.1.13885.101.1.2.7.1.{{ $index }}'
                     descr: 'H323 Status'
+                    index: "serviceH323Status.{{ $index }}"
+                    state_name: polycomEndpointGeneric
                     states:
                         - { value: 1, descr: disabled, graph: 1, generic: 3 }
                         - { value: 2, descr: ok, graph: 1, generic: 0 }
@@ -28,8 +32,10 @@ modules:
                 -
                     oid: serviceH323
                     value: serviceH323RegistrationStatus
-                    num_oid: '.1.3.6.1.4.1.13885.101.1.2.7.1.{{ $index }}'
+                    num_oid: '.1.3.6.1.4.1.13885.101.1.2.7.2.{{ $index }}'
                     descr: 'H323 Status'
+                    index: "serviceH323RegistrationStatus.{{ $index }}"
+                    state_name: polycomEndpointGeneric
                     states:
                         - { value: 1, descr: disabled, graph: 1, generic: 3 }
                         - { value: 2, descr: ok, graph: 1, generic: 0 }
@@ -39,6 +45,8 @@ modules:
                     value: serviceSipStatus
                     num_oid: '.1.3.6.1.4.1.13885.101.1.2.8.1.{{ $index }}'
                     descr: 'Sip overall Status'
+                    index: "serviceSipStatus.{{ $index }}"
+                    state_name: polycomEndpointGeneric
                     states:
                         - { value: 1, descr: disabled, graph: 1, generic: 3 }
                         - { value: 2, descr: ok, graph: 1, generic: 0 }
@@ -48,6 +56,8 @@ modules:
                     value: serviceSipRegistrationStatus
                     num_oid: '.1.3.6.1.4.1.13885.101.1.2.8.3.1.2.{{ $index }}'
                     descr: 'Sip Status Line {{ $index }}'
+                    index: "serviceSipRegistrationStatus.{{ $index }}"
+                    state_name: polycomEndpointGeneric
                     states:
                         - { value: 1, descr: disabled, graph: 1, generic: 3 }
                         - { value: 2, descr: ok, graph: 1, generic: 0 }
@@ -57,6 +67,8 @@ modules:
                     value: serviceIsdnStatus
                     num_oid: '.1.3.6.1.4.1.13885.101.1.2.9.1.{{ $index }}'
                     descr: 'ISDN Status'
+                    index: "serviceIsdnStatus.{{ $index }}"
+                    state_name: polycomEndpointGeneric
                     states:
                         - { value: 1, descr: disabled, graph: 1, generic: 3 }
                         - { value: 2, descr: ok, graph: 1, generic: 0 }
@@ -66,6 +78,8 @@ modules:
                     value: hardwareOverallStatus
                     num_oid: '.1.3.6.1.4.1.13885.101.1.3.1.{{ $index }}'
                     descr: 'Hardware Status'
+                    index: "hardwareOverallStatus.{{ $index }}"
+                    state_name: polycomEndpointGeneric
                     states:
                         - { value: 1, descr: disabled, graph: 1, generic: 3 }
                         - { value: 2, descr: ok, graph: 1, generic: 0 }
@@ -75,6 +89,8 @@ modules:
                     value: hardwareMicrophoneStatus
                     num_oid: '.1.3.6.1.4.1.13885.101.1.3.5.1.{{ $index }}'
                     descr: 'Microphone Status'
+                    index: "hardwareMicrophoneStatus.{{ $index }}"
+                    state_name: polycomEndpointGeneric
                     states:
                         - { value: 1, descr: disabled, graph: 1, generic: 3 }
                         - { value: 2, descr: ok, graph: 1, generic: 0 }
@@ -84,6 +100,8 @@ modules:
                     value: hardwareCameraStatus
                     num_oid: '.1.3.6.1.4.1.13885.101.1.3.6.1.{{ $index }}'
                     descr: 'Camera Status'
+                    index: "hardwareCameraStatus.{{ $index }}"
+                    state_name: polycomEndpointGeneric
                     states:
                         - { value: 1, descr: disabled, graph: 1, generic: 3 }
                         - { value: 2, descr: ok, graph: 1, generic: 0 }
@@ -93,6 +111,8 @@ modules:
                     value: hardwareNICStatus
                     num_oid: '.1.3.6.1.4.1.13885.101.1.3.10.1.{{ $index }}'
                     descr: 'NIC Status'
+                    index: "hardwareNICStatus.{{ $index }}"
+                    state_name: polycomEndpointGeneric
                     states:
                         - { value: 1, descr: disabled, graph: 1, generic: 3 }
                         - { value: 2, descr: ok, graph: 1, generic: 0 }
@@ -102,6 +122,8 @@ modules:
                     value: hardwarePTCStatus
                     num_oid: '.1.3.6.1.4.1.13885.101.1.3.11.1.{{ $index }}'
                     descr: 'PTC Status'
+                    index: "hardwarePTCStatus.{{ $index }}"
+                    state_name: polycomEndpointGeneric
                     states:
                         - { value: 1, descr: disabled, graph: 1, generic: 3 }
                         - { value: 2, descr: ok, graph: 1, generic: 0 }
@@ -111,6 +133,8 @@ modules:
                     value: hardwareUcBoardStatus
                     num_oid: '.1.3.6.1.4.1.13885.101.1.3.12.1.{{ $index }}'
                     descr: 'Uc Board Status'
+                    index: "hardwareUcBoardStatus.{{ $index }}"
+                    state_name: polycomEndpointGeneric
                     states:
                         - { value: 1, descr: disabled, graph: 1, generic: 3 }
                         - { value: 2, descr: ok, graph: 1, generic: 0 }
@@ -120,6 +144,8 @@ modules:
                     value:  externalIntegrationPresenceStatus
                     num_oid: '.1.3.6.1.4.1.13885.101.1.6.7.1.{{ $index }}'
                     descr: 'Poly Presence Service Status'
+                    index: "externalIntegrationPresenceStatus.{{ $index }}"
+                    state_name: polycomEndpointGeneric
                     states:
                         - { value: 1, descr: disabled, graph: 1, generic: 3 }
                         - { value: 2, descr: ok, graph: 1, generic: 0 }
@@ -129,6 +155,8 @@ modules:
                     value:  externalIntegrationCDRStatus
                     num_oid: '.1.3.6.1.4.1.13885.101.1.6.8.1.{{ $index }}'
                     descr: 'Poly CDR Service Status'
+                    index: "externalIntegrationCDRStatus.{{ $index }}"
+                    state_name: polycomEndpointGeneric
                     states:
                         - { value: 1, descr: disabled, graph: 1, generic: 3 }
                         - { value: 2, descr: ok, graph: 1, generic: 0 }
@@ -138,6 +166,8 @@ modules:
                     value:  externalIntegrationSyslogStatus
                     num_oid: '.1.3.6.1.4.1.13885.101.1.6.9.1.{{ $index }}'
                     descr: 'Syslog Service Status'
+                    index: "externalIntegrationSyslogStatus.{{ $index }}"
+                    state_name: polycomEndpointGeneric
                     states:
                         - { value: 1, descr: disabled, graph: 1, generic: 3 }
                         - { value: 2, descr: ok, graph: 1, generic: 0 }
@@ -147,6 +177,8 @@ modules:
                     value:  externalIntegrationSoftwareUpdateStatus
                     num_oid: '.1.3.6.1.4.1.13885.101.1.6.10.1.{{ $index }}'
                     descr: 'Poly Software Update Status'
+                    index: "externalIntegrationSoftwareUpdateStatus.{{ $index }}"
+                    state_name: polycomEndpointGeneric
                     states:
                         - { value: 1, descr: disabled, graph: 1, generic: 3 }
                         - { value: 2, descr: ok, graph: 1, generic: 0 }
@@ -156,6 +188,8 @@ modules:
                     value:  externalIntegrationProvisioningStatus
                     num_oid: '.1.3.6.1.4.1.13885.101.1.6.11.1.{{ $index }}'
                     descr: 'Poly Provisioning Status'
+                    index: "externalIntegrationProvisioningStatus.{{ $index }}"
+                    state_name: polycomEndpointGeneric
                     states:
                         - { value: 1, descr: disabled, graph: 1, generic: 3 }
                         - { value: 2, descr: ok, graph: 1, generic: 0 }
@@ -165,6 +199,8 @@ modules:
                     value:  externalIntegrationExchangeStatus
                     num_oid: '.1.3.6.1.4.1.13885.101.1.6.12.1.{{ $index }}'
                     descr: 'Exchange Integration Status'
+                    index: "externalIntegrationExchangeStatus.{{ $index }}"
+                    state_name: polycomEndpointGeneric
                     states:
                         - { value: 1, descr: disabled, graph: 1, generic: 3 }
                         - { value: 2, descr: ok, graph: 1, generic: 0 }
@@ -174,7 +210,9 @@ modules:
                     value:  externalIntegrationDirectorySvcsStatus
                     num_oid: '.1.3.6.1.4.1.13885.101.1.6.13.1.{{ $index }}'
                     descr: 'Directory Integration Status'
+                    index: "externalIntegrationDirectorySvcsStatus.{{ $index }}"
+                    state_name: polycomEndpointGeneric
                     states:
                         - { value: 1, descr: disabled, graph: 1, generic: 3 }
                         - { value: 2, descr: ok, graph: 1, generic: 0 }
-                        - { value: 3, descr: failed, graph: 1, generic: 2 }
+                        - { value: 3, descr: failed, graph: 1, generic: 2 }

includes/definitions/discovery/scs-ks.yaml

@@ -8,6 +8,7 @@ modules:
                     value: exhaust-air-temperature
                     num_oid: '.1.3.6.1.4.1.9839.1.2.15.{{ $index }}'
                     descr: 'Exhaust air temperature'
+                    index: "exhaust.{{ $index }}"
                     divisor: 10
 
                 -
@@ -15,6 +16,7 @@ modules:
                     value: supply-air-temperature
                     num_oid: '.1.3.6.1.4.1.9839.1.2.16.{{ $index }}'
                     descr: 'Supply air temperature'
+                    index: "supply.{{ $index }}"
                     divisor: 10
 
                 -
@@ -22,6 +24,7 @@ modules:
                     value: outside-air-temperature
                     num_oid: '.1.3.6.1.4.1.9839.1.2.17.{{ $index }}'
                     descr: 'Outside air temperature'
+                    index: "outside.{{ $index }}"
                     divisor: 10
 
                 -
@@ -29,6 +32,7 @@ modules:
                     value: room-temperature
                     num_oid: '.1.3.6.1.4.1.9839.1.2.18.{{ $index }}'
                     descr: 'Room temperature'
+                    index: "room.{{ $index }}"
                     divisor: 10
 
         humidity:

includes/definitions/discovery/sentry3.yaml

@@ -17,11 +17,11 @@ modules:
                   value: infeedLoadValue
                   num_oid: '.1.3.6.1.4.1.1718.3.2.2.1.7.{{ $index }}'
                   descr: infeedName
-                  index: 'infeedID.{{ $index }}' 
+                  index: 'infeedID.{{ $index }}'
                   ## limits need to be excluded from the divisor somehow
                   #warn_limit: infeedLoadHighThresh
                   #high_limit: infeedCapacity
-                  
+
                 - oid: outletTable
                   value: outletLoadValue
                   num_oid: '.1.3.6.1.4.1.1718.3.2.3.1.7.{{ $index }}'
@@ -32,7 +32,6 @@ modules:
                   #warn_limit: outletLoadHighThresh
                   #high_limit: outputCapacity
         voltage:
-            # note: this is configured, not measured
             options:
                 divisor: 10
                 skip_value_lt: 0
@@ -44,7 +43,7 @@ modules:
                   # recording voltage for additional feeds (3-phase)
                   # would require reindexing and moving RRD files;
                   # this is a configured value, not measured.
-                  index: '{{ $subindex0 }}'
+                  # ^ yeah, you broke it anyway by setting "index: '{{ $subindex0 }}'"
                   group: 'Configured Voltage'
         power:
             options:

includes/definitions/discovery/smartos-dcp-m.yaml

@@ -7,7 +7,7 @@ modules:
             data:
                 -
                     oid: dcpInterfaceTable
-                    num_oid: '.1.3.6.1.4.1.30826.2.2.2.1.1.1.5.{{ $index }}'
+                    num_oid: '.1.3.6.1.4.1.30826.2.2.1.1.1.1.5.{{ $index }}'
                     value: dcpInterfaceStatus
                     descr: '{{ $dcpInterfaceName }}'
                     index: 'dcpInterfaceStatus.{{ $index }}'
@@ -18,7 +18,7 @@ modules:
                         - { value: 3, generic: 0, graph: 1, descr: up }
                 -
                     oid: dcpLinkviewTable
-                    num_oid: '.1.3.6.1.4.1.30826.2.2.2.1.1.1.5.{{ $index }}'
+                    num_oid: '.1.3.6.1.4.1.30826.2.2.3.1.1.1.4.{{ $index }}'
                     value: dcpLinkviewLocalStatus
                     descr: '{{ $dcpLinkviewLocalName }} - {{ $dcpLinkviewRemoteName }}'
                     index: 'dcpLinkviewLocalStatus.{{ $index }}'

includes/definitions/discovery/timos.yaml

@@ -216,10 +216,12 @@ modules:
                             op: '='
                             value: 2
                 -
-                    oid: tmnxDigitalDiagMonitorEntry
+                    oid: tmnxDigitalDiagMonitorTable
                     value: tmnxDDMTemperature
                     num_oid: '.1.3.6.1.4.1.6527.3.1.2.2.4.31.1.1.{{ $index }}'
                     descr: '{{ ifName:1 }}'
+                    entPhysicalIndex: '{{ $subindex1 }}'
+                    entPhysicalIndex_measured: ports
                     index: '{{ $index }}'
                     high_limit: tmnxDDMTempHiAlarm
                     warn_limit: tmnxDDMTempHiWarning
@@ -238,11 +240,11 @@ modules:
         current:
             data:
                 -
-                    oid: tmnxDigitalDiagMonitorEntry
+                    oid: tmnxDigitalDiagMonitorTable
                     value: tmnxDDMTxBiasCurrent
                     num_oid: '.1.3.6.1.4.1.6527.3.1.2.2.4.31.1.11.{{ $index }}'
                     descr: '{{ ifName:1 }} Tx Bias'
-                    entPhysicalIndex: '{{ $index }}'
+                    entPhysicalIndex: '{{ $subindex1 }}'
                     entPhysicalIndex_measured: ports
                     index: 'tx-bias-{{ $index }}'
                     divisor: 500000
@@ -264,7 +266,7 @@ modules:
                     value: tmnxDDMLaneTxBiasCurrent
                     num_oid: '.1.3.6.1.4.1.6527.3.1.2.2.4.66.1.7.{{ $index }}'
                     descr: '{{ ifName:1 }} Lane {{ $subindex2 }} Tx Bias'
-                    entPhysicalIndex: '{{ $index }}'
+                    entPhysicalIndex: '{{ $subindex1 }}'
                     entPhysicalIndex_measured: ports
                     index: 'tx-bias-{{ $index }}'
                     divisor: 500000
@@ -285,11 +287,11 @@ modules:
         dbm:
             data:
                 -
-                    oid: tmnxDigitalDiagMonitorEntry
+                    oid: tmnxDigitalDiagMonitorTable
                     value: tmnxDDMRxOpticalPower
                     num_oid: '.1.3.6.1.4.1.6527.3.1.2.2.4.31.1.21.{{ $index }}'
                     descr: '{{ ifName:1 }} Rx'
-                    entPhysicalIndex: '{{ $index }}'
+                    entPhysicalIndex: '{{ $subindex1 }}'
                     entPhysicalIndex_measured: ports
                     index: 'rx-{{ $index }}'
                     divisor: 10
@@ -309,11 +311,11 @@ modules:
                             op: '>'
                             value: 0
                 -
-                    oid: tmnxDigitalDiagMonitorEntry
+                    oid: tmnxDigitalDiagMonitorTable
                     value: tmnxDDMTxOutputPower
                     num_oid: '.1.3.6.1.4.1.6527.3.1.2.2.4.31.1.16.{{ $index }}'
                     descr: '{{ ifName:1 }} Tx'
-                    entPhysicalIndex: '{{ $index }}'
+                    entPhysicalIndex: '{{ $subindex1 }}'
                     entPhysicalIndex_measured: ports
                     index: 'tx-{{ $index }}'
                     divisor: 10
@@ -337,7 +339,7 @@ modules:
                     value: tmnxDDMLaneRxOpticalPower
                     num_oid: '.1.3.6.1.4.1.6527.3.1.2.2.4.66.1.17.{{ $index }}'
                     descr: '{{ ifName:1 }} Lane {{ $subindex2 }} Rx'
-                    entPhysicalIndex: '{{ $index }}'
+                    entPhysicalIndex: '{{ $subindex1 }}'
                     entPhysicalIndex_measured: ports
                     index: 'lane-rx-{{ $index }}'
                     user_func: 'uw_to_dbm'
@@ -357,7 +359,7 @@ modules:
                     value: tmnxDDMLaneTxOutputPower
                     num_oid: '.1.3.6.1.4.1.6527.3.1.2.2.4.66.1.12.{{ $index }}'
                     descr: '{{ ifName:1 }} Lane {{ $subindex2 }} Tx'
-                    entPhysicalIndex: '{{ $index }}'
+                    entPhysicalIndex: '{{ $subindex1 }}'
                     entPhysicalIndex_measured: ports
                     index: 'lane-tx-{{ $index }}'
                     user_func: 'uw_to_dbm'
@@ -375,10 +377,12 @@ modules:
         voltage:
             data:
                 -
-                    oid: tmnxDigitalDiagMonitorEntry
+                    oid: tmnxDigitalDiagMonitorTable
                     value: tmnxDDMSupplyVoltage
                     num_oid: '.1.3.6.1.4.1.6527.3.1.2.2.4.31.1.6.{{ $index }}'
                     descr: '{{ ifName:1 }}'
+                    entPhysicalIndex: '{{ $subindex1 }}'
+                    entPhysicalIndex_measured: ports
                     index: '{{ $index }}'
                     high_limit: tmnxDDMSupplyVoltageHiAlarm
                     warn_limit: tmnxDDMSupplyVoltageHiWarning

includes/discovery/functions.inc.php

@@ -125,6 +125,9 @@ function discover_new_device($hostname, $device, $method, $interface = null)
  */
 function discover_device(&$device, $force_module = false)
 {
+    DeviceCache::setPrimary($device['device_id']);
+    App::forgetInstance('sensor-discovery');
+
     if ($device['snmp_disable'] == '1') {
         return true;
     }

includes/discovery/ipv6-addresses.inc.php

@@ -4,6 +4,8 @@ use LibreNMS\Config;
 use LibreNMS\Exceptions\InvalidIpException;
 use LibreNMS\Util\IPv6;
 
+$valid ??= []; // may not be instantiated.  I think this is the last place that uses this global.
+
 foreach (DeviceCache::getPrimary()->getVrfContexts() as $context_name) {
     $device['context_name'] = $context_name;
 
@@ -14,6 +16,12 @@ foreach (DeviceCache::getPrimary()->getVrfContexts() as $context_name) {
             ->walk(['IP-MIB::ipAddressIfIndex.ipv6', 'IP-MIB::ipAddressOrigin.ipv6', 'IP-MIB::ipAddressPrefix.ipv6'])
             ->table(4);
         foreach ($oids['ipv6'] ?? [] as $address => $data) {
+            if (! is_array($data)) {
+                \Illuminate\Support\Facades\Log::debug('IPv6 data invalid');
+
+                continue;
+            }
+
             try {
                 $ifIndex = $data['IP-MIB::ipAddressIfIndex'];
                 $ipv6_address = IPv6::fromHexString($address)->uncompressed();

includes/discovery/ports/moxa-etherdevice.inc.php

@@ -11,12 +11,9 @@
 //portName OID is based on each device model/MIB
 $oid = $device['sysObjectID'] . '.1.9.1.1.7';
 
-$port_names = snmpwalk_cache_oid($device, $oid, $port_names);
-
-foreach ($port_names as $oid => $value) {
-    if (! empty($value['iso'])) {
-        // determine index
-        $index = end(explode('.', $oid));
-        $port_stats[$index]['ifAlias'] = $value['iso'];
+foreach (SnmpQuery::walk($oid)->values() as $oid => $name) {
+    if ($name) {
+        $index = \Illuminate\Support\Str::afterLast($oid, '.');
+        $port_stats[$index]['ifAlias'] = $name;
     }
 }

includes/discovery/sensors/dbm/timos.inc.php

@@ -1,49 +0,0 @@
-<?php
-
-$multiplier = 1;
-$divisor = 10000;
-$user_func = 'mw_to_dbm';
-foreach ($pre_cache['timos_oids'] as $index => $entry) {
-    if (is_numeric($entry['tmnxDDMRxOpticalPower']) && $entry['tmnxDDMRxOpticalPower'] != 0 && $entry['tmnxDDMTxOutputPower'] != 0) {
-        $oid = '.1.3.6.1.4.1.6527.3.1.2.2.4.31.1.21.' . $index;
-        $value = round(10 * log10($entry['tmnxDDMRxOpticalPower'] / $divisor), 2);
-
-        $int_ext = $entry['tmnxDDMExternallyCalibrated'];
-        if ($int_ext == 'true') {
-            $int_ext = 'Ext-Cal';
-        } elseif ($int_ext == 'false') {
-            $int_ext = 'Int-Cal';
-        } else {
-            $int_ext = 'Unknown';
-        }
-
-        $entPhysicalIndex = $index;
-        $entPhysicalIndex_measured = 'ports';
-
-        $limit_low = round(10 * log10($entry['tmnxDDMRxOpticalPowerLowAlarm'] / $divisor), 2);
-        $warn_limit_low = round(10 * log10($entry['tmnxDDMRxOpticalPowerLowWarning'] / $divisor), 2);
-        $limit = round(10 * log10($entry['tmnxDDMRxOpticalPowerHiAlarm'] / $divisor), 2);
-        $warn_limit = round(10 * log10($entry['tmnxDDMRxOpticalPowerHiWarning'] / $divisor), 2);
-
-        $port_descr = get_port_by_index_cache($device['device_id'], str_replace('1.', '', $index));
-        $descr = $port_descr['ifName'] . ' RX Power ' . $int_ext;
-
-        discover_sensor(null, 'dbm', $device, $oid, 'rx-' . $index, 'timos', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured, $user_func);
-    }
-    if (is_numeric($entry['tmnxDDMTxOutputPower']) && $entry['tmnxDDMTxOutputPower'] != 0 && $entry['tmnxDDMRxOpticalPower'] != 0) {
-        $oid = '.1.3.6.1.4.1.6527.3.1.2.2.4.31.1.16.' . $index;
-        $value = round(10 * log10($entry['tmnxDDMTxOutputPower'] / $divisor), 2);
-        $entPhysicalIndex = $index;
-        $entPhysicalIndex_measured = 'ports';
-
-        $limit_low = round(10 * log10($entry['tmnxDDMTxOutputPowerLowAlarm'] / $divisor), 2);
-        $warn_limit_low = round(10 * log10($entry['tmnxDDMTxOutputPowerLowWarning'] / $divisor), 2);
-        $limit = round(10 * log10($entry['tmnxDDMTxOutputPowerHiAlarm'] / $divisor), 2);
-        $warn_limit = round(10 * log10($entry['tmnxDDMTxOutputPowerHiWarning'] / $divisor), 2);
-
-        $port_descr = get_port_by_index_cache($device['device_id'], str_replace('1.', '', $index));
-        $descr = $port_descr['ifName'] . ' TX Power';
-
-        discover_sensor(null, 'dbm', $device, $oid, 'tx-' . $index, 'timos', $descr, $divisor, $multiplier, $limit_low, $warn_limit_low, $warn_limit, $limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured, $user_func);
-    }
-}

includes/discovery/sensors/gw-eydfa.inc.php

@@ -48,7 +48,7 @@ foreach (explode("\n", $oids) as $data) {
         }
         discover_sensor(null, 'current', $device, $num_oid, $sensor_index, 'gw-eydfa', $descr, $divisor, 1, $low_limit, $low_warn, $high_warn, $high_limit, $value);
     }
-    if ($split_oid[0] == 'oaPumpTEC' && $index = 1) { // Current - A
+    if ($split_oid[0] == 'oaPumpTEC' && $index == 1) { // Current - A
         $divisor = 100;
         $descr = 'TEC Pump - ' . $index;
         $num_oid = '.1.3.6.1.4.1.17409.1.11.4.1.3.' . $index;
@@ -62,7 +62,7 @@ foreach (explode("\n", $oids) as $data) {
         $sensor_index = 'oaPumpTEC' . $index;
         discover_sensor(null, 'current', $device, $num_oid, $sensor_index, 'gw-eydfa', $descr, $divisor, 1, $low_limit, $low_warn, $high_warn, $high_limit, $value);
     }
-    if ($split_oid[0] == 'oaPumpTemp' && $index = 1) { // Temperature - C
+    if ($split_oid[0] == 'oaPumpTemp' && $index == 1) { // Temperature - C
         $divisor = 10;
         $descr = 'Temperature Pump - ' . $index;
         $num_oid = '.1.3.6.1.4.1.17409.1.11.4.1.4.' . $index;

includes/discovery/sensors/pre-cache/timos.inc.php

@@ -1,13 +0,0 @@
-<?php
-/*
- * LibreNMS
- *
- * Copyright (c) 2016 Neil Lathwood <[email protected]>
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.  Please see LICENSE.txt at the top level of
- * the source code distribution for details.
- */
-
-$pre_cache['timos_oids'] = snmpwalk_cache_multi_oid($device, 'tmnxDigitalDiagMonitorEntry', [], 'TIMETRA-PORT-MIB', 'timos');

includes/polling/ports/os/moxa-etherdevice.inc.php

@@ -11,12 +11,9 @@
 //portName OID is based on each device model/MIB
 $oid = $device['sysObjectID'] . '.1.9.1.1.7';
 
-$port_names = snmpwalk_cache_oid($device, $oid, $port_names);
-
-foreach ($port_names as $oid => $value) {
-    if (! empty($value['iso'])) {
-        // determine index
-        $index = end(explode('.', $oid));
-        $port_stats[$index]['ifAlias'] = $value['iso'];
+foreach (SnmpQuery::walk($oid)->values() as $oid => $name) {
+    if ($name) {
+        $index = \Illuminate\Support\Str::afterLast($oid, '.');
+        $port_stats[$index]['ifAlias'] = $name;
     }
 }

tests/AuthSSOTest.php

@@ -66,6 +66,8 @@ class AuthSSOTest extends DBTestCase
         Config::set('sso.group_delimiter', ';');
         Config::set('sso.group_level_map', null);
         Config::set('sso.static_level', -1);
+        /** @phpstan-ignore-next-line */
+        \Bouncer::refresh();
     }
 
     // Set up $_SERVER in env mode

tests/OSModulesTest.php

@@ -119,8 +119,8 @@ class OSModulesTest extends DBTestCase
         $phpunit_debug = in_array('--debug', $_SERVER['argv'], true);
 
         foreach ($modules as $module => $module_status) {
-            $expected = $expected_data[$module]['discovery'] ?? [];
-            $actual = $results[$module]['discovery'] ?? [];
+            $expected = $expected_data[$module]['discovery'] ?? null;
+            $actual = $results[$module]['discovery'] ?? null;
             $this->checkTestData($expected, $actual, 'Discovered', $os, $module, $filename, $helper, $phpunit_debug);
 
             // modules without polling
@@ -129,9 +129,9 @@ class OSModulesTest extends DBTestCase
             }
 
             if ($expected_data[$module]['poller'] !== 'matches discovery') {
-                $expected = $expected_data[$module]['poller'] ?? [];
+                $expected = $expected_data[$module]['poller'] ?? null;
             }
-            $actual = $results[$module]['poller'] ?? [];
+            $actual = $results[$module]['poller'] ?? null;
             $this->checkTestData($expected, $actual, 'Polled', $os, $module, $filename, $helper, $phpunit_debug);
         }
 
@@ -174,10 +174,13 @@ class OSModulesTest extends DBTestCase
         });
     }
 
-    private function checkTestData(array $expected, array $actual, string $type, string $os, mixed $module, string $filename, ModuleTestHelper $helper, bool $phpunit_debug): void
+    private function checkTestData(?array $expected, ?array $actual, string $type, string $os, mixed $module, string $filename, ModuleTestHelper $helper, bool $phpunit_debug): void
     {
         // try simple and fast comparison first, if that fails, do a costly/well formatted comparison
         if ($expected != $actual) {
+            $this->assertNotNull($actual, "OS $os: $type $module no data generated when it is expected");
+            $this->assertNotNull($expected, "OS $os: $type $module generates data when none is expected");
+
             $message = Color::colorize('bg-red', "OS $os: $type $module data does not match that found in $filename");
             $message .= PHP_EOL;
             $message .= ($type == 'Discovered'

tests/data/cumulus_cumulus.json

@@ -3013,7 +3013,7 @@
                     "bgpPeerLastErrorCode": 0,
                     "bgpPeerLastErrorSubCode": 0,
                     "bgpPeerLastErrorText": null,
-                    "bgpPeerIface": null,
+                    "bgpPeerIface": 2,
                     "bgpLocalAddr": "192.168.125.2",
                     "bgpPeerRemoteAddr": "0.0.0.0",
                     "bgpPeerDescr": "",

tests/data/drac.json

@@ -669,7 +669,7 @@
                     "group": null,
                     "sensor_divisor": 10,
                     "sensor_multiplier": 1,
-                    "sensor_current": 1.281,
+                    "sensor_current": 0.8,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -694,7 +694,7 @@
                     "group": null,
                     "sensor_divisor": 10,
                     "sensor_multiplier": 1,
-                    "sensor_current": 1.195,
+                    "sensor_current": 0,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -4928,7 +4928,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": null,
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 1.281,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": null
@@ -4953,7 +4953,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": null,
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 1.195,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": null

tests/data/edgeos.json

@@ -3672,10 +3672,10 @@
                     "bgpPeerRemoteAs": 65000,
                     "bgpPeerState": "established",
                     "bgpPeerAdminStatus": "start",
-                    "bgpPeerLastErrorCode": null,
+                    "bgpPeerLastErrorCode": 0,
                     "bgpPeerLastErrorSubCode": null,
                     "bgpPeerLastErrorText": null,
-                    "bgpPeerIface": null,
+                    "bgpPeerIface": 26,
                     "bgpLocalAddr": "172.16.200.2",
                     "bgpPeerRemoteAddr": "0.0.0.0",
                     "bgpPeerDescr": "",

tests/data/fortigate_60f3g4g.json

@@ -4814,7 +4814,7 @@
                     "bgpPeerLastErrorCode": 4,
                     "bgpPeerLastErrorSubCode": 0,
                     "bgpPeerLastErrorText": null,
-                    "bgpPeerIface": null,
+                    "bgpPeerIface": 18,
                     "bgpLocalAddr": "192.168.1.22",
                     "bgpPeerRemoteAddr": "0.0.0.0",
                     "bgpPeerDescr": "",

tests/data/ies5000_5005.json

@@ -6943,10 +6943,108 @@
                 },
                 {
                     "state_name": "systemStatus",
-                    "state_descr": null,
-                    "state_draw_graph": null,
-                    "state_value": null,
-                    "state_generic_value": null
+                    "state_descr": "moduleNoDefect",
+                    "state_draw_graph": 0,
+                    "state_value": 1,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "moduleOverHeat",
+                    "state_draw_graph": 0,
+                    "state_value": 2,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "moduleFanRpmLow",
+                    "state_draw_graph": 0,
+                    "state_value": 4,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "moduleVoltageLow",
+                    "state_draw_graph": 0,
+                    "state_value": 8,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "moduleThermalSensorFailure",
+                    "state_draw_graph": 0,
+                    "state_value": 16,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "modulePullOut",
+                    "state_draw_graph": 0,
+                    "state_value": 32,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "powerDC48VAFailure",
+                    "state_draw_graph": 0,
+                    "state_value": 64,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "powerDC48VBFailure",
+                    "state_draw_graph": 0,
+                    "state_value": 128,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "extAlarmInputTrigger",
+                    "state_draw_graph": 0,
+                    "state_value": 256,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "moduleDown",
+                    "state_draw_graph": 0,
+                    "state_value": 512,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "mscSwitchOverOK",
+                    "state_draw_graph": 0,
+                    "state_value": 1024,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "networkTopologyChange",
+                    "state_draw_graph": 0,
+                    "state_value": 2048,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "macSpoof",
+                    "state_draw_graph": 0,
+                    "state_value": 4096,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "cpuHigh",
+                    "state_draw_graph": 0,
+                    "state_value": 8192,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "memoryUsageHigh",
+                    "state_draw_graph": 0,
+                    "state_value": 16384,
+                    "state_generic_value": 2
                 }
             ]
         },

tests/data/ies5000_5106.json

@@ -11768,10 +11768,108 @@
                 },
                 {
                     "state_name": "systemStatus",
-                    "state_descr": null,
-                    "state_draw_graph": null,
-                    "state_value": null,
-                    "state_generic_value": null
+                    "state_descr": "moduleNoDefect",
+                    "state_draw_graph": 0,
+                    "state_value": 1,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "moduleOverHeat",
+                    "state_draw_graph": 0,
+                    "state_value": 2,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "moduleFanRpmLow",
+                    "state_draw_graph": 0,
+                    "state_value": 4,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "moduleVoltageLow",
+                    "state_draw_graph": 0,
+                    "state_value": 8,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "moduleThermalSensorFailure",
+                    "state_draw_graph": 0,
+                    "state_value": 16,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "modulePullOut",
+                    "state_draw_graph": 0,
+                    "state_value": 32,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "powerDC48VAFailure",
+                    "state_draw_graph": 0,
+                    "state_value": 64,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "powerDC48VBFailure",
+                    "state_draw_graph": 0,
+                    "state_value": 128,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "extAlarmInputTrigger",
+                    "state_draw_graph": 0,
+                    "state_value": 256,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "moduleDown",
+                    "state_draw_graph": 0,
+                    "state_value": 512,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "mscSwitchOverOK",
+                    "state_draw_graph": 0,
+                    "state_value": 1024,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "networkTopologyChange",
+                    "state_draw_graph": 0,
+                    "state_value": 2048,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "macSpoof",
+                    "state_draw_graph": 0,
+                    "state_value": 4096,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "cpuHigh",
+                    "state_draw_graph": 0,
+                    "state_value": 8192,
+                    "state_generic_value": 2
+                },
+                {
+                    "state_name": "systemStatus",
+                    "state_descr": "memoryUsageHigh",
+                    "state_draw_graph": 0,
+                    "state_value": 16384,
+                    "state_generic_value": 2
                 }
             ]
         },

tests/data/innovaphone.json

@@ -633,17 +633,67 @@
     "sensors": {
         "discovery": {
             "sensors": [
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "count",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.6666.1.4.1.5.80.82.73.49",
+                    "sensor_index": "l3CallsBoot.80.82.73.49",
+                    "sensor_type": "innovaphone",
+                    "sensor_descr": "Calls since boot PRI1",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "count",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.6666.1.4.1.3.80.82.73.49",
-                    "sensor_index": "80.82.73.49",
+                    "sensor_index": "l3NumBchan.80.82.73.49",
                     "sensor_type": "innovaphone",
                     "sensor_descr": "Available Channels PRI1",
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
+                    "sensor_current": 31,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "count",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.6666.1.4.1.4.80.82.73.49",
+                    "sensor_index": "l3NumBchanActive.80.82.73.49",
+                    "sensor_type": "innovaphone",
+                    "sensor_descr": "Active calls PRI1",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
                     "sensor_current": 0,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
@@ -719,7 +769,7 @@
                     "group": "PRI1",
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 1,
+                    "sensor_current": 3,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -1032,406 +1082,6 @@
                 }
             ]
         },
-        "poller": {
-            "sensors": [
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "count",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6666.1.4.1.3.80.82.73.49",
-                    "sensor_index": "80.82.73.49",
-                    "sensor_type": "innovaphone",
-                    "sensor_descr": "Available Channels PRI1",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 31,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6666.1.1.1.3.80.82.73.49.45.76.50",
-                    "sensor_index": "80.82.73.49.45.76.50",
-                    "sensor_type": "L2Mode",
-                    "sensor_descr": "Mode PRI1-L2",
-                    "group": "PRI1-L2",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 2,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "L2Mode"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6666.1.1.1.2.80.82.73.49.45.76.50",
-                    "sensor_index": "80.82.73.49.45.76.50",
-                    "sensor_type": "L2State",
-                    "sensor_descr": "LAPD PRI1-L2",
-                    "group": "PRI1-L2",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 1,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "L2State"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6666.1.4.1.2.80.82.73.49",
-                    "sensor_index": "80.82.73.49",
-                    "sensor_type": "l3Label",
-                    "sensor_descr": "ISDN signaling protocol PRI1",
-                    "group": "PRI1",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 3,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": 1,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "l3Label"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6666.2.1.1.1.4.1",
-                    "sensor_index": "1",
-                    "sensor_type": "voiceIfState",
-                    "sensor_descr": "Interface PRI1\u0000\u0000\u0000\u0000",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1",
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "voiceIfState"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6666.2.1.1.1.4.2",
-                    "sensor_index": "2",
-                    "sensor_type": "voiceIfState",
-                    "sensor_descr": "Interface TEST\u0000\u0000\u0000\u0000",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "2",
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "voiceIfState"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6666.2.1.1.1.4.3",
-                    "sensor_index": "3",
-                    "sensor_type": "voiceIfState",
-                    "sensor_descr": "Interface TONE\u0000\u0000\u0000\u0000",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "3",
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "voiceIfState"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6666.2.1.1.1.4.4",
-                    "sensor_index": "4",
-                    "sensor_type": "voiceIfState",
-                    "sensor_descr": "Interface HTTP\u0000\u0000\u0000\u0000",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "4",
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "voiceIfState"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6666.2.1.1.1.4.5",
-                    "sensor_index": "5",
-                    "sensor_type": "voiceIfState",
-                    "sensor_descr": "Interface ECHO\u0000\u0000\u0000\u0000",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "5",
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "voiceIfState"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6666.2.1.1.1.4.6",
-                    "sensor_index": "6",
-                    "sensor_type": "voiceIfState",
-                    "sensor_descr": "Interface SIG0\u0000\u0000\u0000\u0000",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "6",
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "voiceIfState"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6666.2.1.1.1.4.7",
-                    "sensor_index": "7",
-                    "sensor_type": "voiceIfState",
-                    "sensor_descr": "Interface SIG1\u0000\u0000\u0000\u0000",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "7",
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "voiceIfState"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6666.2.1.1.1.4.8",
-                    "sensor_index": "8",
-                    "sensor_type": "voiceIfState",
-                    "sensor_descr": "Interface FAX\u0000\u0000\u0000\u0000\u0000",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "8",
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "voiceIfState"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6666.2.1.1.1.4.9",
-                    "sensor_index": "9",
-                    "sensor_type": "voiceIfState",
-                    "sensor_descr": "Interface CONF\u0000\u0000\u0000\u0000",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "9",
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "voiceIfState"
-                }
-            ],
-            "state_indexes": [
-                {
-                    "state_name": "L2Mode",
-                    "state_descr": "TE",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "L2Mode",
-                    "state_descr": "NT",
-                    "state_draw_graph": 0,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "L2State",
-                    "state_descr": "down",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "L2State",
-                    "state_descr": "up",
-                    "state_draw_graph": 0,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "l3Label",
-                    "state_descr": "none",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "l3Label",
-                    "state_descr": "other",
-                    "state_draw_graph": 0,
-                    "state_value": 2,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "l3Label",
-                    "state_descr": "etsi",
-                    "state_draw_graph": 0,
-                    "state_value": 3,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "l3Label",
-                    "state_descr": "qsig",
-                    "state_draw_graph": 0,
-                    "state_value": 23,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "voiceIfState",
-                    "state_descr": "down",
-                    "state_draw_graph": 0,
-                    "state_value": 0,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "voiceIfState",
-                    "state_descr": "up",
-                    "state_draw_graph": 0,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                }
-            ]
-        }
+        "poller": "matches discovery"
     }
 }

tests/data/ios_3560g.json

@@ -156,7 +156,7 @@
                     "bgpPeerRemoteAs": 64513,
                     "bgpPeerState": "established",
                     "bgpPeerAdminStatus": "start",
-                    "bgpPeerLastErrorCode": null,
+                    "bgpPeerLastErrorCode": 0,
                     "bgpPeerLastErrorSubCode": null,
                     "bgpPeerLastErrorText": null,
                     "bgpPeerIface": null,
@@ -179,7 +179,7 @@
                     "bgpPeerRemoteAs": 64513,
                     "bgpPeerState": "established",
                     "bgpPeerAdminStatus": "start",
-                    "bgpPeerLastErrorCode": null,
+                    "bgpPeerLastErrorCode": 0,
                     "bgpPeerLastErrorSubCode": null,
                     "bgpPeerLastErrorText": null,
                     "bgpPeerIface": null,
@@ -317,5 +317,31 @@
             ]
         },
         "poller": "matches discovery"
+    },
+    "entity-physical": {
+        "discovery": {
+            "entPhysical": [
+                {
+                    "entPhysicalIndex": 1001,
+                    "entPhysicalDescr": null,
+                    "entPhysicalClass": null,
+                    "entPhysicalName": null,
+                    "entPhysicalHardwareRev": null,
+                    "entPhysicalFirmwareRev": null,
+                    "entPhysicalSoftwareRev": null,
+                    "entPhysicalAlias": null,
+                    "entPhysicalAssetID": null,
+                    "entPhysicalIsFRU": null,
+                    "entPhysicalModelName": "WS-C3560G-24TS-S",
+                    "entPhysicalVendorType": null,
+                    "entPhysicalSerialNum": "FOC1426Y2AY",
+                    "entPhysicalContainedIn": 0,
+                    "entPhysicalParentRelPos": -1,
+                    "entPhysicalMfgName": null,
+                    "ifIndex": null
+                }
+            ]
+        },
+        "poller": "matches discovery"
     }
 }

tests/data/ios_4506.json

@@ -34,7 +34,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -59,7 +59,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -84,7 +84,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -109,7 +109,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -134,7 +134,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -159,7 +159,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -184,7 +184,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -359,7 +359,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 1,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -384,7 +384,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 1,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -409,7 +409,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 5,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -434,7 +434,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 1,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -459,7 +459,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 5,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -484,7 +484,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 1,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -498,6 +498,31 @@
                     "rrd_type": "GAUGE",
                     "state_name": "ciscoEnvMonTemperatureState"
                 },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.9.9.176.1.2.14.0",
+                    "sensor_index": "0",
+                    "sensor_type": "cRFCfgRedundancyOperMode",
+                    "sensor_descr": "VSS Mode",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 1,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "0",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "cRFCfgRedundancyOperMode"
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
@@ -509,7 +534,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -534,7 +559,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 14,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -974,6 +999,62 @@
                     "state_value": 6,
                     "state_generic_value": 2
                 },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "nonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 1,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 2,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 3,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 4,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 5,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "coldStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 6,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "warmStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 7,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "hotStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 8,
+                    "state_generic_value": 0
+                },
                 {
                     "state_name": "cRFStatusPeerUnitState",
                     "state_descr": "notKnown",
@@ -1222,7 +1303,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "1000",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -1247,7 +1328,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "14",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -1272,7 +1353,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "2000",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -1297,7 +1378,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "3000",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -1322,7 +1403,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "4000",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -1347,7 +1428,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "5000",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -1372,7 +1453,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "6000",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -1547,7 +1628,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "1",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "ciscoEnvMonFanState"
@@ -1572,7 +1653,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "2",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "ciscoEnvMonFanState"
@@ -1597,7 +1678,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "3",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "ciscoEnvMonFanState"
@@ -1622,7 +1703,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "1",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "ciscoEnvMonSupplyState"
@@ -1647,7 +1728,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "2",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "ciscoEnvMonSupplyState"
@@ -1672,11 +1753,36 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "1",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "ciscoEnvMonTemperatureState"
                 },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.9.9.176.1.2.14.0",
+                    "sensor_index": "0",
+                    "sensor_type": "cRFCfgRedundancyOperMode",
+                    "sensor_descr": "VSS Mode",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "0",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": 1,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "cRFCfgRedundancyOperMode"
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
@@ -1697,7 +1803,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "0",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cRFStatusPeerUnitState"
@@ -1722,7 +1828,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "0",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cRFStatusUnitState"
@@ -2153,6 +2259,62 @@
                     "state_value": 6,
                     "state_generic_value": 2
                 },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "nonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 1,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 2,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 3,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 4,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 5,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "coldStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 6,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "warmStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 7,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "hotStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 8,
+                    "state_generic_value": 0
+                },
                 {
                     "state_name": "cRFStatusPeerUnitState",
                     "state_descr": "notKnown",

tests/data/ios_c3560.json

@@ -11804,7 +11804,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 1,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -11829,7 +11829,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 1,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -11973,263 +11973,7 @@
                 }
             ]
         },
-        "poller": {
-            "sensors": [
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "count",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9.9.402.1.4.1.0",
-                    "sensor_index": "0",
-                    "sensor_type": "ios",
-                    "sensor_descr": "PoE Devices Connected",
-                    "group": "PoE",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9.9.106.1.2.1.1.15.1.0",
-                    "sensor_index": "cHsrpGrpStandbyState.1.0",
-                    "sensor_type": "cHsrpGrpTable",
-                    "sensor_descr": "HSRP Status 192.168.178.199",
-                    "group": "HSRP",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 5,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "cHsrpGrpTable"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9.9.106.1.2.1.1.15.2.1",
-                    "sensor_index": "cHsrpGrpStandbyState.2.1",
-                    "sensor_type": "cHsrpGrpTable",
-                    "sensor_descr": "HSRP Status 10.10.10.1",
-                    "group": "HSRP",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 1,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "cHsrpGrpTable"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9.9.13.1.4.1.3.1004",
-                    "sensor_index": "1004",
-                    "sensor_type": "ciscoEnvMonFanState",
-                    "sensor_descr": "Switch#1, Fan#1",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 1,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1004",
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "ciscoEnvMonFanState"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9.9.13.1.5.1.3.1003",
-                    "sensor_index": "1003",
-                    "sensor_type": "ciscoEnvMonSupplyState",
-                    "sensor_descr": "Sw1, PS1 Normal, RPS NotExist",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 1,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1003",
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "ciscoEnvMonSupplyState"
-                }
-            ],
-            "state_indexes": [
-                {
-                    "state_name": "cHsrpGrpTable",
-                    "state_descr": "initial",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "cHsrpGrpTable",
-                    "state_descr": "learn",
-                    "state_draw_graph": 0,
-                    "state_value": 2,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "cHsrpGrpTable",
-                    "state_descr": "listen",
-                    "state_draw_graph": 0,
-                    "state_value": 3,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "cHsrpGrpTable",
-                    "state_descr": "speak",
-                    "state_draw_graph": 0,
-                    "state_value": 4,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "cHsrpGrpTable",
-                    "state_descr": "standby",
-                    "state_draw_graph": 0,
-                    "state_value": 5,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "cHsrpGrpTable",
-                    "state_descr": "active",
-                    "state_draw_graph": 0,
-                    "state_value": 6,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "ciscoEnvMonFanState",
-                    "state_descr": "normal",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "ciscoEnvMonFanState",
-                    "state_descr": "warning",
-                    "state_draw_graph": 0,
-                    "state_value": 2,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "ciscoEnvMonFanState",
-                    "state_descr": "critical",
-                    "state_draw_graph": 0,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "ciscoEnvMonFanState",
-                    "state_descr": "shutdown",
-                    "state_draw_graph": 0,
-                    "state_value": 4,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "ciscoEnvMonFanState",
-                    "state_descr": "notPresent",
-                    "state_draw_graph": 0,
-                    "state_value": 5,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "ciscoEnvMonFanState",
-                    "state_descr": "notFunctioning",
-                    "state_draw_graph": 0,
-                    "state_value": 6,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "ciscoEnvMonSupplyState",
-                    "state_descr": "normal",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "ciscoEnvMonSupplyState",
-                    "state_descr": "warning",
-                    "state_draw_graph": 0,
-                    "state_value": 2,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "ciscoEnvMonSupplyState",
-                    "state_descr": "critical",
-                    "state_draw_graph": 0,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "ciscoEnvMonSupplyState",
-                    "state_descr": "shutdown",
-                    "state_draw_graph": 0,
-                    "state_value": 4,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "ciscoEnvMonSupplyState",
-                    "state_descr": "notPresent",
-                    "state_draw_graph": 0,
-                    "state_value": 5,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "ciscoEnvMonSupplyState",
-                    "state_descr": "notFunctioning",
-                    "state_draw_graph": 0,
-                    "state_value": 6,
-                    "state_generic_value": 2
-                }
-            ]
-        }
+        "poller": "matches discovery"
     },
     "storage": {
         "discovery": {
@@ -14096,5 +13840,16 @@
             ]
         },
         "poller": "matches discovery"
+    },
+    "ports-stack": {
+        "discovery": {
+            "ports_stack": [
+                {
+                    "high_ifIndex": 10104,
+                    "low_ifIndex": 5030,
+                    "ifStackStatus": "active"
+                }
+            ]
+        }
     }
 }

tests/data/ios_ie1000.json

@@ -3063,5 +3063,141 @@
                 }
             ]
         }
+    },
+    "ports-stack": {
+        "discovery": {
+            "ports_stack": [
+                {
+                    "high_ifIndex": 1000001,
+                    "low_ifIndex": 19,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000002,
+                    "low_ifIndex": 19,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000003,
+                    "low_ifIndex": 500,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000004,
+                    "low_ifIndex": 500,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000005,
+                    "low_ifIndex": 30,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000006,
+                    "low_ifIndex": 30,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000007,
+                    "low_ifIndex": 1,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000007,
+                    "low_ifIndex": 19,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000007,
+                    "low_ifIndex": 30,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000007,
+                    "low_ifIndex": 100,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000007,
+                    "low_ifIndex": 500,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000008,
+                    "low_ifIndex": 1,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000008,
+                    "low_ifIndex": 19,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000008,
+                    "low_ifIndex": 30,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000008,
+                    "low_ifIndex": 100,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000008,
+                    "low_ifIndex": 500,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000009,
+                    "low_ifIndex": 1,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000009,
+                    "low_ifIndex": 19,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000009,
+                    "low_ifIndex": 30,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000009,
+                    "low_ifIndex": 100,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000009,
+                    "low_ifIndex": 500,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000010,
+                    "low_ifIndex": 1,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000010,
+                    "low_ifIndex": 19,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000010,
+                    "low_ifIndex": 30,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000010,
+                    "low_ifIndex": 100,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1000010,
+                    "low_ifIndex": 500,
+                    "ifStackStatus": "active"
+                }
+            ]
+        }
     }
 }

tests/data/ios_ie2000.json

@@ -84,7 +84,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 1,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -109,7 +109,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 6,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -134,7 +134,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 1,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -159,7 +159,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 1,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -496,480 +496,6 @@
                 }
             ]
         },
-        "poller": {
-            "sensors": [
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "count",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9.9.402.1.4.1.0",
-                    "sensor_index": "0",
-                    "sensor_type": "ios",
-                    "sensor_descr": "PoE Devices Connected",
-                    "group": "PoE",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9.9.117.1.2.1.1.2.1007",
-                    "sensor_index": "cefcModuleOperStatus.1007",
-                    "sensor_type": "cefcModuleOperStatus",
-                    "sensor_descr": "Operating Status -",
-                    "group": "Module Operating Status",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 2,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1007",
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "cefcModuleOperStatus"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9.9.13.1.5.1.3.1004",
-                    "sensor_index": "1004",
-                    "sensor_type": "ciscoEnvMonSupplyState",
-                    "sensor_descr": "Sw1, PSA Normal",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 1,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1004",
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "ciscoEnvMonSupplyState"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9.9.13.1.5.1.3.1005",
-                    "sensor_index": "1005",
-                    "sensor_type": "ciscoEnvMonSupplyState",
-                    "sensor_descr": "Sw1, PSB Faulty",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 6,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1005",
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "ciscoEnvMonSupplyState"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9.9.13.1.3.1.6.1006",
-                    "sensor_index": "1006",
-                    "sensor_type": "ciscoEnvMonTemperatureState",
-                    "sensor_descr": "SW#1, Sensor#1, GREEN",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 1,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1006",
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "ciscoEnvMonTemperatureState"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9.9.601.1.3.1.1.4.1",
-                    "sensor_index": "1",
-                    "sensor_type": "crepSegmentComplete",
-                    "sensor_descr": "REP State - Segment 1",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 1,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1",
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "crepSegmentComplete"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "temperature",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9.9.13.1.3.1.3.1006",
-                    "sensor_index": "1006",
-                    "sensor_type": "cisco",
-                    "sensor_descr": "SW#1, Sensor#1, GREEN",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 46,
-                    "sensor_limit": 89,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": 36,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1006",
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                }
-            ],
-            "state_indexes": [
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "unknown",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "ok",
-                    "state_draw_graph": 0,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 0,
-                    "state_value": 3,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "okButDiagFailed",
-                    "state_draw_graph": 0,
-                    "state_value": 4,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "boot",
-                    "state_draw_graph": 0,
-                    "state_value": 5,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "selfTest",
-                    "state_draw_graph": 0,
-                    "state_value": 6,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "failed",
-                    "state_draw_graph": 0,
-                    "state_value": 7,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "missing",
-                    "state_draw_graph": 0,
-                    "state_value": 8,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "mismatchWithParent",
-                    "state_draw_graph": 0,
-                    "state_value": 9,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "mismatchConfig",
-                    "state_draw_graph": 0,
-                    "state_value": 10,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "diagFailed",
-                    "state_draw_graph": 0,
-                    "state_value": 11,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "dormant",
-                    "state_draw_graph": 0,
-                    "state_value": 12,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "outOfServiceAdmin",
-                    "state_draw_graph": 0,
-                    "state_value": 13,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "outOfServiceEnvTemp",
-                    "state_draw_graph": 0,
-                    "state_value": 14,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "poweredDown",
-                    "state_draw_graph": 0,
-                    "state_value": 15,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "poweredUp",
-                    "state_draw_graph": 0,
-                    "state_value": 16,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "powerDenied",
-                    "state_draw_graph": 0,
-                    "state_value": 17,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "powerCycled",
-                    "state_draw_graph": 0,
-                    "state_value": 18,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "okButPowerOverWarning",
-                    "state_draw_graph": 0,
-                    "state_value": 19,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "okButPowerOverCritical",
-                    "state_draw_graph": 0,
-                    "state_value": 20,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "syncInProgress",
-                    "state_draw_graph": 0,
-                    "state_value": 21,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "upgrading",
-                    "state_draw_graph": 0,
-                    "state_value": 22,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "okButAuthFailed",
-                    "state_draw_graph": 0,
-                    "state_value": 23,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "mdr",
-                    "state_draw_graph": 0,
-                    "state_value": 24,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "fwMismatchFound",
-                    "state_draw_graph": 0,
-                    "state_value": 25,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "fwDownloadSuccess",
-                    "state_draw_graph": 0,
-                    "state_value": 26,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "cefcModuleOperStatus",
-                    "state_descr": "fwDownloadFailure",
-                    "state_draw_graph": 0,
-                    "state_value": 27,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "ciscoEnvMonSupplyState",
-                    "state_descr": "normal",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "ciscoEnvMonSupplyState",
-                    "state_descr": "warning",
-                    "state_draw_graph": 0,
-                    "state_value": 2,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "ciscoEnvMonSupplyState",
-                    "state_descr": "critical",
-                    "state_draw_graph": 0,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "ciscoEnvMonSupplyState",
-                    "state_descr": "shutdown",
-                    "state_draw_graph": 0,
-                    "state_value": 4,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "ciscoEnvMonSupplyState",
-                    "state_descr": "notPresent",
-                    "state_draw_graph": 0,
-                    "state_value": 5,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "ciscoEnvMonSupplyState",
-                    "state_descr": "notFunctioning",
-                    "state_draw_graph": 0,
-                    "state_value": 6,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "ciscoEnvMonTemperatureState",
-                    "state_descr": "normal",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "ciscoEnvMonTemperatureState",
-                    "state_descr": "warning",
-                    "state_draw_graph": 0,
-                    "state_value": 2,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "ciscoEnvMonTemperatureState",
-                    "state_descr": "critical",
-                    "state_draw_graph": 0,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "ciscoEnvMonTemperatureState",
-                    "state_descr": "shutdown",
-                    "state_draw_graph": 0,
-                    "state_value": 4,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "ciscoEnvMonTemperatureState",
-                    "state_descr": "notPresent",
-                    "state_draw_graph": 0,
-                    "state_value": 5,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "ciscoEnvMonTemperatureState",
-                    "state_descr": "notFunctioning",
-                    "state_draw_graph": 0,
-                    "state_value": 6,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "crepSegmentComplete",
-                    "state_descr": "unknown",
-                    "state_draw_graph": 0,
-                    "state_value": 0,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "crepSegmentComplete",
-                    "state_descr": "complete",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "crepSegmentComplete",
-                    "state_descr": "incomplete",
-                    "state_draw_graph": 0,
-                    "state_value": 2,
-                    "state_generic_value": 2
-                }
-            ]
-        }
+        "poller": "matches discovery"
     }
 }

tests/data/ios_ir809.json

@@ -337,7 +337,7 @@
                     "group": "Modem 0 on Cellular0",
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 12,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -362,7 +362,7 @@
                     "group": "Modem 0 on Cellular0",
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -387,7 +387,7 @@
                     "group": "Modem 0 on Cellular0",
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 10,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -412,7 +412,7 @@
                     "group": "Modem 0 on Cellular0",
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -437,7 +437,7 @@
                     "group": "Modem 0 on Cellular0",
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 3,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -462,7 +462,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -487,7 +487,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 1,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -512,7 +512,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 1,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -537,7 +537,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 1,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -551,6 +551,31 @@
                     "rrd_type": "GAUGE",
                     "state_name": "ciscoEnvMonTemperatureState"
                 },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.9.9.176.1.2.14.0",
+                    "sensor_index": "0",
+                    "sensor_type": "cRFCfgRedundancyOperMode",
+                    "sensor_descr": "VSS Mode",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 1,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "0",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "cRFCfgRedundancyOperMode"
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
@@ -562,7 +587,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -587,7 +612,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 14,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -1140,6 +1165,62 @@
                     "state_value": 6,
                     "state_generic_value": 2
                 },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "nonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 1,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 2,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 3,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 4,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 5,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "coldStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 6,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "warmStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 7,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "hotStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 8,
+                    "state_generic_value": 0
+                },
                 {
                     "state_name": "cRFStatusPeerUnitState",
                     "state_descr": "notKnown",
@@ -1438,7 +1519,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "14",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "c3gGsmCurrentBand"
@@ -1463,7 +1544,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "14",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "c3gGsmCurrentRoamingStatus"
@@ -1488,7 +1569,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "14",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "c3gGsmPacketService"
@@ -1513,7 +1594,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "14",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "c3gGsmSimStatus"
@@ -1538,7 +1619,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "14",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "c3gModemStatus"
@@ -1563,7 +1644,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "3",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -1588,7 +1669,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "1",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "ciscoEnvMonSupplyState"
@@ -1613,7 +1694,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "2",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "ciscoEnvMonSupplyState"
@@ -1638,11 +1719,36 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "1",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "ciscoEnvMonTemperatureState"
                 },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.9.9.176.1.2.14.0",
+                    "sensor_index": "0",
+                    "sensor_type": "cRFCfgRedundancyOperMode",
+                    "sensor_descr": "VSS Mode",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "0",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": 1,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "cRFCfgRedundancyOperMode"
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
@@ -1663,7 +1769,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "0",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cRFStatusPeerUnitState"
@@ -1688,7 +1794,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "0",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cRFStatusUnitState"
@@ -2232,6 +2338,62 @@
                     "state_value": 6,
                     "state_generic_value": 2
                 },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "nonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 1,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 2,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 3,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 4,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 5,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "coldStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 6,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "warmStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 7,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "hotStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 8,
+                    "state_generic_value": 0
+                },
                 {
                     "state_name": "cRFStatusPeerUnitState",
                     "state_descr": "notKnown",

tests/data/iosxe_c9300.json

@@ -15545,5 +15545,31 @@
             ]
         },
         "poller": "matches discovery"
+    },
+    "ports-stack": {
+        "discovery": {
+            "ports_stack": [
+                {
+                    "high_ifIndex": 71,
+                    "low_ifIndex": 70,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 72,
+                    "low_ifIndex": 70,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 137,
+                    "low_ifIndex": 136,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 138,
+                    "low_ifIndex": 136,
+                    "ifStackStatus": "active"
+                }
+            ]
+        }
     }
 }

tests/data/iosxe_ir1101.json

@@ -351,6 +351,31 @@
                     "rrd_type": "GAUGE",
                     "state_name": null
                 },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "current",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.4130",
+                    "sensor_index": "4130",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "Subslot 0/0 Transceiver 0 Bias Current",
+                    "group": null,
+                    "sensor_divisor": 1000000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0.013536,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "4130",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "dbm",
@@ -401,6 +426,56 @@
                     "rrd_type": "GAUGE",
                     "state_name": null
                 },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "dbm",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.4131",
+                    "sensor_index": "4131",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "Subslot 0/0 Transceiver 0 Tx Power",
+                    "group": null,
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_current": -6.8,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "4131",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "dbm",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.4132",
+                    "sensor_index": "4132",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "Subslot 0/0 Transceiver 0 Rx Power",
+                    "group": null,
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_current": -7.7,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "4132",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
@@ -412,7 +487,7 @@
                     "group": "Modem on Cellular0/1/0",
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 12,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -437,7 +512,7 @@
                     "group": "Modem on Cellular0/1/0",
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -462,7 +537,7 @@
                     "group": "Modem on Cellular0/1/0",
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 10,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -487,7 +562,7 @@
                     "group": "Modem on Cellular0/1/0",
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -512,7 +587,7 @@
                     "group": "Modem on Cellular0/1/0",
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 3,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -537,7 +612,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -562,7 +637,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 1,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -576,6 +651,31 @@
                     "rrd_type": "GAUGE",
                     "state_name": "ciscoEnvMonSupplyState"
                 },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.9.9.176.1.2.14.0",
+                    "sensor_index": "0",
+                    "sensor_type": "cRFCfgRedundancyOperMode",
+                    "sensor_descr": "VSS Mode",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 1,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "0",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "cRFCfgRedundancyOperMode"
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
@@ -587,7 +687,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -612,7 +712,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 14,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -701,6 +801,56 @@
                     "rrd_type": "GAUGE",
                     "state_name": null
                 },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.4001",
+                    "sensor_index": "4001",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "Slot 0 - Temp: TS1",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 41,
+                    "sensor_limit": 61,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 31,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "4001",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.4128",
+                    "sensor_index": "4128",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "Subslot 0/0 Transceiver 0 Temperature",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 34.574,
+                    "sensor_limit": 54.574,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 24.574,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "4128",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "voltage",
@@ -725,6 +875,31 @@
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.4129",
+                    "sensor_index": "4129",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "Subslot 0/0 Transceiver 0 Supply Voltage",
+                    "group": null,
+                    "sensor_divisor": 10000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 3.2744,
+                    "sensor_limit": 3.76556,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 2.78324,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "4129",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
                 }
             ],
             "state_indexes": [
@@ -1148,6 +1323,62 @@
                     "state_value": 6,
                     "state_generic_value": 2
                 },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "nonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 1,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 2,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 3,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 4,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 5,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "coldStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 6,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "warmStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 7,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "hotStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 8,
+                    "state_generic_value": 0
+                },
                 {
                     "state_name": "cRFStatusPeerUnitState",
                     "state_descr": "notKnown",
@@ -1451,6 +1682,31 @@
                     "rrd_type": "GAUGE",
                     "state_name": null
                 },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "current",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.4130",
+                    "sensor_index": "4130",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "Subslot 0/0 Transceiver 0 Bias Current",
+                    "group": null,
+                    "sensor_divisor": 1000000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0.013536,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "4130",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "dbm",
@@ -1501,6 +1757,56 @@
                     "rrd_type": "GAUGE",
                     "state_name": null
                 },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "dbm",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.4131",
+                    "sensor_index": "4131",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "Subslot 0/0 Transceiver 0 Tx Power",
+                    "group": null,
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_current": -6.8,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "4131",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "dbm",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.4132",
+                    "sensor_index": "4132",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "Subslot 0/0 Transceiver 0 Rx Power",
+                    "group": null,
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_current": -7.7,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "4132",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
@@ -1521,7 +1827,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "4002",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "c3gGsmCurrentBand"
@@ -1546,7 +1852,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "4002",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "c3gGsmCurrentRoamingStatus"
@@ -1571,7 +1877,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "4002",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "c3gGsmPacketService"
@@ -1596,7 +1902,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "4002",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "c3gGsmSimStatus"
@@ -1621,7 +1927,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "4002",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "c3gModemStatus"
@@ -1646,7 +1952,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "3",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -1671,11 +1977,36 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "3",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "ciscoEnvMonSupplyState"
                 },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.9.9.176.1.2.14.0",
+                    "sensor_index": "0",
+                    "sensor_type": "cRFCfgRedundancyOperMode",
+                    "sensor_descr": "VSS Mode",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "0",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": 1,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "cRFCfgRedundancyOperMode"
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
@@ -1696,7 +2027,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "0",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cRFStatusPeerUnitState"
@@ -1721,7 +2052,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "0",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cRFStatusUnitState"
@@ -1801,6 +2132,56 @@
                     "rrd_type": "GAUGE",
                     "state_name": null
                 },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.4001",
+                    "sensor_index": "4001",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "Slot 0 - Temp: TS1",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 41,
+                    "sensor_limit": 61,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 31,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "4001",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.4128",
+                    "sensor_index": "4128",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "Subslot 0/0 Transceiver 0 Temperature",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 34.574,
+                    "sensor_limit": 54.574,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 24.574,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "4128",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "voltage",
@@ -1825,6 +2206,31 @@
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.2.1.99.1.1.1.4.4129",
+                    "sensor_index": "4129",
+                    "sensor_type": "entity-sensor",
+                    "sensor_descr": "Subslot 0/0 Transceiver 0 Supply Voltage",
+                    "group": null,
+                    "sensor_divisor": 10000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 3.2744,
+                    "sensor_limit": 3.76556,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 2.78324,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "4129",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
                 }
             ],
             "state_indexes": [
@@ -2248,6 +2654,62 @@
                     "state_value": 6,
                     "state_generic_value": 2
                 },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "nonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 1,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 2,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 3,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 4,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 5,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "coldStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 6,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "warmStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 7,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "hotStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 8,
+                    "state_generic_value": 0
+                },
                 {
                     "state_name": "cRFStatusPeerUnitState",
                     "state_descr": "notKnown",

tests/data/iosxr_asr9001.json

@@ -13847,7 +13847,7 @@
                     "group": null,
                     "sensor_divisor": 10000000,
                     "sensor_multiplier": 1000,
-                    "sensor_current": -60,
+                    "sensor_current": 0,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -13922,7 +13922,7 @@
                     "group": null,
                     "sensor_divisor": 10000000,
                     "sensor_multiplier": 1000,
-                    "sensor_current": -60,
+                    "sensor_current": 0,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -14697,7 +14697,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -14722,7 +14722,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -14747,7 +14747,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -14772,7 +14772,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -14797,7 +14797,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -14822,7 +14822,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -14847,7 +14847,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -14872,7 +14872,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -14897,7 +14897,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -14922,7 +14922,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -14936,6 +14936,31 @@
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
                 },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.9.9.176.1.2.14.0",
+                    "sensor_index": "0",
+                    "sensor_type": "cRFCfgRedundancyOperMode",
+                    "sensor_descr": "VSS Mode",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 1,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "0",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "cRFCfgRedundancyOperMode"
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
@@ -14947,7 +14972,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -14972,7 +14997,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 14,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -17672,6 +17697,62 @@
                     "state_value": 12,
                     "state_generic_value": 1
                 },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "nonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 1,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 2,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 3,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 4,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 5,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "coldStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 6,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "warmStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 7,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "hotStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 8,
+                    "state_generic_value": 0
+                },
                 {
                     "state_name": "cRFStatusPeerUnitState",
                     "state_descr": "notKnown",
@@ -18145,7 +18226,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "25",
                     "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": null,
+                    "sensor_prev": 0,
                     "user_func": "mw_to_dbm",
                     "rrd_type": "GAUGE",
                     "state_name": null
@@ -18220,7 +18301,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "25",
                     "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": null,
+                    "sensor_prev": 0,
                     "user_func": "mw_to_dbm",
                     "rrd_type": "GAUGE",
                     "state_name": null
@@ -18995,7 +19076,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "14585855",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -19020,7 +19101,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "15526104",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -19045,7 +19126,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "21657197",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -19070,7 +19151,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "30054631",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -19095,7 +19176,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "31415605",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -19120,7 +19201,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "37336673",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -19145,7 +19226,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "49125802",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -19170,7 +19251,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "59316821",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -19195,7 +19276,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "66227682",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -19220,11 +19301,36 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "66531208",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
                 },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.9.9.176.1.2.14.0",
+                    "sensor_index": "0",
+                    "sensor_type": "cRFCfgRedundancyOperMode",
+                    "sensor_descr": "VSS Mode",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "0",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": 1,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "cRFCfgRedundancyOperMode"
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
@@ -19245,7 +19351,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "0",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cRFStatusPeerUnitState"
@@ -19270,7 +19376,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "0",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cRFStatusUnitState"
@@ -21961,6 +22067,62 @@
                     "state_value": 12,
                     "state_generic_value": 1
                 },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "nonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 1,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 2,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 3,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 4,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 5,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "coldStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 6,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "warmStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 7,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "hotStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 8,
+                    "state_generic_value": 0
+                },
                 {
                     "state_name": "cRFStatusPeerUnitState",
                     "state_descr": "notKnown",

tests/data/iosxr_asr9010.json

@@ -20383,7 +20383,7 @@
                     "sensor_current": 0.036,
                     "sensor_limit": 0.1,
                     "sensor_limit_warn": 0.08,
-                    "sensor_limit_low": null,
+                    "sensor_limit_low": 0,
                     "sensor_limit_low_warn": 0,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
@@ -20833,7 +20833,7 @@
                     "sensor_current": 0.0258,
                     "sensor_limit": 0.1,
                     "sensor_limit_warn": 0.08,
-                    "sensor_limit_low": null,
+                    "sensor_limit_low": 0,
                     "sensor_limit_low_warn": 0,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
@@ -20955,7 +20955,7 @@
                     "group": null,
                     "sensor_divisor": 1000000,
                     "sensor_multiplier": 1000,
-                    "sensor_current": -60,
+                    "sensor_current": 0,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -21430,7 +21430,7 @@
                     "group": null,
                     "sensor_divisor": 1000000,
                     "sensor_multiplier": 1000,
-                    "sensor_current": -60,
+                    "sensor_current": 0,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -21455,7 +21455,7 @@
                     "group": null,
                     "sensor_divisor": 1000000,
                     "sensor_multiplier": 1000,
-                    "sensor_current": -60,
+                    "sensor_current": 0,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -21830,7 +21830,7 @@
                     "group": null,
                     "sensor_divisor": 1000000,
                     "sensor_multiplier": 1000,
-                    "sensor_current": -60,
+                    "sensor_current": 0,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -21855,7 +21855,7 @@
                     "group": null,
                     "sensor_divisor": 1000000,
                     "sensor_multiplier": 1000,
-                    "sensor_current": -60,
+                    "sensor_current": 0,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -21880,7 +21880,7 @@
                     "group": null,
                     "sensor_divisor": 1000000,
                     "sensor_multiplier": 1000,
-                    "sensor_current": -60,
+                    "sensor_current": 0,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23130,7 +23130,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23155,7 +23155,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23180,7 +23180,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23205,7 +23205,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23230,7 +23230,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23255,7 +23255,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23280,7 +23280,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23305,7 +23305,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23330,7 +23330,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23355,7 +23355,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23380,7 +23380,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23405,7 +23405,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23430,7 +23430,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23455,7 +23455,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23480,7 +23480,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23505,7 +23505,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23530,7 +23530,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23555,7 +23555,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23580,7 +23580,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23605,7 +23605,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23630,7 +23630,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23655,7 +23655,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23680,7 +23680,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23705,7 +23705,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23730,7 +23730,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23755,7 +23755,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23780,7 +23780,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23805,7 +23805,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23830,7 +23830,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23855,7 +23855,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23880,7 +23880,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 8,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23905,7 +23905,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 9,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -23930,7 +23930,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 14,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -31228,7 +31228,7 @@
                     "sensor_current": 0.036,
                     "sensor_limit": 0.1,
                     "sensor_limit_warn": 0.08,
-                    "sensor_limit_low": null,
+                    "sensor_limit_low": 0,
                     "sensor_limit_low_warn": 0,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
@@ -31678,7 +31678,7 @@
                     "sensor_current": 0.0258,
                     "sensor_limit": 0.1,
                     "sensor_limit_warn": 0.08,
-                    "sensor_limit_low": null,
+                    "sensor_limit_low": 0,
                     "sensor_limit_low_warn": 0,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
@@ -31809,7 +31809,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "50",
                     "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": null,
+                    "sensor_prev": 0,
                     "user_func": "mw_to_dbm",
                     "rrd_type": "GAUGE",
                     "state_name": null
@@ -32284,7 +32284,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "49",
                     "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": null,
+                    "sensor_prev": 0,
                     "user_func": "mw_to_dbm",
                     "rrd_type": "GAUGE",
                     "state_name": null
@@ -32309,7 +32309,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "80",
                     "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": null,
+                    "sensor_prev": 0,
                     "user_func": "mw_to_dbm",
                     "rrd_type": "GAUGE",
                     "state_name": null
@@ -32684,7 +32684,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "49",
                     "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": null,
+                    "sensor_prev": 0,
                     "user_func": "mw_to_dbm",
                     "rrd_type": "GAUGE",
                     "state_name": null
@@ -32709,7 +32709,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "80",
                     "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": null,
+                    "sensor_prev": 0,
                     "user_func": "mw_to_dbm",
                     "rrd_type": "GAUGE",
                     "state_name": null
@@ -32734,7 +32734,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "50",
                     "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": null,
+                    "sensor_prev": 0,
                     "user_func": "mw_to_dbm",
                     "rrd_type": "GAUGE",
                     "state_name": null
@@ -33984,7 +33984,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "12626805",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34009,7 +34009,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "13644213",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34034,7 +34034,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "15752416",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34059,7 +34059,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "20308747",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34084,7 +34084,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "20702176",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34109,7 +34109,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "25245506",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34134,7 +34134,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "28667368",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34159,7 +34159,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "29992163",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34184,7 +34184,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "32573926",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34209,7 +34209,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "33243763",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34234,7 +34234,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "37425837",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34259,7 +34259,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "37780378",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34284,7 +34284,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "38193523",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34309,7 +34309,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "41901182",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34334,7 +34334,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "43477411",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34359,7 +34359,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "46460939",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34384,7 +34384,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "46850942",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34409,7 +34409,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "4860170",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34434,7 +34434,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "5375401",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34459,7 +34459,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "53949430",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34484,7 +34484,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "56148731",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34509,7 +34509,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "56485406",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34534,7 +34534,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "58899190",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34559,7 +34559,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "59315058",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34584,7 +34584,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "60375226",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34609,7 +34609,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "60459837",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34634,7 +34634,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "6606577",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34659,7 +34659,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "8198755",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34684,7 +34684,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "8796468",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34709,7 +34709,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "8913339",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -34734,7 +34734,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "0",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cRFCfgRedundancyOperMode"
@@ -34759,7 +34759,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "0",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cRFStatusPeerUnitState"
@@ -34784,7 +34784,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "0",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cRFStatusUnitState"

tests/data/iosxr_asr9901.json

@@ -10293,9 +10293,9 @@
                     "sensor_divisor": 1000000,
                     "sensor_multiplier": 1,
                     "sensor_current": 0,
-                    "sensor_limit": null,
+                    "sensor_limit": 0,
                     "sensor_limit_warn": 0,
-                    "sensor_limit_low": null,
+                    "sensor_limit_low": 0,
                     "sensor_limit_low_warn": 0,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
@@ -10345,7 +10345,7 @@
                     "sensor_current": 0.034,
                     "sensor_limit": 0.1,
                     "sensor_limit_warn": 0,
-                    "sensor_limit_low": 0.0001,
+                    "sensor_limit_low": 0,
                     "sensor_limit_low_warn": 0,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
@@ -10418,10 +10418,10 @@
                     "sensor_divisor": 100000000,
                     "sensor_multiplier": 1000,
                     "sensor_current": -60,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
+                    "sensor_limit": -60,
+                    "sensor_limit_warn": -60,
+                    "sensor_limit_low": -60,
+                    "sensor_limit_low_warn": -60,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
                     "entPhysicalIndex": "2994446",
@@ -10443,10 +10443,10 @@
                     "sensor_divisor": 100000000,
                     "sensor_multiplier": 1000,
                     "sensor_current": -60,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
+                    "sensor_limit": -60,
+                    "sensor_limit_warn": -60,
+                    "sensor_limit_low": -60,
+                    "sensor_limit_low_warn": -60,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
                     "entPhysicalIndex": "2994458",
@@ -10893,9 +10893,9 @@
                     "sensor_divisor": 100000000,
                     "sensor_multiplier": 1,
                     "sensor_current": 0,
-                    "sensor_limit": null,
+                    "sensor_limit": 0,
                     "sensor_limit_warn": 0,
-                    "sensor_limit_low": null,
+                    "sensor_limit_low": 0,
                     "sensor_limit_low_warn": 0,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
@@ -10918,9 +10918,9 @@
                     "sensor_divisor": 100000000,
                     "sensor_multiplier": 1,
                     "sensor_current": 0,
-                    "sensor_limit": null,
+                    "sensor_limit": 0,
                     "sensor_limit_warn": 0,
-                    "sensor_limit_low": null,
+                    "sensor_limit_low": 0,
                     "sensor_limit_low_warn": 0,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
@@ -11042,7 +11042,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -11067,7 +11067,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -11092,7 +11092,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -11117,7 +11117,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -11142,7 +11142,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -11167,7 +11167,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -11192,7 +11192,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -11217,7 +11217,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -11242,7 +11242,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -11267,7 +11267,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -11292,7 +11292,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -11317,7 +11317,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -11331,6 +11331,31 @@
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
                 },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.9.9.176.1.2.14.0",
+                    "sensor_index": "0",
+                    "sensor_type": "cRFCfgRedundancyOperMode",
+                    "sensor_descr": "VSS Mode",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 1,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "0",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "cRFCfgRedundancyOperMode"
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
@@ -11342,7 +11367,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -11367,7 +11392,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 14,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -11768,7 +11793,7 @@
                     "sensor_divisor": 1000,
                     "sensor_multiplier": 1,
                     "sensor_current": 0,
-                    "sensor_limit": 20,
+                    "sensor_limit": 0,
                     "sensor_limit_warn": 0,
                     "sensor_limit_low": -5,
                     "sensor_limit_low_warn": -1,
@@ -15167,6 +15192,62 @@
                     "state_value": 12,
                     "state_generic_value": 1
                 },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "nonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 1,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 2,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 3,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 4,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 5,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "coldStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 6,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "warmStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 7,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "hotStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 8,
+                    "state_generic_value": 0
+                },
                 {
                     "state_name": "cRFStatusPeerUnitState",
                     "state_descr": "notKnown",
@@ -15582,9 +15663,9 @@
                     "sensor_divisor": 1000000,
                     "sensor_multiplier": 1,
                     "sensor_current": 0,
-                    "sensor_limit": null,
+                    "sensor_limit": 0,
                     "sensor_limit_warn": 0,
-                    "sensor_limit_low": null,
+                    "sensor_limit_low": 0,
                     "sensor_limit_low_warn": 0,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
@@ -15634,7 +15715,7 @@
                     "sensor_current": 0.034,
                     "sensor_limit": 0.1,
                     "sensor_limit_warn": 0,
-                    "sensor_limit_low": 0.0001,
+                    "sensor_limit_low": 0,
                     "sensor_limit_low_warn": 0,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
@@ -15707,10 +15788,10 @@
                     "sensor_divisor": 100000000,
                     "sensor_multiplier": 1000,
                     "sensor_current": -60,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
+                    "sensor_limit": -60,
+                    "sensor_limit_warn": -60,
+                    "sensor_limit_low": -60,
+                    "sensor_limit_low_warn": -60,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
                     "entPhysicalIndex": "2994446",
@@ -15732,10 +15813,10 @@
                     "sensor_divisor": 100000000,
                     "sensor_multiplier": 1000,
                     "sensor_current": -60,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
+                    "sensor_limit": -60,
+                    "sensor_limit_warn": -60,
+                    "sensor_limit_low": -60,
+                    "sensor_limit_low_warn": -60,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
                     "entPhysicalIndex": "2994458",
@@ -16182,9 +16263,9 @@
                     "sensor_divisor": 100000000,
                     "sensor_multiplier": 1,
                     "sensor_current": 0,
-                    "sensor_limit": null,
+                    "sensor_limit": 0,
                     "sensor_limit_warn": 0,
-                    "sensor_limit_low": null,
+                    "sensor_limit_low": 0,
                     "sensor_limit_low_warn": 0,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
@@ -16207,9 +16288,9 @@
                     "sensor_divisor": 100000000,
                     "sensor_multiplier": 1,
                     "sensor_current": 0,
-                    "sensor_limit": null,
+                    "sensor_limit": 0,
                     "sensor_limit_warn": 0,
-                    "sensor_limit_low": null,
+                    "sensor_limit_low": 0,
                     "sensor_limit_low_warn": 0,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
@@ -16340,7 +16421,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "1",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -16365,7 +16446,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "118785",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -16390,7 +16471,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "2375681",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -16415,7 +16496,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "2379777",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -16440,7 +16521,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "2990081",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -16465,7 +16546,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "2994177",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -16490,7 +16571,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "3014657",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -16515,7 +16596,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "3072001",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -16540,7 +16621,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "40961",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -16565,7 +16646,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "45057",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -16590,7 +16671,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "49153",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -16615,11 +16696,36 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "8193",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
                 },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.9.9.176.1.2.14.0",
+                    "sensor_index": "0",
+                    "sensor_type": "cRFCfgRedundancyOperMode",
+                    "sensor_descr": "VSS Mode",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": "0",
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": 1,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "cRFCfgRedundancyOperMode"
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
@@ -16640,7 +16746,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "0",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cRFStatusPeerUnitState"
@@ -16665,7 +16771,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "0",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cRFStatusUnitState"
@@ -17057,7 +17163,7 @@
                     "sensor_divisor": 1000,
                     "sensor_multiplier": 1,
                     "sensor_current": 0,
-                    "sensor_limit": 20,
+                    "sensor_limit": 0,
                     "sensor_limit_warn": 0,
                     "sensor_limit_low": -5,
                     "sensor_limit_low_warn": -1,
@@ -20456,6 +20562,62 @@
                     "state_value": 12,
                     "state_generic_value": 1
                 },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "nonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 1,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 2,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareNonRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 3,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "staticLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 4,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "dynamicLoadShareRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 5,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "coldStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 6,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "warmStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 7,
+                    "state_generic_value": 0
+                },
+                {
+                    "state_name": "cRFCfgRedundancyOperMode",
+                    "state_descr": "hotStandbyRedundant",
+                    "state_draw_graph": 0,
+                    "state_value": 8,
+                    "state_generic_value": 0
+                },
                 {
                     "state_name": "cRFStatusPeerUnitState",
                     "state_descr": "notKnown",

tests/data/iosxr_ncs5504.json

@@ -19,5 +19,50 @@
             ]
         },
         "poller": "matches discovery"
+    },
+    "entity-physical": {
+        "discovery": {
+            "entPhysical": [
+                {
+                    "entPhysicalIndex": 8384513,
+                    "entPhysicalDescr": null,
+                    "entPhysicalClass": null,
+                    "entPhysicalName": null,
+                    "entPhysicalHardwareRev": null,
+                    "entPhysicalFirmwareRev": null,
+                    "entPhysicalSoftwareRev": null,
+                    "entPhysicalAlias": null,
+                    "entPhysicalAssetID": null,
+                    "entPhysicalIsFRU": null,
+                    "entPhysicalModelName": "NCS-5504",
+                    "entPhysicalVendorType": null,
+                    "entPhysicalSerialNum": null,
+                    "entPhysicalContainedIn": 0,
+                    "entPhysicalParentRelPos": -1,
+                    "entPhysicalMfgName": null,
+                    "ifIndex": null
+                },
+                {
+                    "entPhysicalIndex": 8384518,
+                    "entPhysicalDescr": null,
+                    "entPhysicalClass": null,
+                    "entPhysicalName": null,
+                    "entPhysicalHardwareRev": null,
+                    "entPhysicalFirmwareRev": null,
+                    "entPhysicalSoftwareRev": null,
+                    "entPhysicalAlias": null,
+                    "entPhysicalAssetID": null,
+                    "entPhysicalIsFRU": null,
+                    "entPhysicalModelName": "NCS-5504",
+                    "entPhysicalVendorType": null,
+                    "entPhysicalSerialNum": null,
+                    "entPhysicalContainedIn": 0,
+                    "entPhysicalParentRelPos": -1,
+                    "entPhysicalMfgName": null,
+                    "ifIndex": null
+                }
+            ]
+        },
+        "poller": "matches discovery"
     }
 }

tests/data/iosxr_ncs5508.json

@@ -19,5 +19,50 @@
             ]
         },
         "poller": "matches discovery"
+    },
+    "entity-physical": {
+        "discovery": {
+            "entPhysical": [
+                {
+                    "entPhysicalIndex": 8384513,
+                    "entPhysicalDescr": null,
+                    "entPhysicalClass": null,
+                    "entPhysicalName": null,
+                    "entPhysicalHardwareRev": null,
+                    "entPhysicalFirmwareRev": null,
+                    "entPhysicalSoftwareRev": null,
+                    "entPhysicalAlias": null,
+                    "entPhysicalAssetID": null,
+                    "entPhysicalIsFRU": null,
+                    "entPhysicalModelName": "NCS-5508",
+                    "entPhysicalVendorType": null,
+                    "entPhysicalSerialNum": null,
+                    "entPhysicalContainedIn": 0,
+                    "entPhysicalParentRelPos": -1,
+                    "entPhysicalMfgName": null,
+                    "ifIndex": null
+                },
+                {
+                    "entPhysicalIndex": 8384518,
+                    "entPhysicalDescr": null,
+                    "entPhysicalClass": null,
+                    "entPhysicalName": null,
+                    "entPhysicalHardwareRev": null,
+                    "entPhysicalFirmwareRev": null,
+                    "entPhysicalSoftwareRev": null,
+                    "entPhysicalAlias": null,
+                    "entPhysicalAssetID": null,
+                    "entPhysicalIsFRU": null,
+                    "entPhysicalModelName": "NCS-5508",
+                    "entPhysicalVendorType": null,
+                    "entPhysicalSerialNum": null,
+                    "entPhysicalContainedIn": 0,
+                    "entPhysicalParentRelPos": -1,
+                    "entPhysicalMfgName": null,
+                    "ifIndex": null
+                }
+            ]
+        },
+        "poller": "matches discovery"
     }
 }

tests/data/ironware.json

@@ -21637,8 +21637,8 @@
                     "ifName": "ve55",
                     "portName": null,
                     "ifIndex": 16777271,
-                    "ifSpeed": 0,
-                    "ifSpeed_prev": null,
+                    "ifSpeed": null,
+                    "ifSpeed_prev": 0,
                     "ifConnectorPresent": "false",
                     "ifOperStatus": "up",
                     "ifOperStatus_prev": "up",
@@ -21737,8 +21737,8 @@
                     "ifName": "ve66",
                     "portName": null,
                     "ifIndex": 16777282,
-                    "ifSpeed": 0,
-                    "ifSpeed_prev": null,
+                    "ifSpeed": null,
+                    "ifSpeed_prev": 0,
                     "ifConnectorPresent": "false",
                     "ifOperStatus": "up",
                     "ifOperStatus_prev": "up",
@@ -21837,8 +21837,8 @@
                     "ifName": "loopback1",
                     "portName": null,
                     "ifIndex": 33554433,
-                    "ifSpeed": 0,
-                    "ifSpeed_prev": null,
+                    "ifSpeed": null,
+                    "ifSpeed_prev": 0,
                     "ifConnectorPresent": "false",
                     "ifOperStatus": "up",
                     "ifOperStatus_prev": "up",
@@ -23311,10 +23311,10 @@
                     "bgpPeerRemoteAs": 23456,
                     "bgpPeerState": "established",
                     "bgpPeerAdminStatus": "start",
-                    "bgpPeerLastErrorCode": null,
+                    "bgpPeerLastErrorCode": 0,
                     "bgpPeerLastErrorSubCode": null,
                     "bgpPeerLastErrorText": null,
-                    "bgpPeerIface": null,
+                    "bgpPeerIface": 1,
                     "bgpLocalAddr": "172.31.31.20",
                     "bgpPeerRemoteAddr": "0.0.0.0",
                     "bgpPeerDescr": "",
@@ -23334,10 +23334,10 @@
                     "bgpPeerRemoteAs": 65065,
                     "bgpPeerState": "connect",
                     "bgpPeerAdminStatus": "start",
-                    "bgpPeerLastErrorCode": null,
+                    "bgpPeerLastErrorCode": 0,
                     "bgpPeerLastErrorSubCode": null,
                     "bgpPeerLastErrorText": null,
-                    "bgpPeerIface": null,
+                    "bgpPeerIface": 1,
                     "bgpLocalAddr": "192.0.2.5",
                     "bgpPeerRemoteAddr": "0.0.0.0",
                     "bgpPeerDescr": "",
@@ -23357,7 +23357,7 @@
                     "bgpPeerRemoteAs": 65065,
                     "bgpPeerState": "idle",
                     "bgpPeerAdminStatus": "stop",
-                    "bgpPeerLastErrorCode": null,
+                    "bgpPeerLastErrorCode": 0,
                     "bgpPeerLastErrorSubCode": null,
                     "bgpPeerLastErrorText": null,
                     "bgpPeerIface": null,
@@ -23380,10 +23380,10 @@
                     "bgpPeerRemoteAs": 23456,
                     "bgpPeerState": "connect",
                     "bgpPeerAdminStatus": "start",
-                    "bgpPeerLastErrorCode": null,
+                    "bgpPeerLastErrorCode": 0,
                     "bgpPeerLastErrorSubCode": null,
                     "bgpPeerLastErrorText": null,
-                    "bgpPeerIface": null,
+                    "bgpPeerIface": 1,
                     "bgpLocalAddr": "192.0.2.5",
                     "bgpPeerRemoteAddr": "0.0.0.0",
                     "bgpPeerDescr": "",
@@ -23403,7 +23403,7 @@
                     "bgpPeerRemoteAs": 23456,
                     "bgpPeerState": "idle",
                     "bgpPeerAdminStatus": "stop",
-                    "bgpPeerLastErrorCode": null,
+                    "bgpPeerLastErrorCode": 0,
                     "bgpPeerLastErrorSubCode": null,
                     "bgpPeerLastErrorText": null,
                     "bgpPeerIface": null,

tests/data/ise_3595.json

@@ -13,7 +13,7 @@
                     "location": "<private>",
                     "os": "ise",
                     "type": "server",
-                    "serial": "<private>",
+                    "serial": "AAA9999Z999",
                     "icon": "cisco.svg"
                 }
             ]
@@ -2446,7 +2446,7 @@
                     "entPhysicalIsFRU": "0",
                     "entPhysicalModelName": "SNS-3595-K9",
                     "entPhysicalVendorType": "zeroDotZero.0",
-                    "entPhysicalSerialNum": "FCH2204V176",
+                    "entPhysicalSerialNum": "AAA9999Z999",
                     "entPhysicalContainedIn": 0,
                     "entPhysicalParentRelPos": -1,
                     "entPhysicalMfgName": "Cisco Systems Inc.",

tests/data/janitza_generic.json

@@ -159,7 +159,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": -82,
+                    "sensor_current": 209,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -1272,7 +1272,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": null,
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": -82,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": null

tests/data/nxos_n3k-3064pq.json

@@ -11290,7 +11290,7 @@
                     "sensor_divisor": 1000,
                     "sensor_multiplier": 1,
                     "sensor_current": 0,
-                    "sensor_limit": null,
+                    "sensor_limit": 0,
                     "sensor_limit_warn": -1.001,
                     "sensor_limit_low": -25.228,
                     "sensor_limit_low_warn": -23.979,
@@ -11440,7 +11440,7 @@
                     "sensor_divisor": 1000,
                     "sensor_multiplier": 1,
                     "sensor_current": 0,
-                    "sensor_limit": null,
+                    "sensor_limit": 0,
                     "sensor_limit_warn": -1.001,
                     "sensor_limit_low": -25.228,
                     "sensor_limit_low_warn": -23.979,
@@ -11539,7 +11539,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 2,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -11564,7 +11564,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 1,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -11589,7 +11589,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 0,
+                    "sensor_current": 14,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -12857,7 +12857,7 @@
                     "sensor_divisor": 1000,
                     "sensor_multiplier": 1,
                     "sensor_current": 0,
-                    "sensor_limit": null,
+                    "sensor_limit": 0,
                     "sensor_limit_warn": -1.001,
                     "sensor_limit_low": -25.228,
                     "sensor_limit_low_warn": -23.979,
@@ -13007,7 +13007,7 @@
                     "sensor_divisor": 1000,
                     "sensor_multiplier": 1,
                     "sensor_current": 0,
-                    "sensor_limit": null,
+                    "sensor_limit": 0,
                     "sensor_limit_warn": -1.001,
                     "sensor_limit_low": -25.228,
                     "sensor_limit_low_warn": -23.979,
@@ -13115,7 +13115,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "470",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cefcFRUPowerOperStatus"
@@ -13140,7 +13140,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "0",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cRFStatusPeerUnitState"
@@ -13165,7 +13165,7 @@
                     "sensor_custom": "No",
                     "entPhysicalIndex": "0",
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 0,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": "cRFStatusUnitState"

tests/data/nxos_n9000-9.3.9.json

@@ -1,4 +1,25 @@
 {
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": null,
+                    "sysObjectID": ".1.3.6.1.4.1.9.12.3.1.3.2193",
+                    "sysDescr": "Cisco NX-OS(tm) Nexus9000 C93180YC-FX3, Software (NXOS 32-bit), Version 9.3(9), RELEASE SOFTWARE Copyright (c) 2002-2022 by Cisco Systems, Inc. Compiled 2/4/2022 7:00:00",
+                    "sysContact": null,
+                    "version": null,
+                    "hardware": null,
+                    "features": null,
+                    "location": null,
+                    "os": "nxos",
+                    "type": "network",
+                    "serial": null,
+                    "icon": "cisco.svg"
+                }
+            ]
+        },
+        "poller": "matches discovery"
+    },
     "slas": {
         "discovery": {
             "slas": [

tests/data/ocnos_s9600-32x.json

@@ -11412,9 +11412,9 @@
         "discovery": {
             "bgpPeers": [
                 {
-                    "astext": "AS399693-MOCK-TEXT",
+                    "astext": "AS65534-MOCK-TEXT",
                     "bgpPeerIdentifier": "100.127.0.200",
-                    "bgpPeerRemoteAs": 399693,
+                    "bgpPeerRemoteAs": 65534,
                     "bgpPeerState": "idle",
                     "bgpPeerAdminStatus": "stop",
                     "bgpPeerLastErrorCode": null,
@@ -11431,13 +11431,13 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": 399693,
+                    "bgpLocalAs": 65534,
                     "vrfLocalAs": null
                 },
                 {
-                    "astext": "AS399693-MOCK-TEXT",
+                    "astext": "AS65534-MOCK-TEXT",
                     "bgpPeerIdentifier": "100.127.0.201",
-                    "bgpPeerRemoteAs": 399693,
+                    "bgpPeerRemoteAs": 65534,
                     "bgpPeerState": "idle",
                     "bgpPeerAdminStatus": "stop",
                     "bgpPeerLastErrorCode": null,
@@ -11454,7 +11454,7 @@
                     "bgpPeerFsmEstablishedTime": 0,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": 399693,
+                    "bgpLocalAs": 65534,
                     "vrfLocalAs": null
                 }
             ]
@@ -11462,9 +11462,9 @@
         "poller": {
             "bgpPeers": [
                 {
-                    "astext": "AS399693-MOCK-TEXT",
+                    "astext": "AS65534-MOCK-TEXT",
                     "bgpPeerIdentifier": "100.127.0.200",
-                    "bgpPeerRemoteAs": 399693,
+                    "bgpPeerRemoteAs": 65534,
                     "bgpPeerState": "established",
                     "bgpPeerAdminStatus": "start",
                     "bgpPeerLastErrorCode": 6,
@@ -11481,13 +11481,13 @@
                     "bgpPeerFsmEstablishedTime": 298301,
                     "bgpPeerInUpdateElapsedTime": 10,
                     "context_name": "",
-                    "bgpLocalAs": 399693,
+                    "bgpLocalAs": 65534,
                     "vrfLocalAs": null
                 },
                 {
-                    "astext": "AS399693-MOCK-TEXT",
+                    "astext": "AS65534-MOCK-TEXT",
                     "bgpPeerIdentifier": "100.127.0.201",
-                    "bgpPeerRemoteAs": 399693,
+                    "bgpPeerRemoteAs": 65534,
                     "bgpPeerState": "idle",
                     "bgpPeerAdminStatus": "start",
                     "bgpPeerLastErrorCode": 4,
@@ -11504,7 +11504,7 @@
                     "bgpPeerFsmEstablishedTime": 483867,
                     "bgpPeerInUpdateElapsedTime": 0,
                     "context_name": "",
-                    "bgpLocalAs": 399693,
+                    "bgpLocalAs": 65534,
                     "vrfLocalAs": null
                 }
             ]

tests/data/polycomLens_studioxc50.json

@@ -1438,8 +1438,8 @@
                     "sensor_class": "state",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.13885.101.1.6.8.1.0",
-                    "sensor_index": "0",
-                    "sensor_type": "externalIntegrationCDR",
+                    "sensor_index": "externalIntegrationCDRStatus.0",
+                    "sensor_type": "polycomEndpointGeneric",
                     "sensor_descr": "Poly CDR Service Status",
                     "group": null,
                     "sensor_divisor": 1,
@@ -1456,15 +1456,15 @@
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
-                    "state_name": "externalIntegrationCDR"
+                    "state_name": "polycomEndpointGeneric"
                 },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.13885.101.1.6.13.1.0",
-                    "sensor_index": "0",
-                    "sensor_type": "externalIntegrationDirectorySvcs",
+                    "sensor_index": "externalIntegrationDirectorySvcsStatus.0",
+                    "sensor_type": "polycomEndpointGeneric",
                     "sensor_descr": "Directory Integration Status",
                     "group": null,
                     "sensor_divisor": 1,
@@ -1481,15 +1481,15 @@
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
-                    "state_name": "externalIntegrationDirectorySvcs"
+                    "state_name": "polycomEndpointGeneric"
                 },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.13885.101.1.6.12.1.0",
-                    "sensor_index": "0",
-                    "sensor_type": "externalIntegrationExchange",
+                    "sensor_index": "externalIntegrationExchangeStatus.0",
+                    "sensor_type": "polycomEndpointGeneric",
                     "sensor_descr": "Exchange Integration Status",
                     "group": null,
                     "sensor_divisor": 1,
@@ -1506,15 +1506,15 @@
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
-                    "state_name": "externalIntegrationExchange"
+                    "state_name": "polycomEndpointGeneric"
                 },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.13885.101.1.6.7.1.0",
-                    "sensor_index": "0",
-                    "sensor_type": "externalIntegrationPresence",
+                    "sensor_index": "externalIntegrationPresenceStatus.0",
+                    "sensor_type": "polycomEndpointGeneric",
                     "sensor_descr": "Poly Presence Service Status",
                     "group": null,
                     "sensor_divisor": 1,
@@ -1531,15 +1531,15 @@
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
-                    "state_name": "externalIntegrationPresence"
+                    "state_name": "polycomEndpointGeneric"
                 },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.13885.101.1.6.11.1.0",
-                    "sensor_index": "0",
-                    "sensor_type": "externalIntegrationProvisioning",
+                    "sensor_index": "externalIntegrationProvisioningStatus.0",
+                    "sensor_type": "polycomEndpointGeneric",
                     "sensor_descr": "Poly Provisioning Status",
                     "group": null,
                     "sensor_divisor": 1,
@@ -1556,15 +1556,15 @@
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
-                    "state_name": "externalIntegrationProvisioning"
+                    "state_name": "polycomEndpointGeneric"
                 },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.13885.101.1.6.10.1.0",
-                    "sensor_index": "0",
-                    "sensor_type": "externalIntegrationSoftwareUpdate",
+                    "sensor_index": "externalIntegrationSoftwareUpdateStatus.0",
+                    "sensor_type": "polycomEndpointGeneric",
                     "sensor_descr": "Poly Software Update Status",
                     "group": null,
                     "sensor_divisor": 1,
@@ -1581,15 +1581,15 @@
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
-                    "state_name": "externalIntegrationSoftwareUpdate"
+                    "state_name": "polycomEndpointGeneric"
                 },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.13885.101.1.6.9.1.0",
-                    "sensor_index": "0",
-                    "sensor_type": "externalIntegrationSyslog",
+                    "sensor_index": "externalIntegrationSyslogStatus.0",
+                    "sensor_type": "polycomEndpointGeneric",
                     "sensor_descr": "Syslog Service Status",
                     "group": null,
                     "sensor_divisor": 1,
@@ -1606,40 +1606,15 @@
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
-                    "state_name": "externalIntegrationSyslog"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.13885.101.1.3.1.0",
-                    "sensor_index": "0",
-                    "sensor_type": "hardware",
-                    "sensor_descr": "Hardware Status",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 2,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "hardware"
+                    "state_name": "polycomEndpointGeneric"
                 },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.13885.101.1.3.6.1.0",
-                    "sensor_index": "0",
-                    "sensor_type": "hardwareCamera",
+                    "sensor_index": "hardwareCameraStatus.0",
+                    "sensor_type": "polycomEndpointGeneric",
                     "sensor_descr": "Camera Status",
                     "group": null,
                     "sensor_divisor": 1,
@@ -1656,15 +1631,15 @@
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
-                    "state_name": "hardwareCamera"
+                    "state_name": "polycomEndpointGeneric"
                 },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.13885.101.1.3.5.1.0",
-                    "sensor_index": "0",
-                    "sensor_type": "hardwareMicrophone",
+                    "sensor_index": "hardwareMicrophoneStatus.0",
+                    "sensor_type": "polycomEndpointGeneric",
                     "sensor_descr": "Microphone Status",
                     "group": null,
                     "sensor_divisor": 1,
@@ -1681,15 +1656,15 @@
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
-                    "state_name": "hardwareMicrophone"
+                    "state_name": "polycomEndpointGeneric"
                 },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.13885.101.1.3.10.1.0",
-                    "sensor_index": "0",
-                    "sensor_type": "hardwareNIC",
+                    "sensor_index": "hardwareNICStatus.0",
+                    "sensor_type": "polycomEndpointGeneric",
                     "sensor_descr": "NIC Status",
                     "group": null,
                     "sensor_divisor": 1,
@@ -1706,15 +1681,40 @@
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
-                    "state_name": "hardwareNIC"
+                    "state_name": "polycomEndpointGeneric"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13885.101.1.3.1.0",
+                    "sensor_index": "hardwareOverallStatus.0",
+                    "sensor_type": "polycomEndpointGeneric",
+                    "sensor_descr": "Hardware Status",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "polycomEndpointGeneric"
                 },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.13885.101.1.3.11.1.0",
-                    "sensor_index": "0",
-                    "sensor_type": "hardwarePTC",
+                    "sensor_index": "hardwarePTCStatus.0",
+                    "sensor_type": "polycomEndpointGeneric",
                     "sensor_descr": "PTC Status",
                     "group": null,
                     "sensor_divisor": 1,
@@ -1731,15 +1731,15 @@
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
-                    "state_name": "hardwarePTC"
+                    "state_name": "polycomEndpointGeneric"
                 },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.13885.101.1.3.12.1.0",
-                    "sensor_index": "0",
-                    "sensor_type": "hardwareUcBoard",
+                    "sensor_index": "hardwareUcBoardStatus.0",
+                    "sensor_type": "polycomEndpointGeneric",
                     "sensor_descr": "Uc Board Status",
                     "group": null,
                     "sensor_divisor": 1,
@@ -1756,15 +1756,15 @@
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
-                    "state_name": "hardwareUcBoard"
+                    "state_name": "polycomEndpointGeneric"
                 },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.13885.101.1.1.6.0",
-                    "sensor_index": "0",
-                    "sensor_type": "identity",
+                    "sensor_index": "identityStatus.0",
+                    "sensor_type": "polycomEndpointGeneric",
                     "sensor_descr": "Overall System status",
                     "group": null,
                     "sensor_divisor": 1,
@@ -1781,15 +1781,40 @@
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
-                    "state_name": "identity"
+                    "state_name": "polycomEndpointGeneric"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13885.101.1.2.7.2.0",
+                    "sensor_index": "serviceH323RegistrationStatus.0",
+                    "sensor_type": "polycomEndpointGeneric",
+                    "sensor_descr": "H323 Status",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 1,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "polycomEndpointGeneric"
                 },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.13885.101.1.2.7.1.0",
-                    "sensor_index": "0",
-                    "sensor_type": "serviceH323",
+                    "sensor_index": "serviceH323Status.0",
+                    "sensor_type": "polycomEndpointGeneric",
                     "sensor_descr": "H323 Status",
                     "group": null,
                     "sensor_divisor": 1,
@@ -1806,40 +1831,15 @@
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
-                    "state_name": "serviceH323"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.13885.101.1.2.8.1.0",
-                    "sensor_index": "0",
-                    "sensor_type": "serviceSip",
-                    "sensor_descr": "Sip overall Status",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 2,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "serviceSip"
+                    "state_name": "polycomEndpointGeneric"
                 },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "state",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.13885.101.1.2.8.3.1.2.1",
-                    "sensor_index": "1",
-                    "sensor_type": "serviceSipRegistrationTable",
+                    "sensor_index": "serviceSipRegistrationStatus.1",
+                    "sensor_type": "polycomEndpointGeneric",
                     "sensor_descr": "Sip Status Line 1",
                     "group": null,
                     "sensor_divisor": 1,
@@ -1856,362 +1856,51 @@
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
-                    "state_name": "serviceSipRegistrationTable"
+                    "state_name": "polycomEndpointGeneric"
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "state",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13885.101.1.2.8.1.0",
+                    "sensor_index": "serviceSipStatus.0",
+                    "sensor_type": "polycomEndpointGeneric",
+                    "sensor_descr": "Sip overall Status",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 2,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": "polycomEndpointGeneric"
                 }
             ],
             "state_indexes": [
                 {
-                    "state_name": "externalIntegrationCDR",
+                    "state_name": "polycomEndpointGeneric",
                     "state_descr": "disabled",
                     "state_draw_graph": 1,
                     "state_value": 1,
                     "state_generic_value": 3
                 },
                 {
-                    "state_name": "externalIntegrationCDR",
+                    "state_name": "polycomEndpointGeneric",
                     "state_descr": "ok",
                     "state_draw_graph": 1,
                     "state_value": 2,
                     "state_generic_value": 0
                 },
                 {
-                    "state_name": "externalIntegrationCDR",
-                    "state_descr": "failed",
-                    "state_draw_graph": 1,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "externalIntegrationDirectorySvcs",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 1,
-                    "state_value": 1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "externalIntegrationDirectorySvcs",
-                    "state_descr": "ok",
-                    "state_draw_graph": 1,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "externalIntegrationDirectorySvcs",
-                    "state_descr": "failed",
-                    "state_draw_graph": 1,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "externalIntegrationExchange",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 1,
-                    "state_value": 1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "externalIntegrationExchange",
-                    "state_descr": "ok",
-                    "state_draw_graph": 1,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "externalIntegrationExchange",
-                    "state_descr": "failed",
-                    "state_draw_graph": 1,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "externalIntegrationPresence",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 1,
-                    "state_value": 1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "externalIntegrationPresence",
-                    "state_descr": "ok",
-                    "state_draw_graph": 1,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "externalIntegrationPresence",
-                    "state_descr": "failed",
-                    "state_draw_graph": 1,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "externalIntegrationProvisioning",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 1,
-                    "state_value": 1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "externalIntegrationProvisioning",
-                    "state_descr": "ok",
-                    "state_draw_graph": 1,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "externalIntegrationProvisioning",
-                    "state_descr": "failed",
-                    "state_draw_graph": 1,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "externalIntegrationSoftwareUpdate",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 1,
-                    "state_value": 1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "externalIntegrationSoftwareUpdate",
-                    "state_descr": "ok",
-                    "state_draw_graph": 1,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "externalIntegrationSoftwareUpdate",
-                    "state_descr": "failed",
-                    "state_draw_graph": 1,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "externalIntegrationSyslog",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 1,
-                    "state_value": 1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "externalIntegrationSyslog",
-                    "state_descr": "ok",
-                    "state_draw_graph": 1,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "externalIntegrationSyslog",
-                    "state_descr": "failed",
-                    "state_draw_graph": 1,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "hardware",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 1,
-                    "state_value": 1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "hardware",
-                    "state_descr": "ok",
-                    "state_draw_graph": 1,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "hardware",
-                    "state_descr": "failed",
-                    "state_draw_graph": 1,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "hardwareCamera",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 1,
-                    "state_value": 1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "hardwareCamera",
-                    "state_descr": "ok",
-                    "state_draw_graph": 1,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "hardwareCamera",
-                    "state_descr": "failed",
-                    "state_draw_graph": 1,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "hardwareMicrophone",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 1,
-                    "state_value": 1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "hardwareMicrophone",
-                    "state_descr": "ok",
-                    "state_draw_graph": 1,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "hardwareMicrophone",
-                    "state_descr": "failed",
-                    "state_draw_graph": 1,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "hardwareNIC",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 1,
-                    "state_value": 1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "hardwareNIC",
-                    "state_descr": "ok",
-                    "state_draw_graph": 1,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "hardwareNIC",
-                    "state_descr": "failed",
-                    "state_draw_graph": 1,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "hardwarePTC",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 1,
-                    "state_value": 1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "hardwarePTC",
-                    "state_descr": "ok",
-                    "state_draw_graph": 1,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "hardwarePTC",
-                    "state_descr": "failed",
-                    "state_draw_graph": 1,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "hardwareUcBoard",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 1,
-                    "state_value": 1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "hardwareUcBoard",
-                    "state_descr": "ok",
-                    "state_draw_graph": 1,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "hardwareUcBoard",
-                    "state_descr": "failed",
-                    "state_draw_graph": 1,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "identity",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 1,
-                    "state_value": 1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "identity",
-                    "state_descr": "ok",
-                    "state_draw_graph": 1,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "identity",
-                    "state_descr": "failed",
-                    "state_draw_graph": 1,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "serviceH323",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 1,
-                    "state_value": 1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "serviceH323",
-                    "state_descr": "ok",
-                    "state_draw_graph": 1,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "serviceH323",
-                    "state_descr": "failed",
-                    "state_draw_graph": 1,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "serviceSip",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 1,
-                    "state_value": 1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "serviceSip",
-                    "state_descr": "ok",
-                    "state_draw_graph": 1,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "serviceSip",
-                    "state_descr": "failed",
-                    "state_draw_graph": 1,
-                    "state_value": 3,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "serviceSipRegistrationTable",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 1,
-                    "state_value": 1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "serviceSipRegistrationTable",
-                    "state_descr": "ok",
-                    "state_draw_graph": 1,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "serviceSipRegistrationTable",
+                    "state_name": "polycomEndpointGeneric",
                     "state_descr": "failed",
                     "state_draw_graph": 1,
                     "state_value": 3,

tests/data/raritan-pdu_px2.json

@@ -0,0 +1,730 @@
+{
+    "os": {
+        "discovery": {
+            "devices": [
+                {
+                    "sysName": "<private>",
+                    "sysObjectID": ".1.3.6.1.4.1.13742.6",
+                    "sysDescr": "PX2 030004",
+                    "sysContact": "<private>",
+                    "version": null,
+                    "hardware": null,
+                    "features": null,
+                    "location": "<private>",
+                    "os": "raritan-pdu",
+                    "type": "power",
+                    "serial": null,
+                    "icon": "raritan.svg"
+                }
+            ]
+        },
+        "poller": "matches discovery"
+    },
+    "sensors": {
+        "discovery": {
+            "sensors": [
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "current",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.1.1",
+                    "sensor_index": "1",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "Outlet 1",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": 8000,
+                    "sensor_limit_warn": 6500,
+                    "sensor_limit_low": 0,
+                    "sensor_limit_low_warn": 0,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "current",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.2.3.1.4.1.1.1",
+                    "sensor_index": "1.1",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "I1",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0.68,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "current",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.10.1",
+                    "sensor_index": "10",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET10",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0.184,
+                    "sensor_limit": 8000,
+                    "sensor_limit_warn": 6500,
+                    "sensor_limit_low": 0,
+                    "sensor_limit_low_warn": 0,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "current",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.11.1",
+                    "sensor_index": "11",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET11",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0.185,
+                    "sensor_limit": 8000,
+                    "sensor_limit_warn": 6500,
+                    "sensor_limit_low": 0,
+                    "sensor_limit_low_warn": 0,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "current",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.12.1",
+                    "sensor_index": "12",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET12",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": 8000,
+                    "sensor_limit_warn": 6500,
+                    "sensor_limit_low": 0,
+                    "sensor_limit_low_warn": 0,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "current",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.2.1",
+                    "sensor_index": "2",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET2",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": 8000,
+                    "sensor_limit_warn": 6500,
+                    "sensor_limit_low": 0,
+                    "sensor_limit_low_warn": 0,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "current",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.3.1",
+                    "sensor_index": "3",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET3",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0.311,
+                    "sensor_limit": 8000,
+                    "sensor_limit_warn": 6500,
+                    "sensor_limit_low": 0,
+                    "sensor_limit_low_warn": 0,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "current",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.4.1",
+                    "sensor_index": "4",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET4",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": 8000,
+                    "sensor_limit_warn": 6500,
+                    "sensor_limit_low": 0,
+                    "sensor_limit_low_warn": 0,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "current",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.5.1",
+                    "sensor_index": "5",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET5",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": 8000,
+                    "sensor_limit_warn": 6500,
+                    "sensor_limit_low": 0,
+                    "sensor_limit_low_warn": 0,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "current",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.6.1",
+                    "sensor_index": "6",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET6",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": 8000,
+                    "sensor_limit_warn": 6500,
+                    "sensor_limit_low": 0,
+                    "sensor_limit_low_warn": 0,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "current",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.7.1",
+                    "sensor_index": "7",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET7",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": 8000,
+                    "sensor_limit_warn": 6500,
+                    "sensor_limit_low": 0,
+                    "sensor_limit_low_warn": 0,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "current",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.8.1",
+                    "sensor_index": "8",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET8",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": 8000,
+                    "sensor_limit_warn": 6500,
+                    "sensor_limit_low": 0,
+                    "sensor_limit_low_warn": 0,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "current",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.9.1",
+                    "sensor_index": "9",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET9",
+                    "group": null,
+                    "sensor_divisor": 1000,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": 8000,
+                    "sensor_limit_warn": 6500,
+                    "sensor_limit_low": 0,
+                    "sensor_limit_low_warn": 0,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "frequency",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.2.3.1.4.1.1.23",
+                    "sensor_index": "1.1",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "I1",
+                    "group": null,
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 50,
+                    "sensor_limit": 52.5,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 47.5,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "power",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.1.5",
+                    "sensor_index": "1",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "Outlet 1",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "power",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.2.3.1.4.1.1.5",
+                    "sensor_index": "1.1",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "I1",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 138,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "power",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.10.5",
+                    "sensor_index": "10",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET10",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 35,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "power",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.11.5",
+                    "sensor_index": "11",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET11",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 35,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "power",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.12.5",
+                    "sensor_index": "12",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET12",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "power",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.2.5",
+                    "sensor_index": "2",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET2",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "power",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.3.5",
+                    "sensor_index": "3",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET3",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 68,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "power",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.4.5",
+                    "sensor_index": "4",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET4",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "power",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.5.5",
+                    "sensor_index": "5",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET5",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "power",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.6.5",
+                    "sensor_index": "6",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET6",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "power",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.7.5",
+                    "sensor_index": "7",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET7",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "power",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.8.5",
+                    "sensor_index": "8",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET8",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "power",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.4.3.1.4.1.9.5",
+                    "sensor_index": "9",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "OUTLET9",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 0,
+                    "sensor_limit": null,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": null,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.13742.6.5.2.3.1.4.1.1.4",
+                    "sensor_index": "1.1.rmsVoltage",
+                    "sensor_type": "raritan",
+                    "sensor_descr": "I1",
+                    "group": null,
+                    "sensor_divisor": 1,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 233,
+                    "sensor_limit": 267.95,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 198.05,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                }
+            ]
+        },
+        "poller": "matches discovery"
+    }
+}

tests/data/scs-ks.json

@@ -812,10 +812,10 @@
                     "sensor_deleted": 0,
                     "sensor_class": "temperature",
                     "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.18.0",
-                    "sensor_index": "0",
+                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.15.0",
+                    "sensor_index": "exhaust.0",
                     "sensor_type": "scs-ks",
-                    "sensor_descr": "Room temperature",
+                    "sensor_descr": "Exhaust air temperature",
                     "group": null,
                     "sensor_divisor": 10,
                     "sensor_multiplier": 1,
@@ -832,6 +832,81 @@
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.17.0",
+                    "sensor_index": "outside.0",
+                    "sensor_type": "scs-ks",
+                    "sensor_descr": "Outside air temperature",
+                    "group": null,
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 8.7,
+                    "sensor_limit": 28.7,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": -1.3,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.18.0",
+                    "sensor_index": "room.0",
+                    "sensor_type": "scs-ks",
+                    "sensor_descr": "Room temperature",
+                    "group": null,
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 19.6,
+                    "sensor_limit": 39.6,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 9.6,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "temperature",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.16.0",
+                    "sensor_index": "supply.0",
+                    "sensor_type": "scs-ks",
+                    "sensor_descr": "Supply air temperature",
+                    "group": null,
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 20.9,
+                    "sensor_limit": 40.9,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 10.9,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
                 }
             ],
             "state_indexes": [
@@ -1131,705 +1206,6 @@
                 }
             ]
         },
-        "poller": {
-            "sensors": [
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "humidity",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.19.0",
-                    "sensor_index": "0",
-                    "sensor_type": "scs-ks",
-                    "sensor_descr": "Room humidity",
-                    "group": null,
-                    "sensor_divisor": 10,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 28.6,
-                    "sensor_limit": 70,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": 30,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.3.0",
-                    "sensor_index": "0",
-                    "sensor_type": "status-compressor.0",
-                    "sensor_descr": "Compressor alarm",
-                    "group": "Alarm",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "status-compressor.0"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.2.0",
-                    "sensor_index": "0",
-                    "sensor_type": "status-condenser-fan.0",
-                    "sensor_descr": "Condenser Fan alarm",
-                    "group": "Alarm",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "status-condenser-fan.0"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.1.0",
-                    "sensor_index": "0",
-                    "sensor_type": "status-evaporator-fan.0",
-                    "sensor_descr": "Evaporator Fan alarm",
-                    "group": "Alarm",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "status-evaporator-fan.0"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.5.0",
-                    "sensor_index": "0",
-                    "sensor_type": "status-exhaust-air-sensor.0",
-                    "sensor_descr": "Exhaust air sensor alarm",
-                    "group": "Alarm",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "status-exhaust-air-sensor.0"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.14.0",
-                    "sensor_index": "0",
-                    "sensor_type": "status-filter-monitoring.0",
-                    "sensor_descr": "Filter monitoring alarm",
-                    "group": "Alarm",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "status-filter-monitoring.0"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.4.0",
-                    "sensor_index": "0",
-                    "sensor_type": "status-heater-thermal-protection.0",
-                    "sensor_descr": "Heater thermal protection alarm",
-                    "group": "Alarm",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "status-heater-thermal-protection.0"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.11.0",
-                    "sensor_index": "0",
-                    "sensor_type": "status-max-exhaust-air-temperature.0",
-                    "sensor_descr": "Maximum exhaust air temperature alarm",
-                    "group": "Alarm",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "status-max-exhaust-air-temperature.0"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.10.0",
-                    "sensor_index": "0",
-                    "sensor_type": "status-min-exhaust-air-temperature.0",
-                    "sensor_descr": "Minimum exhaust air temperature alarm",
-                    "group": "Alarm",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "status-min-exhaust-air-temperature.0"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.12.0",
-                    "sensor_index": "0",
-                    "sensor_type": "status-min-supply-air-temperature.0",
-                    "sensor_descr": "Minimum supply air temperature alarm",
-                    "group": "Alarm",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "status-min-supply-air-temperature.0"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.7.0",
-                    "sensor_index": "0",
-                    "sensor_type": "status-outside-sensor.0",
-                    "sensor_descr": "Outside temperature sensor alarm",
-                    "group": "Alarm",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "status-outside-sensor.0"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.9.0",
-                    "sensor_index": "0",
-                    "sensor_type": "status-room-humidity-sensor.0",
-                    "sensor_descr": "Humidity room sensor alarm",
-                    "group": "Alarm",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "status-room-humidity-sensor.0"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.8.0",
-                    "sensor_index": "0",
-                    "sensor_type": "status-room-temperature-sensor.0",
-                    "sensor_descr": "Temperature room sensor alarm",
-                    "group": "Alarm",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "status-room-temperature-sensor.0"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.6.0",
-                    "sensor_index": "0",
-                    "sensor_type": "status-supply-air-sensor.0",
-                    "sensor_descr": "Supply air sensor alarm",
-                    "group": "Alarm",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "status-supply-air-sensor.0"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.13.0",
-                    "sensor_index": "0",
-                    "sensor_type": "status-water-sensor.0",
-                    "sensor_descr": "Water sensor alarm",
-                    "group": "Alarm",
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "status-water-sensor.0"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "temperature",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.9839.1.2.18.0",
-                    "sensor_index": "0",
-                    "sensor_type": "scs-ks",
-                    "sensor_descr": "Room temperature",
-                    "group": null,
-                    "sensor_divisor": 10,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 19.6,
-                    "sensor_limit": 41.2,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": 11.2,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": 21.2,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                }
-            ],
-            "state_indexes": [
-                {
-                    "state_name": "status-compressor.0",
-                    "state_descr": "null",
-                    "state_draw_graph": 0,
-                    "state_value": -1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "status-compressor.0",
-                    "state_descr": "OK",
-                    "state_draw_graph": 0,
-                    "state_value": 0,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "status-compressor.0",
-                    "state_descr": "Error",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "status-condenser-fan.0",
-                    "state_descr": "null",
-                    "state_draw_graph": 0,
-                    "state_value": -1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "status-condenser-fan.0",
-                    "state_descr": "OK",
-                    "state_draw_graph": 0,
-                    "state_value": 0,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "status-condenser-fan.0",
-                    "state_descr": "Error",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "status-evaporator-fan.0",
-                    "state_descr": "null",
-                    "state_draw_graph": 0,
-                    "state_value": -1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "status-evaporator-fan.0",
-                    "state_descr": "OK",
-                    "state_draw_graph": 0,
-                    "state_value": 0,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "status-evaporator-fan.0",
-                    "state_descr": "Error",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "status-exhaust-air-sensor.0",
-                    "state_descr": "null",
-                    "state_draw_graph": 0,
-                    "state_value": -1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "status-exhaust-air-sensor.0",
-                    "state_descr": "OK",
-                    "state_draw_graph": 0,
-                    "state_value": 0,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "status-exhaust-air-sensor.0",
-                    "state_descr": "Error",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "status-filter-monitoring.0",
-                    "state_descr": "null",
-                    "state_draw_graph": 0,
-                    "state_value": -1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "status-filter-monitoring.0",
-                    "state_descr": "OK",
-                    "state_draw_graph": 0,
-                    "state_value": 0,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "status-filter-monitoring.0",
-                    "state_descr": "Error",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "status-heater-thermal-protection.0",
-                    "state_descr": "null",
-                    "state_draw_graph": 0,
-                    "state_value": -1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "status-heater-thermal-protection.0",
-                    "state_descr": "OK",
-                    "state_draw_graph": 0,
-                    "state_value": 0,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "status-heater-thermal-protection.0",
-                    "state_descr": "Error",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "status-max-exhaust-air-temperature.0",
-                    "state_descr": "null",
-                    "state_draw_graph": 0,
-                    "state_value": -1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "status-max-exhaust-air-temperature.0",
-                    "state_descr": "OK",
-                    "state_draw_graph": 0,
-                    "state_value": 0,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "status-max-exhaust-air-temperature.0",
-                    "state_descr": "Error",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "status-min-exhaust-air-temperature.0",
-                    "state_descr": "null",
-                    "state_draw_graph": 0,
-                    "state_value": -1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "status-min-exhaust-air-temperature.0",
-                    "state_descr": "OK",
-                    "state_draw_graph": 0,
-                    "state_value": 0,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "status-min-exhaust-air-temperature.0",
-                    "state_descr": "Error",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "status-min-supply-air-temperature.0",
-                    "state_descr": "null",
-                    "state_draw_graph": 0,
-                    "state_value": -1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "status-min-supply-air-temperature.0",
-                    "state_descr": "OK",
-                    "state_draw_graph": 0,
-                    "state_value": 0,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "status-min-supply-air-temperature.0",
-                    "state_descr": "Error",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "status-outside-sensor.0",
-                    "state_descr": "null",
-                    "state_draw_graph": 0,
-                    "state_value": -1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "status-outside-sensor.0",
-                    "state_descr": "OK",
-                    "state_draw_graph": 0,
-                    "state_value": 0,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "status-outside-sensor.0",
-                    "state_descr": "Error",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "status-room-humidity-sensor.0",
-                    "state_descr": "null",
-                    "state_draw_graph": 0,
-                    "state_value": -1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "status-room-humidity-sensor.0",
-                    "state_descr": "OK",
-                    "state_draw_graph": 0,
-                    "state_value": 0,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "status-room-humidity-sensor.0",
-                    "state_descr": "Error",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "status-room-temperature-sensor.0",
-                    "state_descr": "null",
-                    "state_draw_graph": 0,
-                    "state_value": -1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "status-room-temperature-sensor.0",
-                    "state_descr": "OK",
-                    "state_draw_graph": 0,
-                    "state_value": 0,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "status-room-temperature-sensor.0",
-                    "state_descr": "Error",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "status-supply-air-sensor.0",
-                    "state_descr": "null",
-                    "state_draw_graph": 0,
-                    "state_value": -1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "status-supply-air-sensor.0",
-                    "state_descr": "OK",
-                    "state_draw_graph": 0,
-                    "state_value": 0,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "status-supply-air-sensor.0",
-                    "state_descr": "Error",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "status-water-sensor.0",
-                    "state_descr": "null",
-                    "state_draw_graph": 0,
-                    "state_value": -1,
-                    "state_generic_value": 3
-                },
-                {
-                    "state_name": "status-water-sensor.0",
-                    "state_descr": "OK",
-                    "state_draw_graph": 0,
-                    "state_value": 0,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "status-water-sensor.0",
-                    "state_descr": "Error",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 2
-                }
-            ]
-        }
+        "poller": "matches discovery"
     }
 }

tests/data/sentry3.json

@@ -588,7 +588,7 @@
                     "sensor_class": "voltage",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.1.1",
-                    "sensor_index": "1",
+                    "sensor_index": "1.1",
                     "sensor_type": "sentry3",
                     "sensor_descr": "TowerA_InfeedA",
                     "group": "Configured Voltage",
@@ -613,7 +613,7 @@
                     "sensor_class": "voltage",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.2.1",
-                    "sensor_index": "2",
+                    "sensor_index": "2.1",
                     "sensor_type": "sentry3",
                     "sensor_descr": "TowerB_InfeedA",
                     "group": "Configured Voltage",

tests/data/sentry3_3phase.json

@@ -248,12 +248,62 @@
                     "rrd_type": "GAUGE",
                     "state_name": null
                 },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.1.1",
+                    "sensor_index": "1.1",
+                    "sensor_type": "sentry3",
+                    "sensor_descr": "TowerA_InfeedA",
+                    "group": "Configured Voltage",
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 230,
+                    "sensor_limit": 264.5,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 195.5,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
+                {
+                    "sensor_deleted": 0,
+                    "sensor_class": "voltage",
+                    "poller_type": "snmp",
+                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.1.2",
+                    "sensor_index": "1.2",
+                    "sensor_type": "sentry3",
+                    "sensor_descr": "TowerA_InfeedB",
+                    "group": "Configured Voltage",
+                    "sensor_divisor": 10,
+                    "sensor_multiplier": 1,
+                    "sensor_current": 230,
+                    "sensor_limit": 264.5,
+                    "sensor_limit_warn": null,
+                    "sensor_limit_low": 195.5,
+                    "sensor_limit_low_warn": null,
+                    "sensor_alert": 1,
+                    "sensor_custom": "No",
+                    "entPhysicalIndex": null,
+                    "entPhysicalIndex_measured": null,
+                    "sensor_prev": null,
+                    "user_func": null,
+                    "rrd_type": "GAUGE",
+                    "state_name": null
+                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "voltage",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.1.3",
-                    "sensor_index": "1",
+                    "sensor_index": "1.3",
                     "sensor_type": "sentry3",
                     "sensor_descr": "TowerA_InfeedC",
                     "group": "Configured Voltage",

tests/data/sentry3_switched.json

@@ -1262,10 +1262,10 @@
                     "sensor_deleted": 0,
                     "sensor_class": "voltage",
                     "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.1.3",
-                    "sensor_index": "1",
+                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.1.1",
+                    "sensor_index": "1.1",
                     "sensor_type": "sentry3",
-                    "sensor_descr": "TowerA_InfeedC",
+                    "sensor_descr": "TowerA_InfeedA",
                     "group": "Configured Voltage",
                     "sensor_divisor": 10,
                     "sensor_multiplier": 1,
@@ -1282,826 +1282,22 @@
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": null
-                }
-            ]
-        },
-        "poller": {
-            "sensors": [
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.7.1.1",
-                    "sensor_index": "infeedID.1.1",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "TowerA_InfeedA",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 3.09,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
                 },
                 {
                     "sensor_deleted": 0,
-                    "sensor_class": "current",
+                    "sensor_class": "voltage",
                     "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.7.1.2",
-                    "sensor_index": "infeedID.1.2",
+                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.1.2",
+                    "sensor_index": "1.2",
                     "sensor_type": "sentry3",
                     "sensor_descr": "TowerA_InfeedB",
-                    "group": null,
-                    "sensor_divisor": 100,
+                    "group": "Configured Voltage",
+                    "sensor_divisor": 10,
                     "sensor_multiplier": 1,
-                    "sensor_current": 3.92,
-                    "sensor_limit": null,
+                    "sensor_current": 207.8,
+                    "sensor_limit": 238.97,
                     "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.7.1.3",
-                    "sensor_index": "infeedID.1.3",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "TowerA_InfeedC",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 4.34,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.1.1",
-                    "sensor_index": "outletID.1.1.1",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AA1",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.1.10",
-                    "sensor_index": "outletID.1.1.10",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AA10",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0.65,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.1.2",
-                    "sensor_index": "outletID.1.1.2",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AA2",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.1.3",
-                    "sensor_index": "outletID.1.1.3",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AA3",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.1.4",
-                    "sensor_index": "outletID.1.1.4",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AA4",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.1.5",
-                    "sensor_index": "outletID.1.1.5",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AA5",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.1.6",
-                    "sensor_index": "outletID.1.1.6",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AA6",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.1.7",
-                    "sensor_index": "outletID.1.1.7",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AA7",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.1.8",
-                    "sensor_index": "outletID.1.1.8",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AA8",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0.64,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.1.9",
-                    "sensor_index": "outletID.1.1.9",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AA9",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.2.1",
-                    "sensor_index": "outletID.1.2.1",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AB1",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0.81,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.2.10",
-                    "sensor_index": "outletID.1.2.10",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AB10",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0.28,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.2.2",
-                    "sensor_index": "outletID.1.2.2",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AB2",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.2.3",
-                    "sensor_index": "outletID.1.2.3",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AB3",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0.82,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.2.4",
-                    "sensor_index": "outletID.1.2.4",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AB4",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.2.5",
-                    "sensor_index": "outletID.1.2.5",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AB5",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0.81,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.2.6",
-                    "sensor_index": "outletID.1.2.6",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AB6",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.2.7",
-                    "sensor_index": "outletID.1.2.7",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AB7",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.2.8",
-                    "sensor_index": "outletID.1.2.8",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AB8",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0.47,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.2.9",
-                    "sensor_index": "outletID.1.2.9",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AB9",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.3.1",
-                    "sensor_index": "outletID.1.3.1",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AC1",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0.73,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.3.10",
-                    "sensor_index": "outletID.1.3.10",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AC10",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0.56,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.3.2",
-                    "sensor_index": "outletID.1.3.2",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AC2",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.3.3",
-                    "sensor_index": "outletID.1.3.3",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AC3",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0.66,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.3.4",
-                    "sensor_index": "outletID.1.3.4",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AC4",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0.32,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.3.5",
-                    "sensor_index": "outletID.1.3.5",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AC5",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.3.6",
-                    "sensor_index": "outletID.1.3.6",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AC6",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.3.7",
-                    "sensor_index": "outletID.1.3.7",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AC7",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.3.8",
-                    "sensor_index": "outletID.1.3.8",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AC8",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "current",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.1718.3.2.3.1.7.1.3.9",
-                    "sensor_index": "outletID.1.3.9",
-                    "sensor_type": "sentry3",
-                    "sensor_descr": "Outlet AC9",
-                    "group": null,
-                    "sensor_divisor": 100,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 0,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
+                    "sensor_limit_low": 176.63,
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
@@ -2117,27 +1313,28 @@
                     "sensor_class": "voltage",
                     "poller_type": "snmp",
                     "sensor_oid": ".1.3.6.1.4.1.1718.3.2.2.1.11.1.3",
-                    "sensor_index": "1",
+                    "sensor_index": "1.3",
                     "sensor_type": "sentry3",
                     "sensor_descr": "TowerA_InfeedC",
                     "group": "Configured Voltage",
                     "sensor_divisor": 10,
                     "sensor_multiplier": 1,
                     "sensor_current": 208.7,
-                    "sensor_limit": 238.05,
+                    "sensor_limit": 240.005,
                     "sensor_limit_warn": null,
-                    "sensor_limit_low": 175.95,
+                    "sensor_limit_low": 177.395,
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
                     "entPhysicalIndex": null,
                     "entPhysicalIndex_measured": null,
-                    "sensor_prev": 207,
+                    "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
                     "state_name": null
                 }
             ]
-        }
+        },
+        "poller": "matches discovery"
     }
 }

tests/data/ssu2000.json

@@ -134,7 +134,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 2,
+                    "sensor_current": 5,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -159,7 +159,7 @@
                     "group": null,
                     "sensor_divisor": 1,
                     "sensor_multiplier": 1,
-                    "sensor_current": 1,
+                    "sensor_current": 5,
                     "sensor_limit": null,
                     "sensor_limit_warn": null,
                     "sensor_limit_low": null,
@@ -503,487 +503,6 @@
                 }
             ]
         },
-        "poller": {
-            "sensors": [
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "delay",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.601.3.1.1.2.5.1.1.4.1.3",
-                    "sensor_index": "staGpsPhaseA.1.3",
-                    "sensor_type": "ssu2000",
-                    "sensor_descr": "GPS Phase A - Chassis.Slot# 1.3",
-                    "group": null,
-                    "sensor_divisor": 1000000000,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 1.23e-7,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "delay",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.601.3.1.1.2.5.1.1.4.1.5",
-                    "sensor_index": "staGpsPhaseA.1.5",
-                    "sensor_type": "ssu2000",
-                    "sensor_descr": "GPS Phase A - Chassis.Slot# 1.5",
-                    "group": null,
-                    "sensor_divisor": 1000000000,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 1.34e-7,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "delay",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.601.3.1.1.2.5.1.1.5.1.3",
-                    "sensor_index": "staGpsPhaseB.1.3",
-                    "sensor_type": "ssu2000",
-                    "sensor_descr": "GPS Phase B - Chassis.Slot# 1.3",
-                    "group": null,
-                    "sensor_divisor": 1000000000,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 1.2e-8,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "delay",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.601.3.1.1.2.5.1.1.5.1.5",
-                    "sensor_index": "staGpsPhaseB.1.5",
-                    "sensor_type": "ssu2000",
-                    "sensor_descr": "GPS Phase B - Chassis.Slot# 1.5",
-                    "group": null,
-                    "sensor_divisor": 1000000000,
-                    "sensor_multiplier": 1,
-                    "sensor_current": -1.23e-7,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.601.3.1.1.2.2.1.1.4.1.1",
-                    "sensor_index": "1.1",
-                    "sensor_type": "staClkTable",
-                    "sensor_descr": "PLL Mode - Chassis.Slot# 1.1",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 5,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": 2,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "staClkTable"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.601.3.1.1.2.2.1.1.4.1.12",
-                    "sensor_index": "1.12",
-                    "sensor_type": "staClkTable",
-                    "sensor_descr": "PLL Mode - Chassis.Slot# 1.12",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 5,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": 1,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "staClkTable"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.601.3.1.1.2.5.1.1.3.1.3",
-                    "sensor_index": "1.3",
-                    "sensor_type": "staGpsTable",
-                    "sensor_descr": "GPS Status - Chassis.Slot# 1.3",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 2,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "staGpsTable"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.601.3.1.1.2.5.1.1.3.1.5",
-                    "sensor_index": "1.5",
-                    "sensor_type": "staGpsTable",
-                    "sensor_descr": "GPS Status - Chassis.Slot# 1.5",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 1,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "staGpsTable"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.601.3.1.1.2.15.1.1.3.2.1",
-                    "sensor_index": "2.1",
-                    "sensor_type": "staPtNtpTable",
-                    "sensor_descr": "NTP Status - Chassis.Slot# 2.1",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 1,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "staPtNtpTable"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.601.3.1.1.2.15.1.1.3.2.13",
-                    "sensor_index": "2.13",
-                    "sensor_type": "staPtNtpTable",
-                    "sensor_descr": "NTP Status - Chassis.Slot# 2.13",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 1,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "staPtNtpTable"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.601.3.1.1.2.15.1.1.3.2.5",
-                    "sensor_index": "2.5",
-                    "sensor_type": "staPtNtpTable",
-                    "sensor_descr": "NTP Status - Chassis.Slot# 2.5",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 1,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "staPtNtpTable"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.601.3.1.1.2.15.1.1.3.2.9",
-                    "sensor_index": "2.9",
-                    "sensor_type": "staPtNtpTable",
-                    "sensor_descr": "NTP Status - Chassis.Slot# 2.9",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 1,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "staPtNtpTable"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.601.3.1.1.2.16.1.1.3.1.10",
-                    "sensor_index": "1.10",
-                    "sensor_type": "staPtPtpTable",
-                    "sensor_descr": "PTP Status - Chassis.Slot# 1.10",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 1,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "staPtPtpTable"
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "state",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.601.3.1.1.2.16.1.1.3.1.11",
-                    "sensor_index": "1.11",
-                    "sensor_type": "staPtPtpTable",
-                    "sensor_descr": "PTP Status - Chassis.Slot# 1.11",
-                    "group": null,
-                    "sensor_divisor": 1,
-                    "sensor_multiplier": 1,
-                    "sensor_current": 1,
-                    "sensor_limit": null,
-                    "sensor_limit_warn": null,
-                    "sensor_limit_low": null,
-                    "sensor_limit_low_warn": null,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
-                    "sensor_prev": null,
-                    "user_func": null,
-                    "rrd_type": "GAUGE",
-                    "state_name": "staPtPtpTable"
-                }
-            ],
-            "state_indexes": [
-                {
-                    "state_name": "staClkTable",
-                    "state_descr": "failed",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "staClkTable",
-                    "state_descr": "warmup",
-                    "state_draw_graph": 0,
-                    "state_value": 2,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "staClkTable",
-                    "state_descr": "acquire",
-                    "state_draw_graph": 0,
-                    "state_value": 3,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "staClkTable",
-                    "state_descr": "holdover",
-                    "state_draw_graph": 0,
-                    "state_value": 4,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "staClkTable",
-                    "state_descr": "lock",
-                    "state_draw_graph": 0,
-                    "state_value": 5,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "staGpsTable",
-                    "state_descr": "normal",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "staGpsTable",
-                    "state_descr": "selected",
-                    "state_draw_graph": 0,
-                    "state_value": 2,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "staGpsTable",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 0,
-                    "state_value": 3,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "staGpsTable",
-                    "state_descr": "fault",
-                    "state_draw_graph": 0,
-                    "state_value": 4,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "staGpsTable",
-                    "state_descr": "reject",
-                    "state_draw_graph": 0,
-                    "state_value": 5,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "staPtNtpTable",
-                    "state_descr": "normal",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "staPtNtpTable",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 0,
-                    "state_value": 3,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "staPtNtpTable",
-                    "state_descr": "fault",
-                    "state_draw_graph": 0,
-                    "state_value": 4,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "staPtNtpTable",
-                    "state_descr": "reject",
-                    "state_draw_graph": 0,
-                    "state_value": 5,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "staPtPtpTable",
-                    "state_descr": "normal",
-                    "state_draw_graph": 0,
-                    "state_value": 1,
-                    "state_generic_value": 0
-                },
-                {
-                    "state_name": "staPtPtpTable",
-                    "state_descr": "disabled",
-                    "state_draw_graph": 0,
-                    "state_value": 3,
-                    "state_generic_value": 1
-                },
-                {
-                    "state_name": "staPtPtpTable",
-                    "state_descr": "fault",
-                    "state_draw_graph": 0,
-                    "state_value": 4,
-                    "state_generic_value": 2
-                },
-                {
-                    "state_name": "staPtPtpTable",
-                    "state_descr": "reject",
-                    "state_draw_graph": 0,
-                    "state_value": 5,
-                    "state_generic_value": 1
-                }
-            ]
-        }
+        "poller": "matches discovery"
     }
 }

tests/data/timos_7705.json

@@ -4950,7 +4950,7 @@
                     "sensor_limit_low_warn": 0.004,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.39976960",
+                    "entPhysicalIndex": "39976960",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -4975,7 +4975,7 @@
                     "sensor_limit_low_warn": 0.012,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.40108032",
+                    "entPhysicalIndex": "40108032",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -5000,38 +5000,13 @@
                     "sensor_limit_low_warn": -18.996294548824,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.39976960",
+                    "entPhysicalIndex": "39976960",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
                     "rrd_type": "GAUGE",
                     "state_name": null
                 },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "dbm",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.4.31.1.21.1.40042496",
-                    "sensor_index": "rx-1.40042496",
-                    "sensor_type": "timos",
-                    "sensor_descr": "1/3/6 RX Power Int-Cal",
-                    "group": null,
-                    "sensor_divisor": 10000,
-                    "sensor_multiplier": 1,
-                    "sensor_current": -33.01,
-                    "sensor_limit": -2,
-                    "sensor_limit_warn": -3,
-                    "sensor_limit_low": -22.01,
-                    "sensor_limit_low_warn": -21.02,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1.40042496",
-                    "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": null,
-                    "user_func": "mw_to_dbm",
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "dbm",
@@ -5043,14 +5018,14 @@
                     "group": "1/3/8",
                     "sensor_divisor": 10,
                     "sensor_multiplier": 1,
-                    "sensor_current": -8.54,
+                    "sensor_current": -8.5387196432176,
                     "sensor_limit": 0.99991233544684,
                     "sensor_limit_warn": 0,
                     "sensor_limit_low": -26.98970004336,
                     "sensor_limit_low_warn": -26.02059991328,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.40108032",
+                    "entPhysicalIndex": "40108032",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -5068,45 +5043,20 @@
                     "group": "1/3/4",
                     "sensor_divisor": 10,
                     "sensor_multiplier": 1,
-                    "sensor_current": -4.47,
+                    "sensor_current": -4.4708854978349,
                     "sensor_limit": 0.99991233544684,
                     "sensor_limit_warn": -1.0001543745061,
                     "sensor_limit_low": -13.496924768681,
                     "sensor_limit_low_warn": -9.5000714307986,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.39976960",
+                    "entPhysicalIndex": "39976960",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
                     "rrd_type": "GAUGE",
                     "state_name": null
                 },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "dbm",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.4.31.1.16.1.40042496",
-                    "sensor_index": "tx-1.40042496",
-                    "sensor_type": "timos",
-                    "sensor_descr": "1/3/6 TX Power",
-                    "group": null,
-                    "sensor_divisor": 10000,
-                    "sensor_multiplier": 1,
-                    "sensor_current": -30.97,
-                    "sensor_limit": -2,
-                    "sensor_limit_warn": -3,
-                    "sensor_limit_low": -10,
-                    "sensor_limit_low_warn": -9,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1.40042496",
-                    "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": null,
-                    "user_func": "mw_to_dbm",
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "dbm",
@@ -5118,14 +5068,14 @@
                     "group": "1/3/8",
                     "sensor_divisor": 10,
                     "sensor_multiplier": 1,
-                    "sensor_current": -7.19,
+                    "sensor_current": -7.1896663275227,
                     "sensor_limit": 0.99991233544684,
                     "sensor_limit_warn": 0,
                     "sensor_limit_low": -13.001622741328,
                     "sensor_limit_low_warn": -11.999706407559,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.40108032",
+                    "entPhysicalIndex": "40108032",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -5825,8 +5775,8 @@
                     "sensor_limit_low_warn": -40,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "39976960",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -5850,8 +5800,8 @@
                     "sensor_limit_low_warn": -5,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "40009728",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -5875,8 +5825,8 @@
                     "sensor_limit_low_warn": -35,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "40042496",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -5900,8 +5850,8 @@
                     "sensor_limit_low_warn": -45,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "40108032",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -6000,8 +5950,8 @@
                     "sensor_limit_low_warn": 3.1,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "39976960",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -6025,8 +5975,8 @@
                     "sensor_limit_low_warn": 2.9,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "40009728",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -6050,8 +6000,8 @@
                     "sensor_limit_low_warn": 3,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "40042496",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -6075,8 +6025,8 @@
                     "sensor_limit_low_warn": 3,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "40108032",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -6351,7 +6301,7 @@
                     "sensor_limit_low_warn": 0.004,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.39976960",
+                    "entPhysicalIndex": "39976960",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -6376,7 +6326,7 @@
                     "sensor_limit_low_warn": 0.012,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.40108032",
+                    "entPhysicalIndex": "40108032",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -6401,38 +6351,13 @@
                     "sensor_limit_low_warn": -18.996294548824,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.39976960",
+                    "entPhysicalIndex": "39976960",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
                     "rrd_type": "GAUGE",
                     "state_name": null
                 },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "dbm",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.4.31.1.21.1.40042496",
-                    "sensor_index": "rx-1.40042496",
-                    "sensor_type": "timos",
-                    "sensor_descr": "1/3/6 RX Power Int-Cal",
-                    "group": null,
-                    "sensor_divisor": 10000,
-                    "sensor_multiplier": 1,
-                    "sensor_current": -33.01029995664,
-                    "sensor_limit": -2,
-                    "sensor_limit_warn": -3,
-                    "sensor_limit_low": -22.01,
-                    "sensor_limit_low_warn": -21.02,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1.40042496",
-                    "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": -33.01,
-                    "user_func": "mw_to_dbm",
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "dbm",
@@ -6451,9 +6376,9 @@
                     "sensor_limit_low_warn": -26.02059991328,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.40108032",
+                    "entPhysicalIndex": "40108032",
                     "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": -8.54,
+                    "sensor_prev": -8.5387196432176,
                     "user_func": "uw_to_dbm",
                     "rrd_type": "GAUGE",
                     "state_name": null
@@ -6476,38 +6401,13 @@
                     "sensor_limit_low_warn": -9.5000714307986,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.39976960",
+                    "entPhysicalIndex": "39976960",
                     "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": -4.47,
+                    "sensor_prev": -4.4708854978349,
                     "user_func": "uw_to_dbm",
                     "rrd_type": "GAUGE",
                     "state_name": null
                 },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "dbm",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.4.31.1.16.1.40042496",
-                    "sensor_index": "tx-1.40042496",
-                    "sensor_type": "timos",
-                    "sensor_descr": "1/3/6 TX Power",
-                    "group": null,
-                    "sensor_divisor": 10000,
-                    "sensor_multiplier": 1,
-                    "sensor_current": -30.969100130081,
-                    "sensor_limit": -2,
-                    "sensor_limit_warn": -3,
-                    "sensor_limit_low": -10,
-                    "sensor_limit_low_warn": -9,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1.40042496",
-                    "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": -30.97,
-                    "user_func": "mw_to_dbm",
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "dbm",
@@ -6526,9 +6426,9 @@
                     "sensor_limit_low_warn": -11.999706407559,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.40108032",
+                    "entPhysicalIndex": "40108032",
                     "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": -7.19,
+                    "sensor_prev": -7.1896663275227,
                     "user_func": "uw_to_dbm",
                     "rrd_type": "GAUGE",
                     "state_name": null
@@ -7226,8 +7126,8 @@
                     "sensor_limit_low_warn": -40,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "39976960",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -7251,8 +7151,8 @@
                     "sensor_limit_low_warn": -5,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "40009728",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -7276,8 +7176,8 @@
                     "sensor_limit_low_warn": -35,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "40042496",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -7301,8 +7201,8 @@
                     "sensor_limit_low_warn": -45,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "40108032",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -7401,8 +7301,8 @@
                     "sensor_limit_low_warn": 3.1,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "39976960",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -7426,8 +7326,8 @@
                     "sensor_limit_low_warn": 2.9,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "40009728",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -7451,8 +7351,8 @@
                     "sensor_limit_low_warn": 3,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "40042496",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -7476,8 +7376,8 @@
                     "sensor_limit_low_warn": 3,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "40108032",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -7920,8 +7820,8 @@
                     "sdpLastMgmtChange": 3,
                     "sdpLastStatusChange": 7406217,
                     "sdpActiveLspType": "rsvp",
-                    "sdpFarEndInetAddressType": "ipv4",
-                    "sdpFarEndInetAddress": "10.15.0.1"
+                    "sdpFarEndInetAddress": "10.15.0.1",
+                    "sdpFarEndInetAddressType": "ipv4"
                 },
                 {
                     "sdp_oid": 2,
@@ -7935,8 +7835,8 @@
                     "sdpLastMgmtChange": 3,
                     "sdpLastStatusChange": 99,
                     "sdpActiveLspType": "ldp",
-                    "sdpFarEndInetAddressType": "ipv4",
-                    "sdpFarEndInetAddress": "10.18.3.1"
+                    "sdpFarEndInetAddress": "10.18.3.1",
+                    "sdpFarEndInetAddressType": "ipv4"
                 },
                 {
                     "sdp_oid": 10,
@@ -7950,8 +7850,8 @@
                     "sdpLastMgmtChange": 3,
                     "sdpLastStatusChange": 100,
                     "sdpActiveLspType": "ldp",
-                    "sdpFarEndInetAddressType": "ipv4",
-                    "sdpFarEndInetAddress": "10.15.0.1"
+                    "sdpFarEndInetAddress": "10.15.0.1",
+                    "sdpFarEndInetAddressType": "ipv4"
                 }
             ],
             "mpls_sdp_binds": [
@@ -8282,8 +8182,8 @@
                     "sdpLastMgmtChange": 3,
                     "sdpLastStatusChange": 7406217,
                     "sdpActiveLspType": "rsvp",
-                    "sdpFarEndInetAddressType": "ipv4",
-                    "sdpFarEndInetAddress": "10.15.0.1"
+                    "sdpFarEndInetAddress": "10.15.0.1",
+                    "sdpFarEndInetAddressType": "ipv4"
                 },
                 {
                     "sdp_oid": 2,
@@ -8297,8 +8197,8 @@
                     "sdpLastMgmtChange": 3,
                     "sdpLastStatusChange": 99,
                     "sdpActiveLspType": "ldp",
-                    "sdpFarEndInetAddressType": "ipv4",
-                    "sdpFarEndInetAddress": "10.18.3.1"
+                    "sdpFarEndInetAddress": "10.18.3.1",
+                    "sdpFarEndInetAddressType": "ipv4"
                 },
                 {
                     "sdp_oid": 10,
@@ -8312,8 +8212,8 @@
                     "sdpLastMgmtChange": 3,
                     "sdpLastStatusChange": 100,
                     "sdpActiveLspType": "ldp",
-                    "sdpFarEndInetAddressType": "ipv4",
-                    "sdpFarEndInetAddress": "10.15.0.1"
+                    "sdpFarEndInetAddress": "10.15.0.1",
+                    "sdpFarEndInetAddressType": "ipv4"
                 }
             ],
             "mpls_sdp_binds": [
@@ -8592,7 +8492,7 @@
                     "ospfIfMetricValue": 0,
                     "ospfIfMetricStatus": "active",
                     "context_name": "",
-                    "ifIndex": null
+                    "ifIndex": 1
                 },
                 {
                     "ospf_port_id": "10.18.30.14.0",
@@ -8622,7 +8522,7 @@
                     "ospfIfMetricValue": 0,
                     "ospfIfMetricStatus": "active",
                     "context_name": "",
-                    "ifIndex": null
+                    "ifIndex": 2
                 },
                 {
                     "ospf_port_id": "10.18.60.86.0",
@@ -8652,7 +8552,7 @@
                     "ospfIfMetricValue": 100,
                     "ospfIfMetricStatus": "active",
                     "context_name": "",
-                    "ifIndex": null
+                    "ifIndex": 5
                 }
             ],
             "ospf_instances": [
@@ -9172,5 +9072,33 @@
             ]
         },
         "poller": "matches discovery"
+    },
+    "ports-stack": {
+        "discovery": {
+            "ports_stack": [
+                {
+                    "high_ifIndex": 40108032,
+                    "low_ifIndex": 5,
+                    "ifStackStatus": "active"
+                }
+            ]
+        }
+    },
+    "discovery-protocols": {
+        "discovery": {
+            "links": [
+                {
+                    "active": 1,
+                    "protocol": "lldp",
+                    "remote_hostname": "SITEA-7750",
+                    "remote_port": "35913728",
+                    "remote_platform": null,
+                    "remote_version": "TiMOS-C-15.1.R6 cpm/hops64 Nokia 7750 SR Copyright (c) 2000-2018 Nokia.\nAll rights reserved. All use subject to applicable license agreements.\r\nBuilt on Wed Aug 15 13:44:27 PDT 2018 by builder in /builds/151B/R6/panos/main",
+                    "ifAlias": "SAR: to-SITEA-7750 1/1/8",
+                    "ifDescr": "1/3/8, 10/100/Gig Ethernet SFP, \\SAR: to-SITEA-7750 1/1/8",
+                    "ifName": "1/3/8"
+                }
+            ]
+        }
     }
 }

tests/data/timos_hc.json

@@ -8430,8 +8430,8 @@
                     "sdpLastMgmtChange": 4,
                     "sdpLastStatusChange": 0,
                     "sdpActiveLspType": "not-applicable",
-                    "sdpFarEndInetAddressType": "ipv4",
-                    "sdpFarEndInetAddress": "10.1.97.30"
+                    "sdpFarEndInetAddress": "10.1.97.30",
+                    "sdpFarEndInetAddressType": "ipv4"
                 }
             ],
             "mpls_sdp_binds": [
@@ -8503,8 +8503,8 @@
                     "sdpLastMgmtChange": 4,
                     "sdpLastStatusChange": 0,
                     "sdpActiveLspType": "not-applicable",
-                    "sdpFarEndInetAddressType": "ipv4",
-                    "sdpFarEndInetAddress": "10.1.97.30"
+                    "sdpFarEndInetAddress": "10.1.97.30",
+                    "sdpFarEndInetAddressType": "ipv4"
                 }
             ],
             "mpls_sdp_binds": [
@@ -8797,5 +8797,46 @@
             ]
         },
         "poller": "matches discovery"
+    },
+    "ports-stack": {
+        "discovery": {
+            "ports_stack": [
+                {
+                    "high_ifIndex": 35684352,
+                    "low_ifIndex": 2,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 37781504,
+                    "low_ifIndex": 3,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 46170112,
+                    "low_ifIndex": 1509949473,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 46235648,
+                    "low_ifIndex": 131073,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 46235648,
+                    "low_ifIndex": 131074,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 46333952,
+                    "low_ifIndex": 1509949478,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1509949473,
+                    "low_ifIndex": 131075,
+                    "ifStackStatus": "active"
+                }
+            ]
+        }
     }
 }

tests/data/timos_ixr-s.json

@@ -12442,7 +12442,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.1",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -12467,7 +12467,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.2",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -12492,7 +12492,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.3",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -12517,7 +12517,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.4",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -12542,7 +12542,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.1",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -12567,7 +12567,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.2",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -12592,7 +12592,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.3",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -12617,7 +12617,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.4",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -12642,7 +12642,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.1",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -12667,7 +12667,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.2",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -12692,7 +12692,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.3",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -12717,7 +12717,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.4",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -12742,7 +12742,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.1",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -12767,7 +12767,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.2",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -12792,7 +12792,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.3",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -12817,7 +12817,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.4",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -12842,7 +12842,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902720.1",
+                    "entPhysicalIndex": "1610902720",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -12867,7 +12867,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902720.2",
+                    "entPhysicalIndex": "1610902720",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -12892,7 +12892,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902720.3",
+                    "entPhysicalIndex": "1610902720",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -12917,7 +12917,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902720.4",
+                    "entPhysicalIndex": "1610902720",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -12942,7 +12942,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.1",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -12967,7 +12967,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.2",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -12992,7 +12992,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.3",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -13017,7 +13017,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.4",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -13042,7 +13042,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.1",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -13067,7 +13067,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.2",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -13092,7 +13092,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.3",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -13117,7 +13117,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.4",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -13142,7 +13142,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902720.1",
+                    "entPhysicalIndex": "1610902720",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -13167,7 +13167,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902720.2",
+                    "entPhysicalIndex": "1610902720",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -13192,7 +13192,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902720.3",
+                    "entPhysicalIndex": "1610902720",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -13217,113 +13217,13 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902720.4",
+                    "entPhysicalIndex": "1610902720",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
                     "rrd_type": "GAUGE",
                     "state_name": null
                 },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "dbm",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.4.31.1.21.1.1610891608",
-                    "sensor_index": "rx-1.1610891608",
-                    "sensor_type": "timos",
-                    "sensor_descr": "1/1/43 RX Power Int-Cal",
-                    "group": null,
-                    "sensor_divisor": 10000,
-                    "sensor_multiplier": 1,
-                    "sensor_current": -40,
-                    "sensor_limit": 1.5,
-                    "sensor_limit_warn": 0.5,
-                    "sensor_limit_low": -16,
-                    "sensor_limit_low_warn": -15,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610891608",
-                    "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": null,
-                    "user_func": "mw_to_dbm",
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "dbm",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.4.31.1.21.1.1610891616",
-                    "sensor_index": "rx-1.1610891616",
-                    "sensor_type": "timos",
-                    "sensor_descr": "1/1/44 RX Power Int-Cal",
-                    "group": null,
-                    "sensor_divisor": 10000,
-                    "sensor_multiplier": 1,
-                    "sensor_current": -40,
-                    "sensor_limit": 1.5,
-                    "sensor_limit_warn": 0.5,
-                    "sensor_limit_low": -16,
-                    "sensor_limit_low_warn": -15,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610891616",
-                    "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": null,
-                    "user_func": "mw_to_dbm",
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "dbm",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.4.31.1.16.1.1610891608",
-                    "sensor_index": "tx-1.1610891608",
-                    "sensor_type": "timos",
-                    "sensor_descr": "1/1/43 TX Power",
-                    "group": null,
-                    "sensor_divisor": 10000,
-                    "sensor_multiplier": 1,
-                    "sensor_current": -40,
-                    "sensor_limit": 1.5,
-                    "sensor_limit_warn": 0.5,
-                    "sensor_limit_low": -9,
-                    "sensor_limit_low_warn": -8,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610891608",
-                    "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": null,
-                    "user_func": "mw_to_dbm",
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "dbm",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.4.31.1.16.1.1610891616",
-                    "sensor_index": "tx-1.1610891616",
-                    "sensor_type": "timos",
-                    "sensor_descr": "1/1/44 TX Power",
-                    "group": null,
-                    "sensor_divisor": 10000,
-                    "sensor_multiplier": 1,
-                    "sensor_current": -40,
-                    "sensor_limit": 1.5,
-                    "sensor_limit_warn": 0.5,
-                    "sensor_limit_low": -9,
-                    "sensor_limit_low_warn": -8,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610891616",
-                    "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": null,
-                    "user_func": "mw_to_dbm",
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "percent",
@@ -14092,8 +13992,8 @@
                     "sensor_limit_low_warn": -5,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610891608",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -14117,8 +14017,8 @@
                     "sensor_limit_low_warn": -5,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610891616",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -14142,8 +14042,8 @@
                     "sensor_limit_low_warn": 0,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610902592",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -14167,8 +14067,8 @@
                     "sensor_limit_low_warn": 0,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610902656",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -14192,8 +14092,8 @@
                     "sensor_limit_low_warn": 0,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610902720",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -14292,8 +14192,8 @@
                     "sensor_limit_low_warn": 3.1,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610891608",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -14317,8 +14217,8 @@
                     "sensor_limit_low_warn": 3.1,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610891616",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -14342,8 +14242,8 @@
                     "sensor_limit_low_warn": 3.1,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610902592",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -14367,8 +14267,8 @@
                     "sensor_limit_low_warn": 3.1,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610902656",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -14392,8 +14292,8 @@
                     "sensor_limit_low_warn": 3.1,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610902720",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -14717,7 +14617,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.1",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -14742,7 +14642,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.2",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -14767,7 +14667,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.3",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -14792,7 +14692,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.4",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -14817,7 +14717,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.1",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -14842,7 +14742,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.2",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -14867,7 +14767,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.3",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -14892,7 +14792,7 @@
                     "sensor_limit_low_warn": null,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.4",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
@@ -14917,7 +14817,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.1",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": 2.001114596238,
                     "user_func": "uw_to_dbm",
@@ -14942,7 +14842,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.2",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": 2.5491044215453,
                     "user_func": "uw_to_dbm",
@@ -14967,7 +14867,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.3",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": 2.4713822610089,
                     "user_func": "uw_to_dbm",
@@ -14992,7 +14892,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.4",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": 2.3613401681543,
                     "user_func": "uw_to_dbm",
@@ -15017,7 +14917,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.1",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": 1.370057764291,
                     "user_func": "uw_to_dbm",
@@ -15042,7 +14942,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.2",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": 1.9926138017708,
                     "user_func": "uw_to_dbm",
@@ -15067,7 +14967,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.3",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": 2.3195356919898,
                     "user_func": "uw_to_dbm",
@@ -15092,7 +14992,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.4",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": 1.7160945621667,
                     "user_func": "uw_to_dbm",
@@ -15117,7 +15017,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902720.1",
+                    "entPhysicalIndex": "1610902720",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -15142,7 +15042,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902720.2",
+                    "entPhysicalIndex": "1610902720",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -15167,7 +15067,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902720.3",
+                    "entPhysicalIndex": "1610902720",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -15192,7 +15092,7 @@
                     "sensor_limit_low_warn": -10.599818449923,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902720.4",
+                    "entPhysicalIndex": "1610902720",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -15217,7 +15117,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.1",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": 1.9462532948386,
                     "user_func": "uw_to_dbm",
@@ -15242,7 +15142,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.2",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": 1.8001111905772,
                     "user_func": "uw_to_dbm",
@@ -15267,7 +15167,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.3",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": 1.6414458247018,
                     "user_func": "uw_to_dbm",
@@ -15292,7 +15192,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902592.4",
+                    "entPhysicalIndex": "1610902592",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": 1.659265496091,
                     "user_func": "uw_to_dbm",
@@ -15317,7 +15217,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.1",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": 1.9041574703329,
                     "user_func": "uw_to_dbm",
@@ -15342,7 +15242,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.2",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": 2.0248831706009,
                     "user_func": "uw_to_dbm",
@@ -15367,7 +15267,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.3",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": 1.4129296008159,
                     "user_func": "uw_to_dbm",
@@ -15392,7 +15292,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902656.4",
+                    "entPhysicalIndex": "1610902656",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": 2.412724699017,
                     "user_func": "uw_to_dbm",
@@ -15417,7 +15317,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902720.1",
+                    "entPhysicalIndex": "1610902720",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -15442,7 +15342,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902720.2",
+                    "entPhysicalIndex": "1610902720",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -15467,7 +15367,7 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902720.3",
+                    "entPhysicalIndex": "1610902720",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
@@ -15492,113 +15392,13 @@
                     "sensor_limit_low_warn": -4.000078224159,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610902720.4",
+                    "entPhysicalIndex": "1610902720",
                     "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": "uw_to_dbm",
                     "rrd_type": "GAUGE",
                     "state_name": null
                 },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "dbm",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.4.31.1.21.1.1610891608",
-                    "sensor_index": "rx-1.1610891608",
-                    "sensor_type": "timos",
-                    "sensor_descr": "1/1/43 RX Power Int-Cal",
-                    "group": null,
-                    "sensor_divisor": 10000,
-                    "sensor_multiplier": 1,
-                    "sensor_current": -40,
-                    "sensor_limit": 1.5,
-                    "sensor_limit_warn": 0.5,
-                    "sensor_limit_low": -16,
-                    "sensor_limit_low_warn": -15,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610891608",
-                    "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": null,
-                    "user_func": "mw_to_dbm",
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "dbm",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.4.31.1.21.1.1610891616",
-                    "sensor_index": "rx-1.1610891616",
-                    "sensor_type": "timos",
-                    "sensor_descr": "1/1/44 RX Power Int-Cal",
-                    "group": null,
-                    "sensor_divisor": 10000,
-                    "sensor_multiplier": 1,
-                    "sensor_current": -40,
-                    "sensor_limit": 1.5,
-                    "sensor_limit_warn": 0.5,
-                    "sensor_limit_low": -16,
-                    "sensor_limit_low_warn": -15,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610891616",
-                    "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": null,
-                    "user_func": "mw_to_dbm",
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "dbm",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.4.31.1.16.1.1610891608",
-                    "sensor_index": "tx-1.1610891608",
-                    "sensor_type": "timos",
-                    "sensor_descr": "1/1/43 TX Power",
-                    "group": null,
-                    "sensor_divisor": 10000,
-                    "sensor_multiplier": 1,
-                    "sensor_current": -40,
-                    "sensor_limit": 1.5,
-                    "sensor_limit_warn": 0.5,
-                    "sensor_limit_low": -9,
-                    "sensor_limit_low_warn": -8,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610891608",
-                    "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": null,
-                    "user_func": "mw_to_dbm",
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
-                {
-                    "sensor_deleted": 0,
-                    "sensor_class": "dbm",
-                    "poller_type": "snmp",
-                    "sensor_oid": ".1.3.6.1.4.1.6527.3.1.2.2.4.31.1.16.1.1610891616",
-                    "sensor_index": "tx-1.1610891616",
-                    "sensor_type": "timos",
-                    "sensor_descr": "1/1/44 TX Power",
-                    "group": null,
-                    "sensor_divisor": 10000,
-                    "sensor_multiplier": 1,
-                    "sensor_current": -40,
-                    "sensor_limit": 1.5,
-                    "sensor_limit_warn": 0.5,
-                    "sensor_limit_low": -9,
-                    "sensor_limit_low_warn": -8,
-                    "sensor_alert": 1,
-                    "sensor_custom": "No",
-                    "entPhysicalIndex": "1.1610891616",
-                    "entPhysicalIndex_measured": "ports",
-                    "sensor_prev": null,
-                    "user_func": "mw_to_dbm",
-                    "rrd_type": "GAUGE",
-                    "state_name": null
-                },
                 {
                     "sensor_deleted": 0,
                     "sensor_class": "percent",
@@ -16367,8 +16167,8 @@
                     "sensor_limit_low_warn": -5,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610891608",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -16392,8 +16192,8 @@
                     "sensor_limit_low_warn": -5,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610891616",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -16417,8 +16217,8 @@
                     "sensor_limit_low_warn": 0,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610902592",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -16442,8 +16242,8 @@
                     "sensor_limit_low_warn": 0,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610902656",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -16467,8 +16267,8 @@
                     "sensor_limit_low_warn": 0,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610902720",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -16567,8 +16367,8 @@
                     "sensor_limit_low_warn": 3.1,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610891608",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -16592,8 +16392,8 @@
                     "sensor_limit_low_warn": 3.1,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610891616",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -16617,8 +16417,8 @@
                     "sensor_limit_low_warn": 3.1,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610902592",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -16642,8 +16442,8 @@
                     "sensor_limit_low_warn": 3.1,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610902656",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -16667,8 +16467,8 @@
                     "sensor_limit_low_warn": 3.1,
                     "sensor_alert": 1,
                     "sensor_custom": "No",
-                    "entPhysicalIndex": null,
-                    "entPhysicalIndex_measured": null,
+                    "entPhysicalIndex": "1610902720",
+                    "entPhysicalIndex_measured": "ports",
                     "sensor_prev": null,
                     "user_func": null,
                     "rrd_type": "GAUGE",
@@ -17590,5 +17390,49 @@
             ]
         },
         "poller": "matches discovery"
+    },
+    "ports-stack": {
+        "discovery": {
+            "ports_stack": [
+                {
+                    "high_ifIndex": 1610902593,
+                    "low_ifIndex": 3,
+                    "ifStackStatus": "active"
+                },
+                {
+                    "high_ifIndex": 1610902657,
+                    "low_ifIndex": 4,
+                    "ifStackStatus": "active"
+                }
+            ]
+        }
+    },
+    "discovery-protocols": {
+        "discovery": {
+            "links": [
+                {
+                    "active": 1,
+                    "protocol": "lldp",
+                    "remote_hostname": "router-b",
+                    "remote_port": "1610902593",
+                    "remote_platform": null,
+                    "remote_version": "TiMOS-C-21.10.R5 cpm/x86hops64 Nokia 7250 IXR Copyright (c) 2000-2022 Nokia.\nAll rights reserved. All use subject to applicable license agreements.\r\nBuilt on Wed Jun 8 13:16:52 PDT 2022 by builder in /builds/c/2110B/R5/panos/main/sros",
+                    "ifAlias": "Core: router-b port 1/1/c49/1",
+                    "ifDescr": "1/1/c50/1, 100-Gig Ethernet, Core: router-b port 1/1/c49/1",
+                    "ifName": "1/1/c50/1"
+                },
+                {
+                    "active": 1,
+                    "protocol": "lldp",
+                    "remote_hostname": "router-c",
+                    "remote_port": "1/5/c7/1",
+                    "remote_platform": null,
+                    "remote_version": "TiMOS-B-21.7.R1 both/hops64 Nokia 7250 IXR Copyright (c) 2000-2021 Nokia.\nAll rights reserved. All use subject to applicable license agreements.\r\nBuilt on Thu Jul 29 14:54:01 PDT 2021 by builder in /builds/c/217B/R1/panos/main/sros",
+                    "ifAlias": "Core: router-c port 1/5/c7/1",
+                    "ifDescr": "1/1/c49/1, 100-Gig Ethernet, Core: router-c port 1/5/c7/1",
+                    "ifName": "1/1/c49/1"
+                }
+            ]
+        }
     }
 }

tests/data/vrp_5720-vrf.json

@@ -34080,10 +34080,10 @@
                     "bgpPeerRemoteAs": 65000,
                     "bgpPeerState": "established",
                     "bgpPeerAdminStatus": "start",
-                    "bgpPeerLastErrorCode": null,
+                    "bgpPeerLastErrorCode": 0,
                     "bgpPeerLastErrorSubCode": null,
                     "bgpPeerLastErrorText": null,
-                    "bgpPeerIface": null,
+                    "bgpPeerIface": 64,
                     "bgpLocalAddr": "1.1.1.1",
                     "bgpPeerRemoteAddr": "0.0.0.0",
                     "bgpPeerDescr": "",
@@ -34103,10 +34103,10 @@
                     "bgpPeerRemoteAs": 65000,
                     "bgpPeerState": "established",
                     "bgpPeerAdminStatus": "start",
-                    "bgpPeerLastErrorCode": null,
+                    "bgpPeerLastErrorCode": 0,
                     "bgpPeerLastErrorSubCode": null,
                     "bgpPeerLastErrorText": null,
-                    "bgpPeerIface": null,
+                    "bgpPeerIface": 64,
                     "bgpLocalAddr": "1.1.1.1",
                     "bgpPeerRemoteAddr": "0.0.0.0",
                     "bgpPeerDescr": "",

tests/data/vrp_5720.json

@@ -13947,7 +13947,7 @@
                     "bgpPeerLastErrorCode": 0,
                     "bgpPeerLastErrorSubCode": null,
                     "bgpPeerLastErrorText": null,
-                    "bgpPeerIface": null,
+                    "bgpPeerIface": 66,
                     "bgpLocalAddr": "3.3.3.3",
                     "bgpPeerRemoteAddr": "0.0.0.0",
                     "bgpPeerDescr": "",
@@ -13970,7 +13970,7 @@
                     "bgpPeerLastErrorCode": 0,
                     "bgpPeerLastErrorSubCode": null,
                     "bgpPeerLastErrorText": null,
-                    "bgpPeerIface": null,
+                    "bgpPeerIface": 66,
                     "bgpLocalAddr": "3.3.3.3",
                     "bgpPeerRemoteAddr": "0.0.0.0",
                     "bgpPeerDescr": "",

tests/snmpsim/ise_3595.snmprec

@@ -1056,7 +1056,7 @@
 1.3.6.1.2.1.47.1.1.1.1.8.1|4|A0
 1.3.6.1.2.1.47.1.1.1.1.9.1|4|
 1.3.6.1.2.1.47.1.1.1.1.10.1|4|Cisco ADE-OS 3.1
-1.3.6.1.2.1.47.1.1.1.1.11.1|4|FCH2204V176
+1.3.6.1.2.1.47.1.1.1.1.11.1|4|AAA9999Z999
 1.3.6.1.2.1.47.1.1.1.1.12.1|4|Cisco Systems Inc.
 1.3.6.1.2.1.47.1.1.1.1.13.1|4|SNS-3595-K9
 1.3.6.1.2.1.47.1.1.1.1.14.1|4|

tests/snmpsim/ocnos_s9600-32x.snmprec

@@ -1136,15 +1136,15 @@
 1.3.6.1.2.1.11.29.0|65|0
 1.3.6.1.2.1.11.31.0|65|0
 1.3.6.1.2.1.11.32.0|65|0
-1.3.6.1.2.1.15.2.0|2|399693
+1.3.6.1.2.1.15.2.0|2|65534
 1.3.6.1.2.1.15.3.1.2.100.127.0.200|2|6
 1.3.6.1.2.1.15.3.1.2.100.127.0.201|2|1
 1.3.6.1.2.1.15.3.1.3.100.127.0.200|2|2
 1.3.6.1.2.1.15.3.1.3.100.127.0.201|2|2
 1.3.6.1.2.1.15.3.1.5.100.127.0.200|64|100.127.0.1
 1.3.6.1.2.1.15.3.1.5.100.127.0.201|64|0.0.0.0
-1.3.6.1.2.1.15.3.1.9.100.127.0.200|2|399693
-1.3.6.1.2.1.15.3.1.9.100.127.0.201|2|399693
+1.3.6.1.2.1.15.3.1.9.100.127.0.200|2|65534
+1.3.6.1.2.1.15.3.1.9.100.127.0.201|2|65534
 1.3.6.1.2.1.15.3.1.10.100.127.0.200|65|1961
 1.3.6.1.2.1.15.3.1.10.100.127.0.201|65|1632
 1.3.6.1.2.1.15.3.1.11.100.127.0.200|65|614
@@ -3377,4 +3377,4 @@
 1.3.6.1.4.1.36673.100.1.5.1.1.11.1.75|2|-100002
 1.3.6.1.4.1.36673.100.1.5.1.1.11.1.76|2|-100002
 1.3.6.1.4.1.36673.100.1.5.1.1.11.1.77|2|-100002
-1.3.6.1.6.3.10.2.1.3.0|2|3086323
+1.3.6.1.6.3.10.2.1.3.0|2|3086323

tests/snmpsim/raritan-pdu.snmprec

@@ -168,133 +168,4 @@
 1.3.6.1.4.1.13742.4.3.3.1.40.3|2|4
 1.3.6.1.4.1.13742.4.3.3.1.41.2|2|39
 1.3.6.1.4.1.13742.4.3.3.1.41.3|2|205
-1.3.6.1.4.1.13742.6.3.3.3.1.2.1.1|4|I1
-1.3.6.1.4.1.13742.6.3.3.4.1.7.1.1.1|66|3
-1.3.6.1.4.1.13742.6.3.3.4.1.7.1.1.4|66|0
-1.3.6.1.4.1.13742.6.3.3.4.1.7.1.1.5|66|0
-1.3.6.1.4.1.13742.6.3.3.4.1.7.1.1.23|66|1
-1.3.6.1.4.1.13742.6.3.5.3.1.2.1.1|4|1
-1.3.6.1.4.1.13742.6.3.5.3.1.2.1.2|4|2
-1.3.6.1.4.1.13742.6.3.5.3.1.2.1.3|4|3
-1.3.6.1.4.1.13742.6.3.5.3.1.2.1.4|4|4
-1.3.6.1.4.1.13742.6.3.5.3.1.2.1.5|4|5
-1.3.6.1.4.1.13742.6.3.5.3.1.2.1.6|4|6
-1.3.6.1.4.1.13742.6.3.5.3.1.2.1.7|4|7
-1.3.6.1.4.1.13742.6.3.5.3.1.2.1.8|4|8
-1.3.6.1.4.1.13742.6.3.5.3.1.2.1.9|4|9
-1.3.6.1.4.1.13742.6.3.5.3.1.2.1.10|4|10
-1.3.6.1.4.1.13742.6.3.5.3.1.2.1.11|4|11
-1.3.6.1.4.1.13742.6.3.5.3.1.2.1.12|4|12
-1.3.6.1.4.1.13742.6.3.5.3.1.3.1.1|4|
-1.3.6.1.4.1.13742.6.3.5.3.1.3.1.2|4|OUTLET2
-1.3.6.1.4.1.13742.6.3.5.3.1.3.1.3|4|OUTLET3
-1.3.6.1.4.1.13742.6.3.5.3.1.3.1.4|4|OUTLET4
-1.3.6.1.4.1.13742.6.3.5.3.1.3.1.5|4|OUTLET5
-1.3.6.1.4.1.13742.6.3.5.3.1.3.1.6|4|OUTLET6
-1.3.6.1.4.1.13742.6.3.5.3.1.3.1.7|4|OUTLET7
-1.3.6.1.4.1.13742.6.3.5.3.1.3.1.8|4|OUTLET8
-1.3.6.1.4.1.13742.6.3.5.3.1.3.1.9|4|OUTLET9
-1.3.6.1.4.1.13742.6.3.5.3.1.3.1.10|4|OUTLET10
-1.3.6.1.4.1.13742.6.3.5.3.1.3.1.11|4|OUTLET11
-1.3.6.1.4.1.13742.6.3.5.3.1.3.1.12|4|OUTLET12
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.1.1|66|3
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.1.5|66|0
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.2.1|66|3
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.2.5|66|0
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.3.1|66|3
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.3.5|66|0
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.4.1|66|3
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.4.5|66|0
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.5.1|66|3
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.5.5|66|0
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.6.1|66|3
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.6.5|66|0
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.7.1|66|3
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.7.5|66|0
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.8.1|66|3
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.8.5|66|0
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.9.1|66|3
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.9.5|66|0
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.10.1|66|3
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.10.5|66|0
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.11.1|66|3
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.11.5|66|0
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.12.1|66|3
-1.3.6.1.4.1.13742.6.3.5.4.1.7.1.12.5|66|0
-1.3.6.1.4.1.13742.6.3.5.4.1.28.1.1.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.28.1.2.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.28.1.3.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.28.1.4.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.28.1.5.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.28.1.6.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.28.1.7.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.28.1.8.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.28.1.9.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.28.1.10.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.28.1.11.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.28.1.12.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.29.1.1.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.29.1.2.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.29.1.3.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.29.1.4.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.29.1.5.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.29.1.6.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.29.1.7.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.29.1.8.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.29.1.9.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.29.1.10.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.29.1.11.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.29.1.12.1|2|0
-1.3.6.1.4.1.13742.6.3.5.4.1.30.1.1.1|2|8000
-1.3.6.1.4.1.13742.6.3.5.4.1.30.1.2.1|2|8000
-1.3.6.1.4.1.13742.6.3.5.4.1.30.1.3.1|2|8000
-1.3.6.1.4.1.13742.6.3.5.4.1.30.1.4.1|2|8000
-1.3.6.1.4.1.13742.6.3.5.4.1.30.1.5.1|2|8000
-1.3.6.1.4.1.13742.6.3.5.4.1.30.1.6.1|2|8000
-1.3.6.1.4.1.13742.6.3.5.4.1.30.1.7.1|2|8000
-1.3.6.1.4.1.13742.6.3.5.4.1.30.1.8.1|2|8000
-1.3.6.1.4.1.13742.6.3.5.4.1.30.1.9.1|2|8000
-1.3.6.1.4.1.13742.6.3.5.4.1.30.1.10.1|2|8000
-1.3.6.1.4.1.13742.6.3.5.4.1.30.1.11.1|2|8000
-1.3.6.1.4.1.13742.6.3.5.4.1.30.1.12.1|2|8000
-1.3.6.1.4.1.13742.6.3.5.4.1.31.1.1.1|2|6500
-1.3.6.1.4.1.13742.6.3.5.4.1.31.1.2.1|2|6500
-1.3.6.1.4.1.13742.6.3.5.4.1.31.1.3.1|2|6500
-1.3.6.1.4.1.13742.6.3.5.4.1.31.1.4.1|2|6500
-1.3.6.1.4.1.13742.6.3.5.4.1.31.1.5.1|2|6500
-1.3.6.1.4.1.13742.6.3.5.4.1.31.1.6.1|2|6500
-1.3.6.1.4.1.13742.6.3.5.4.1.31.1.7.1|2|6500
-1.3.6.1.4.1.13742.6.3.5.4.1.31.1.8.1|2|6500
-1.3.6.1.4.1.13742.6.3.5.4.1.31.1.9.1|2|6500
-1.3.6.1.4.1.13742.6.3.5.4.1.31.1.10.1|2|6500
-1.3.6.1.4.1.13742.6.3.5.4.1.31.1.11.1|2|6500
-1.3.6.1.4.1.13742.6.3.5.4.1.31.1.12.1|2|6500
-1.3.6.1.4.1.13742.6.5.2.3.1.4.1.1.1|66|680
-1.3.6.1.4.1.13742.6.5.2.3.1.4.1.1.4|66|233
-1.3.6.1.4.1.13742.6.5.2.3.1.4.1.1.5|66|138
-1.3.6.1.4.1.13742.6.5.2.3.1.4.1.1.23|66|500
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.1.1|66|0
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.1.5|66|0
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.2.1|66|0
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.2.5|66|0
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.3.1|66|311
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.3.5|66|68
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.4.1|66|0
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.4.5|66|0
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.5.1|66|0
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.5.5|66|0
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.6.1|66|0
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.6.5|66|0
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.7.1|66|0
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.7.5|66|0
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.8.1|66|0
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.8.5|66|0
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.9.1|66|0
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.9.5|66|0
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.10.1|66|184
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.10.5|66|35
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.11.1|66|185
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.11.5|66|35
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.12.1|66|0
-1.3.6.1.4.1.13742.6.5.4.3.1.4.1.12.5|66|0
 1.3.6.1.6.3.10.2.1.3.0|2|64572474

tests/snmpsim/raritan-pdu_px2.snmprec

@@ -1,2 +1,136 @@
 1.3.6.1.2.1.1.1.0|4|PX2 030004
 1.3.6.1.2.1.1.2.0|6|1.3.6.1.4.1.13742.6
+1.3.6.1.2.1.1.3.0|67|2162280547
+1.3.6.1.2.1.1.4.0|4|<private>
+1.3.6.1.2.1.1.5.0|4|<private>
+1.3.6.1.2.1.1.6.0|4|<private>
+1.3.6.1.4.1.13742.6.3.3.3.1.2.1.1|4|I1
+1.3.6.1.4.1.13742.6.3.3.4.1.7.1.1.1|66|3
+1.3.6.1.4.1.13742.6.3.3.4.1.7.1.1.4|66|0
+1.3.6.1.4.1.13742.6.3.3.4.1.7.1.1.5|66|0
+1.3.6.1.4.1.13742.6.3.3.4.1.7.1.1.23|66|1
+1.3.6.1.4.1.13742.6.3.5.3.1.2.1.1|4|1
+1.3.6.1.4.1.13742.6.3.5.3.1.2.1.2|4|2
+1.3.6.1.4.1.13742.6.3.5.3.1.2.1.3|4|3
+1.3.6.1.4.1.13742.6.3.5.3.1.2.1.4|4|4
+1.3.6.1.4.1.13742.6.3.5.3.1.2.1.5|4|5
+1.3.6.1.4.1.13742.6.3.5.3.1.2.1.6|4|6
+1.3.6.1.4.1.13742.6.3.5.3.1.2.1.7|4|7
+1.3.6.1.4.1.13742.6.3.5.3.1.2.1.8|4|8
+1.3.6.1.4.1.13742.6.3.5.3.1.2.1.9|4|9
+1.3.6.1.4.1.13742.6.3.5.3.1.2.1.10|4|10
+1.3.6.1.4.1.13742.6.3.5.3.1.2.1.11|4|11
+1.3.6.1.4.1.13742.6.3.5.3.1.2.1.12|4|12
+1.3.6.1.4.1.13742.6.3.5.3.1.3.1.1|4|
+1.3.6.1.4.1.13742.6.3.5.3.1.3.1.2|4|OUTLET2
+1.3.6.1.4.1.13742.6.3.5.3.1.3.1.3|4|OUTLET3
+1.3.6.1.4.1.13742.6.3.5.3.1.3.1.4|4|OUTLET4
+1.3.6.1.4.1.13742.6.3.5.3.1.3.1.5|4|OUTLET5
+1.3.6.1.4.1.13742.6.3.5.3.1.3.1.6|4|OUTLET6
+1.3.6.1.4.1.13742.6.3.5.3.1.3.1.7|4|OUTLET7
+1.3.6.1.4.1.13742.6.3.5.3.1.3.1.8|4|OUTLET8
+1.3.6.1.4.1.13742.6.3.5.3.1.3.1.9|4|OUTLET9
+1.3.6.1.4.1.13742.6.3.5.3.1.3.1.10|4|OUTLET10
+1.3.6.1.4.1.13742.6.3.5.3.1.3.1.11|4|OUTLET11
+1.3.6.1.4.1.13742.6.3.5.3.1.3.1.12|4|OUTLET12
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.1.1|66|3
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.1.5|66|0
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.2.1|66|3
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.2.5|66|0
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.3.1|66|3
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.3.5|66|0
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.4.1|66|3
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.4.5|66|0
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.5.1|66|3
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.5.5|66|0
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.6.1|66|3
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.6.5|66|0
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.7.1|66|3
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.7.5|66|0
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.8.1|66|3
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.8.5|66|0
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.9.1|66|3
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.9.5|66|0
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.10.1|66|3
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.10.5|66|0
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.11.1|66|3
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.11.5|66|0
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.12.1|66|3
+1.3.6.1.4.1.13742.6.3.5.4.1.7.1.12.5|66|0
+1.3.6.1.4.1.13742.6.3.5.4.1.28.1.1.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.28.1.2.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.28.1.3.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.28.1.4.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.28.1.5.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.28.1.6.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.28.1.7.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.28.1.8.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.28.1.9.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.28.1.10.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.28.1.11.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.28.1.12.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.29.1.1.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.29.1.2.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.29.1.3.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.29.1.4.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.29.1.5.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.29.1.6.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.29.1.7.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.29.1.8.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.29.1.9.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.29.1.10.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.29.1.11.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.29.1.12.1|2|0
+1.3.6.1.4.1.13742.6.3.5.4.1.30.1.1.1|2|8000
+1.3.6.1.4.1.13742.6.3.5.4.1.30.1.2.1|2|8000
+1.3.6.1.4.1.13742.6.3.5.4.1.30.1.3.1|2|8000
+1.3.6.1.4.1.13742.6.3.5.4.1.30.1.4.1|2|8000
+1.3.6.1.4.1.13742.6.3.5.4.1.30.1.5.1|2|8000
+1.3.6.1.4.1.13742.6.3.5.4.1.30.1.6.1|2|8000
+1.3.6.1.4.1.13742.6.3.5.4.1.30.1.7.1|2|8000
+1.3.6.1.4.1.13742.6.3.5.4.1.30.1.8.1|2|8000
+1.3.6.1.4.1.13742.6.3.5.4.1.30.1.9.1|2|8000
+1.3.6.1.4.1.13742.6.3.5.4.1.30.1.10.1|2|8000
+1.3.6.1.4.1.13742.6.3.5.4.1.30.1.11.1|2|8000
+1.3.6.1.4.1.13742.6.3.5.4.1.30.1.12.1|2|8000
+1.3.6.1.4.1.13742.6.3.5.4.1.31.1.1.1|2|6500
+1.3.6.1.4.1.13742.6.3.5.4.1.31.1.2.1|2|6500
+1.3.6.1.4.1.13742.6.3.5.4.1.31.1.3.1|2|6500
+1.3.6.1.4.1.13742.6.3.5.4.1.31.1.4.1|2|6500
+1.3.6.1.4.1.13742.6.3.5.4.1.31.1.5.1|2|6500
+1.3.6.1.4.1.13742.6.3.5.4.1.31.1.6.1|2|6500
+1.3.6.1.4.1.13742.6.3.5.4.1.31.1.7.1|2|6500
+1.3.6.1.4.1.13742.6.3.5.4.1.31.1.8.1|2|6500
+1.3.6.1.4.1.13742.6.3.5.4.1.31.1.9.1|2|6500
+1.3.6.1.4.1.13742.6.3.5.4.1.31.1.10.1|2|6500
+1.3.6.1.4.1.13742.6.3.5.4.1.31.1.11.1|2|6500
+1.3.6.1.4.1.13742.6.3.5.4.1.31.1.12.1|2|6500
+1.3.6.1.4.1.13742.6.5.2.3.1.4.1.1.1|66|680
+1.3.6.1.4.1.13742.6.5.2.3.1.4.1.1.4|66|233
+1.3.6.1.4.1.13742.6.5.2.3.1.4.1.1.5|66|138
+1.3.6.1.4.1.13742.6.5.2.3.1.4.1.1.23|66|500
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.1.1|66|0
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.1.5|66|0
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.2.1|66|0
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.2.5|66|0
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.3.1|66|311
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.3.5|66|68
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.4.1|66|0
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.4.5|66|0
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.5.1|66|0
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.5.5|66|0
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.6.1|66|0
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.6.5|66|0
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.7.1|66|0
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.7.5|66|0
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.8.1|66|0
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.8.5|66|0
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.9.1|66|0
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.9.5|66|0
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.10.1|66|184
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.10.5|66|35
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.11.1|66|185
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.11.5|66|35
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.12.1|66|0
+1.3.6.1.4.1.13742.6.5.4.3.1.4.1.12.5|66|0
+1.3.6.1.6.3.10.2.1.3.0|2|64572474