diff --git a/includes/definitions/discovery/vrp.yaml b/includes/definitions/discovery/vrp.yaml index 73f8f3061a..aaa88a856e 100644 --- a/includes/definitions/discovery/vrp.yaml +++ b/includes/definitions/discovery/vrp.yaml @@ -48,6 +48,7 @@ modules: entPhysicalIndex_measured: ports index: 'rx-{{ $index }}' user_func: 'uw_to_dbm' + group: '{{ $entPhysicalName }}' skip_values: - oid: hwEntityOpticalRxPower @@ -61,7 +62,8 @@ modules: entPhysicalIndex: '{{ $index }}' entPhysicalIndex_measured: ports index: 'tx-{{ $index }}' - user_func: 'uw_to_dbm' + user_func: 'uw_to_dbm' + group: '{{ $entPhysicalName }}' skip_values: - oid: hwEntityOpticalTxPower @@ -76,6 +78,7 @@ modules: entPhysicalIndex_measured: ports index: 'lane-rx-{{ $index }}' divisor: 100 + group: '{{ $entPhysicalName }}' skip_values: - oid: hwEntityOpticalRxPower @@ -89,6 +92,7 @@ modules: entPhysicalIndex: '{{ $index }}' entPhysicalIndex_measured: ports index: 'lane-tx-{{ $index }}' + group: '{{ $entPhysicalName }}' skip_values: - oid: hwEntityOpticalTxPower diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php index 14cb4c2055..3c85fb613d 100644 --- a/includes/discovery/functions.inc.php +++ b/includes/discovery/functions.inc.php @@ -266,6 +266,7 @@ function discover_sensor(&$valid, $class, $device, $oid, $index, $type, $descr, 'entPhysicalIndex' => $entPhysicalIndex, 'entPhysicalIndex_measured' => $entPhysicalIndex_measured, 'user_func' => $user_func, + 'group' => $group, ); foreach ($insert as $key => $val_check) { @@ -992,17 +993,10 @@ function discovery_process(&$valid, $device, $sensor_type, $pre_cache) $oid = str_replace('{{ $index }}', $index, $data['num_oid']); // process the description - $descr = dynamic_discovery_get_value('descr', $index, $data, $pre_cache); - if (is_null($descr)) { - $descr = str_replace('{{ $index }}', $index, $data['descr']); - preg_match_all('/{{ \$([a-zA-Z0-9.]+) }}/', $descr, $matches); - foreach ($matches[1] as $tmp_var) { - $replace = dynamic_discovery_get_value($tmp_var, $index, $data, $pre_cache, null); - if (!is_null($replace)) { - $descr = str_replace("{{ \$$tmp_var }}", $replace, $descr); - } - } - } + $descr = YamlDiscovery::replaceValues('descr', $index, null, $data, $pre_cache); + + // process the group + $group = YamlDiscovery::replaceValues('group', $index, null, $data, $pre_cache); $divisor = $data['divisor'] ?: ($sensor_options['divisor'] ?: 1); $multiplier = $data['multiplier'] ?: ($sensor_options['multiplier'] ?: 1); @@ -1038,7 +1032,7 @@ function discovery_process(&$valid, $device, $sensor_type, $pre_cache) } $uindex = str_replace('{{ $index }}', $index, isset($data['index']) ? $data['index'] : $index); - discover_sensor($valid['sensor'], $sensor_type, $device, $oid, $uindex, $sensor_name, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured, $user_function, isset($data['group']) ? $data['group'] : null); + discover_sensor($valid['sensor'], $sensor_type, $device, $oid, $uindex, $sensor_name, $descr, $divisor, $multiplier, $low_limit, $low_warn_limit, $warn_limit, $high_limit, $value, 'snmp', $entPhysicalIndex, $entPhysicalIndex_measured, $user_function, $group); if ($sensor_type === 'state') { create_sensor_to_state_index($device, $sensor_name, $uindex); diff --git a/misc/discovery_schema.json b/misc/discovery_schema.json index 92a9d7c010..632c1ae890 100644 --- a/misc/discovery_schema.json +++ b/misc/discovery_schema.json @@ -118,8 +118,7 @@ "type": "string" }, "group": { - "type": "string", - "pattern": "^[A-Z]" + "type": "string" }, "low_limit": { "type": ["number", "string"] @@ -333,8 +332,7 @@ "type": "string" }, "group": { - "type": "string", - "pattern": "^[A-Z]" + "type": "string" }, "low_limit": { "type": ["number", "string"] diff --git a/tests/data/ibmc.json b/tests/data/ibmc.json index f175c49640..b83da73759 100644 --- a/tests/data/ibmc.json +++ b/tests/data/ibmc.json @@ -8,13 +8,13 @@ "sysDescr": "Hardware management system", "sysContact": null, "version": null, - "hardware": "", + "hardware": null, "features": null, - "location": null, "os": "ibmc", "type": "appliance", "serial": null, - "icon": "huawei.svg" + "icon": "huawei.svg", + "location": null } ] }, @@ -28,11 +28,11 @@ "version": null, "hardware": "RH2288H V3", "features": null, - "location": "", "os": "ibmc", "type": "appliance", "serial": "SerialNumber", - "icon": "huawei.svg" + "icon": "huawei.svg", + "location": "" } ] } @@ -1311,15 +1311,15 @@ "discovery": { "processors": [ { - "entPhysicalIndex": "0", - "hrDeviceIndex": "196608", + "entPhysicalIndex": 0, + "hrDeviceIndex": 196608, "processor_oid": ".1.3.6.1.2.1.25.3.3.1.2.196608", "processor_index": "196608", "processor_type": "hr", - "processor_usage": "69", + "processor_usage": 69, "processor_descr": "Processor", - "processor_precision": "1", - "processor_perc_warn": "75" + "processor_precision": 1, + "processor_perc_warn": 75 } ] }, @@ -1333,48 +1333,48 @@ "entPhysicalIndex": null, "hrDeviceIndex": null, "mempool_type": "hrstorage", - "mempool_precision": "1024", + "mempool_precision": 1024, "mempool_descr": "Physical memory", - "mempool_perc": "0", - "mempool_used": "0", - "mempool_free": "0", - "mempool_total": "0", + "mempool_perc": 0, + "mempool_used": 0, + "mempool_free": 0, + "mempool_total": 0, "mempool_largestfree": null, "mempool_lowestfree": null, - "mempool_deleted": "0", - "mempool_perc_warn": "75" + "mempool_deleted": 0, + "mempool_perc_warn": 75 }, { "mempool_index": "3", "entPhysicalIndex": null, "hrDeviceIndex": null, "mempool_type": "hrstorage", - "mempool_precision": "1024", + "mempool_precision": 1024, "mempool_descr": "Virtual memory", - "mempool_perc": "0", - "mempool_used": "0", - "mempool_free": "0", - "mempool_total": "0", + "mempool_perc": 0, + "mempool_used": 0, + "mempool_free": 0, + "mempool_total": 0, "mempool_largestfree": null, "mempool_lowestfree": null, - "mempool_deleted": "0", - "mempool_perc_warn": "75" + "mempool_deleted": 0, + "mempool_perc_warn": 75 }, { "mempool_index": "10", "entPhysicalIndex": null, "hrDeviceIndex": null, "mempool_type": "hrstorage", - "mempool_precision": "1024", + "mempool_precision": 1024, "mempool_descr": "Swap space", - "mempool_perc": "0", - "mempool_used": "0", - "mempool_free": "0", - "mempool_total": "0", + "mempool_perc": 0, + "mempool_used": 0, + "mempool_free": 0, + "mempool_total": 0, "mempool_largestfree": null, "mempool_lowestfree": null, - "mempool_deleted": "0", - "mempool_perc_warn": "75" + "mempool_deleted": 0, + "mempool_perc_warn": 75 } ] }, @@ -1385,48 +1385,48 @@ "entPhysicalIndex": null, "hrDeviceIndex": null, "mempool_type": "hrstorage", - "mempool_precision": "1024", + "mempool_precision": 1024, "mempool_descr": "Physical memory", - "mempool_perc": "82", - "mempool_used": "130932736", - "mempool_free": "28753920", - "mempool_total": "159686656", + "mempool_perc": 82, + "mempool_used": 130932736, + "mempool_free": 28753920, + "mempool_total": 159686656, "mempool_largestfree": null, "mempool_lowestfree": null, - "mempool_deleted": "0", - "mempool_perc_warn": "75" + "mempool_deleted": 0, + "mempool_perc_warn": 75 }, { "mempool_index": "3", "entPhysicalIndex": null, "hrDeviceIndex": null, "mempool_type": "hrstorage", - "mempool_precision": "1024", + "mempool_precision": 1024, "mempool_descr": "Virtual memory", - "mempool_perc": "82", - "mempool_used": "130932736", - "mempool_free": "28753920", - "mempool_total": "159686656", + "mempool_perc": 82, + "mempool_used": 130932736, + "mempool_free": 28753920, + "mempool_total": 159686656, "mempool_largestfree": null, "mempool_lowestfree": null, - "mempool_deleted": "0", - "mempool_perc_warn": "75" + "mempool_deleted": 0, + "mempool_perc_warn": 75 }, { "mempool_index": "10", "entPhysicalIndex": null, "hrDeviceIndex": null, "mempool_type": "hrstorage", - "mempool_precision": "1024", + "mempool_precision": 1024, "mempool_descr": "Swap space", - "mempool_perc": "0", - "mempool_used": "0", - "mempool_free": "0", - "mempool_total": "0", + "mempool_perc": 0, + "mempool_used": 0, + "mempool_free": 0, + "mempool_total": 0, "mempool_largestfree": null, "mempool_lowestfree": null, - "mempool_deleted": "0", - "mempool_perc_warn": "75" + "mempool_deleted": 0, + "mempool_perc_warn": 75 } ] } @@ -1442,7 +1442,7 @@ "sensor_index": "fanSpeed.1", "sensor_type": "ibmc", "sensor_descr": "Fan1 Front", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 2400, @@ -1466,7 +1466,7 @@ "sensor_index": "fanSpeed.2", "sensor_type": "ibmc", "sensor_descr": "Fan1 Rear", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 2160, @@ -1490,7 +1490,7 @@ "sensor_index": "fanSpeed.3", "sensor_type": "ibmc", "sensor_descr": "Fan2 Front", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 2400, @@ -1514,7 +1514,7 @@ "sensor_index": "fanSpeed.4", "sensor_type": "ibmc", "sensor_descr": "Fan2 Rear", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 2160, @@ -1538,7 +1538,7 @@ "sensor_index": "fanSpeed.5", "sensor_type": "ibmc", "sensor_descr": "Fan3 Front", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 2520, @@ -1562,7 +1562,7 @@ "sensor_index": "fanSpeed.6", "sensor_type": "ibmc", "sensor_descr": "Fan3 Rear", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 2160, @@ -1586,7 +1586,7 @@ "sensor_index": "fanSpeed.7", "sensor_type": "ibmc", "sensor_descr": "Fan4 Front", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 2400, @@ -1610,7 +1610,7 @@ "sensor_index": "fanSpeed.8", "sensor_type": "ibmc", "sensor_descr": "Fan4 Rear", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 2160, @@ -1634,7 +1634,7 @@ "sensor_index": "powerSupplyIndex.1", "sensor_type": "ibmc", "sensor_descr": "Power Supply 1 Input", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 132, @@ -1658,7 +1658,7 @@ "sensor_index": "powerSupplyIndex.2", "sensor_type": "ibmc", "sensor_descr": "Power Supply 2 Input", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 132, @@ -1682,7 +1682,7 @@ "sensor_index": "cpuStatus.1", "sensor_type": "cpuStatus", "sensor_descr": "Processor Xeon @2200 MHz #1", - "group": null, + "group": "CPU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1706,7 +1706,7 @@ "sensor_index": "cpuStatus.2", "sensor_type": "cpuStatus", "sensor_descr": "Processor Xeon @2200 MHz #2", - "group": null, + "group": "CPU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1730,7 +1730,7 @@ "sensor_index": "fanSpeed.1", "sensor_type": "fanStatus", "sensor_descr": "Fan1 Front", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1754,7 +1754,7 @@ "sensor_index": "fanSpeed.2", "sensor_type": "fanStatus", "sensor_descr": "Fan1 Rear", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1778,7 +1778,7 @@ "sensor_index": "fanSpeed.3", "sensor_type": "fanStatus", "sensor_descr": "Fan2 Front", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1802,7 +1802,7 @@ "sensor_index": "fanSpeed.4", "sensor_type": "fanStatus", "sensor_descr": "Fan2 Rear", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1826,7 +1826,7 @@ "sensor_index": "fanSpeed.5", "sensor_type": "fanStatus", "sensor_descr": "Fan3 Front", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1850,7 +1850,7 @@ "sensor_index": "fanSpeed.6", "sensor_type": "fanStatus", "sensor_descr": "Fan3 Rear", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1874,7 +1874,7 @@ "sensor_index": "fanSpeed.7", "sensor_type": "fanStatus", "sensor_descr": "Fan4 Front", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1898,7 +1898,7 @@ "sensor_index": "fanSpeed.8", "sensor_type": "fanStatus", "sensor_descr": "Fan4 Rear", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1922,7 +1922,7 @@ "sensor_index": "hardDiskStatus.1", "sensor_type": "hardDiskStatus", "sensor_descr": "Drive Bay 1 Disk0", - "group": null, + "group": "Drive Bays", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1946,7 +1946,7 @@ "sensor_index": "hardDiskStatus.10", "sensor_type": "hardDiskStatus", "sensor_descr": "Drive Bay 10 ", - "group": null, + "group": "Drive Bays", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 5, @@ -1970,7 +1970,7 @@ "sensor_index": "hardDiskStatus.11", "sensor_type": "hardDiskStatus", "sensor_descr": "Drive Bay 11 ", - "group": null, + "group": "Drive Bays", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 5, @@ -1994,7 +1994,7 @@ "sensor_index": "hardDiskStatus.12", "sensor_type": "hardDiskStatus", "sensor_descr": "Drive Bay 12 ", - "group": null, + "group": "Drive Bays", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 5, @@ -2018,7 +2018,7 @@ "sensor_index": "hardDiskStatus.13", "sensor_type": "hardDiskStatus", "sensor_descr": "Drive Bay 13 ", - "group": null, + "group": "Drive Bays", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 5, @@ -2042,7 +2042,7 @@ "sensor_index": "hardDiskStatus.14", "sensor_type": "hardDiskStatus", "sensor_descr": "Drive Bay 14 ", - "group": null, + "group": "Drive Bays", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 5, @@ -2066,7 +2066,7 @@ "sensor_index": "hardDiskStatus.2", "sensor_type": "hardDiskStatus", "sensor_descr": "Drive Bay 2 Disk1", - "group": null, + "group": "Drive Bays", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2090,7 +2090,7 @@ "sensor_index": "hardDiskStatus.3", "sensor_type": "hardDiskStatus", "sensor_descr": "Drive Bay 3 ", - "group": null, + "group": "Drive Bays", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 5, @@ -2114,7 +2114,7 @@ "sensor_index": "hardDiskStatus.4", "sensor_type": "hardDiskStatus", "sensor_descr": "Drive Bay 4 ", - "group": null, + "group": "Drive Bays", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 5, @@ -2138,7 +2138,7 @@ "sensor_index": "hardDiskStatus.5", "sensor_type": "hardDiskStatus", "sensor_descr": "Drive Bay 5 ", - "group": null, + "group": "Drive Bays", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 5, @@ -2162,7 +2162,7 @@ "sensor_index": "hardDiskStatus.6", "sensor_type": "hardDiskStatus", "sensor_descr": "Drive Bay 6 ", - "group": null, + "group": "Drive Bays", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 5, @@ -2186,7 +2186,7 @@ "sensor_index": "hardDiskStatus.7", "sensor_type": "hardDiskStatus", "sensor_descr": "Drive Bay 7 ", - "group": null, + "group": "Drive Bays", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 5, @@ -2210,7 +2210,7 @@ "sensor_index": "hardDiskStatus.8", "sensor_type": "hardDiskStatus", "sensor_descr": "Drive Bay 8 ", - "group": null, + "group": "Drive Bays", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 5, @@ -2234,7 +2234,7 @@ "sensor_index": "hardDiskStatus.9", "sensor_type": "hardDiskStatus", "sensor_descr": "Drive Bay 9 ", - "group": null, + "group": "Drive Bays", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 5, @@ -2258,7 +2258,7 @@ "sensor_index": "memoryEntireStatus.0", "sensor_type": "memoryEntireStatus", "sensor_descr": "Memory Status", - "group": null, + "group": "RAM", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2282,7 +2282,7 @@ "sensor_index": "memoryStatus.1", "sensor_type": "memoryStatus", "sensor_descr": "DIMM000 Micron 32768 MB 2400 MHz", - "group": null, + "group": "RAM", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2306,7 +2306,7 @@ "sensor_index": "memoryStatus.10", "sensor_type": "memoryStatus", "sensor_descr": "DIMM030 Micron 32768 MB 2400 MHz", - "group": null, + "group": "RAM", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2330,7 +2330,7 @@ "sensor_index": "memoryStatus.11", "sensor_type": "memoryStatus", "sensor_descr": "DIMM031 Micron 32768 MB 2400 MHz", - "group": null, + "group": "RAM", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2354,7 +2354,7 @@ "sensor_index": "memoryStatus.13", "sensor_type": "memoryStatus", "sensor_descr": "DIMM100 Micron 32768 MB 2400 MHz", - "group": null, + "group": "RAM", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2378,7 +2378,7 @@ "sensor_index": "memoryStatus.14", "sensor_type": "memoryStatus", "sensor_descr": "DIMM101 Micron 32768 MB 2400 MHz", - "group": null, + "group": "RAM", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2402,7 +2402,7 @@ "sensor_index": "memoryStatus.16", "sensor_type": "memoryStatus", "sensor_descr": "DIMM110 Micron 32768 MB 2400 MHz", - "group": null, + "group": "RAM", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2426,7 +2426,7 @@ "sensor_index": "memoryStatus.17", "sensor_type": "memoryStatus", "sensor_descr": "DIMM111 Micron 32768 MB 2400 MHz", - "group": null, + "group": "RAM", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2450,7 +2450,7 @@ "sensor_index": "memoryStatus.19", "sensor_type": "memoryStatus", "sensor_descr": "DIMM120 Micron 32768 MB 2400 MHz", - "group": null, + "group": "RAM", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2474,7 +2474,7 @@ "sensor_index": "memoryStatus.2", "sensor_type": "memoryStatus", "sensor_descr": "DIMM001 Micron 32768 MB 2400 MHz", - "group": null, + "group": "RAM", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2498,7 +2498,7 @@ "sensor_index": "memoryStatus.20", "sensor_type": "memoryStatus", "sensor_descr": "DIMM121 Micron 32768 MB 2400 MHz", - "group": null, + "group": "RAM", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2522,7 +2522,7 @@ "sensor_index": "memoryStatus.22", "sensor_type": "memoryStatus", "sensor_descr": "DIMM130 Micron 32768 MB 2400 MHz", - "group": null, + "group": "RAM", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2546,7 +2546,7 @@ "sensor_index": "memoryStatus.23", "sensor_type": "memoryStatus", "sensor_descr": "DIMM131 Micron 32768 MB 2400 MHz", - "group": null, + "group": "RAM", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2570,7 +2570,7 @@ "sensor_index": "memoryStatus.4", "sensor_type": "memoryStatus", "sensor_descr": "DIMM010 Micron 32768 MB 2400 MHz", - "group": null, + "group": "RAM", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2594,7 +2594,7 @@ "sensor_index": "memoryStatus.5", "sensor_type": "memoryStatus", "sensor_descr": "DIMM011 Micron 32768 MB 2400 MHz", - "group": null, + "group": "RAM", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2618,7 +2618,7 @@ "sensor_index": "memoryStatus.7", "sensor_type": "memoryStatus", "sensor_descr": "DIMM020 Micron 32768 MB 2400 MHz", - "group": null, + "group": "RAM", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2642,7 +2642,7 @@ "sensor_index": "memoryStatus.8", "sensor_type": "memoryStatus", "sensor_descr": "DIMM021 Micron 32768 MB 2400 MHz", - "group": null, + "group": "RAM", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2666,7 +2666,7 @@ "sensor_index": "temperatureIndex.1", "sensor_type": "ibmc", "sensor_descr": "Inlet", - "group": null, + "group": "", "sensor_divisor": 10, "sensor_multiplier": 1, "sensor_current": 19, @@ -2690,7 +2690,7 @@ "sensor_index": "temperatureIndex.2", "sensor_type": "ibmc", "sensor_descr": "CPU1", - "group": null, + "group": "", "sensor_divisor": 10, "sensor_multiplier": 1, "sensor_current": 45, @@ -2714,7 +2714,7 @@ "sensor_index": "temperatureIndex.3", "sensor_type": "ibmc", "sensor_descr": "CPU2", - "group": null, + "group": "", "sensor_divisor": 10, "sensor_multiplier": 1, "sensor_current": 45, @@ -2954,39 +2954,39 @@ "storage_index": "36", "storage_type": "hrStorageFixedDisk", "storage_descr": "/dev/shm", - "storage_size": "79843328", - "storage_units": "4096", - "storage_used": "286720", - "storage_free": "0", - "storage_perc": "0", - "storage_perc_warn": "60", - "storage_deleted": "0" + "storage_size": 79843328, + "storage_units": 4096, + "storage_used": 286720, + "storage_free": 0, + "storage_perc": 0, + "storage_perc_warn": 60, + "storage_deleted": 0 }, { "storage_mib": "hrstorage", "storage_index": "37", "storage_type": "hrStorageFixedDisk", "storage_descr": "/tmp", - "storage_size": "47185920", - "storage_units": "4096", - "storage_used": "688128", - "storage_free": "0", - "storage_perc": "0", - "storage_perc_warn": "60", - "storage_deleted": "0" + "storage_size": 47185920, + "storage_units": 4096, + "storage_used": 688128, + "storage_free": 0, + "storage_perc": 0, + "storage_perc_warn": 60, + "storage_deleted": 0 }, { "storage_mib": "hrstorage", "storage_index": "40", "storage_type": "hrStorageFixedDisk", "storage_descr": "/opt/pme/pram", - "storage_size": "8117248", - "storage_units": "1024", - "storage_used": "4658176", - "storage_free": "0", - "storage_perc": "0", - "storage_perc_warn": "60", - "storage_deleted": "0" + "storage_size": 8117248, + "storage_units": 1024, + "storage_used": 4658176, + "storage_free": 0, + "storage_perc": 0, + "storage_perc_warn": 60, + "storage_deleted": 0 } ] }, @@ -2997,39 +2997,39 @@ "storage_index": "36", "storage_type": "hrStorageFixedDisk", "storage_descr": "/dev/shm", - "storage_size": "79843328", - "storage_units": "4096", - "storage_used": "286720", - "storage_free": "79556608", - "storage_perc": "0", - "storage_perc_warn": "60", - "storage_deleted": "0" + "storage_size": 79843328, + "storage_units": 4096, + "storage_used": 286720, + "storage_free": 79556608, + "storage_perc": 0, + "storage_perc_warn": 60, + "storage_deleted": 0 }, { "storage_mib": "hrstorage", "storage_index": "37", "storage_type": "hrStorageFixedDisk", "storage_descr": "/tmp", - "storage_size": "47185920", - "storage_units": "4096", - "storage_used": "688128", - "storage_free": "46497792", - "storage_perc": "1", - "storage_perc_warn": "60", - "storage_deleted": "0" + "storage_size": 47185920, + "storage_units": 4096, + "storage_used": 688128, + "storage_free": 46497792, + "storage_perc": 1, + "storage_perc_warn": 60, + "storage_deleted": 0 }, { "storage_mib": "hrstorage", "storage_index": "40", "storage_type": "hrStorageFixedDisk", "storage_descr": "/opt/pme/pram", - "storage_size": "8117248", - "storage_units": "1024", - "storage_used": "4658176", - "storage_free": "3459072", - "storage_perc": "57", - "storage_perc_warn": "60", - "storage_deleted": "0" + "storage_size": 8117248, + "storage_units": 1024, + "storage_used": 4658176, + "storage_free": 3459072, + "storage_perc": 57, + "storage_perc_warn": 60, + "storage_deleted": 0 } ] } diff --git a/tests/data/nxos_2.json b/tests/data/nxos_2.json index 6f496a4c2a..42b75a2669 100644 --- a/tests/data/nxos_2.json +++ b/tests/data/nxos_2.json @@ -10,11 +10,11 @@ "version": null, "hardware": null, "features": null, - "location": null, "os": "nxos", "type": "network", "serial": null, - "icon": "cisco.svg" + "icon": "cisco.svg", + "location": null } ] }, @@ -31,7 +31,7 @@ "sensor_index": "183885", "sensor_type": "cucsEquipmentChassisOperState", "sensor_descr": "Chassis - sys/chassis-1", - "group": null, + "group": "Chassis", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -55,7 +55,7 @@ "sensor_index": "184107", "sensor_type": "cucsEquipmentChassisOperState", "sensor_descr": "Chassis - sys/chassis-2", - "group": null, + "group": "Chassis", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -79,7 +79,7 @@ "sensor_index": "184314", "sensor_type": "cucsEquipmentChassisOperState", "sensor_descr": "Chassis - sys/chassis-3", - "group": null, + "group": "Chassis", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -103,7 +103,7 @@ "sensor_index": "184511", "sensor_type": "cucsEquipmentChassisOperState", "sensor_descr": "Chassis - sys/chassis-4", - "group": null, + "group": "Chassis", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -127,7 +127,7 @@ "sensor_index": "184787", "sensor_type": "cucsEquipmentChassisOperState", "sensor_descr": "Chassis - sys/chassis-5", - "group": null, + "group": "Chassis", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -151,7 +151,7 @@ "sensor_index": "184946", "sensor_type": "cucsEquipmentChassisOperState", "sensor_descr": "Chassis - sys/chassis-6", - "group": null, + "group": "Chassis", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -175,7 +175,7 @@ "sensor_index": "187115", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-1/fan-module-1-1", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -199,7 +199,7 @@ "sensor_index": "187118", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-1/fan-module-1-2", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -223,7 +223,7 @@ "sensor_index": "187121", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-1/fan-module-1-3", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -247,7 +247,7 @@ "sensor_index": "187124", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-1/fan-module-1-4", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -271,7 +271,7 @@ "sensor_index": "187127", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-1/fan-module-1-5", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -295,7 +295,7 @@ "sensor_index": "187130", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-1/fan-module-1-6", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -319,7 +319,7 @@ "sensor_index": "187133", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-1/fan-module-1-7", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -343,7 +343,7 @@ "sensor_index": "187136", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-1/fan-module-1-8", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -367,7 +367,7 @@ "sensor_index": "189490", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-4/fan-module-1-1", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -391,7 +391,7 @@ "sensor_index": "189493", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-4/fan-module-1-2", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -415,7 +415,7 @@ "sensor_index": "189496", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-4/fan-module-1-3", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -439,7 +439,7 @@ "sensor_index": "189499", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-4/fan-module-1-4", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -463,7 +463,7 @@ "sensor_index": "189502", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-4/fan-module-1-5", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -487,7 +487,7 @@ "sensor_index": "189505", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-4/fan-module-1-6", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -511,7 +511,7 @@ "sensor_index": "189508", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-4/fan-module-1-7", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -535,7 +535,7 @@ "sensor_index": "189511", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-4/fan-module-1-8", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -559,7 +559,7 @@ "sensor_index": "189633", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-3/fan-module-1-1", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -583,7 +583,7 @@ "sensor_index": "189636", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-3/fan-module-1-2", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -607,7 +607,7 @@ "sensor_index": "189639", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-3/fan-module-1-3", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -631,7 +631,7 @@ "sensor_index": "189642", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-3/fan-module-1-4", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -655,7 +655,7 @@ "sensor_index": "189645", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-3/fan-module-1-5", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -679,7 +679,7 @@ "sensor_index": "189648", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-3/fan-module-1-6", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -703,7 +703,7 @@ "sensor_index": "189651", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-3/fan-module-1-7", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -727,7 +727,7 @@ "sensor_index": "189654", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-3/fan-module-1-8", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -751,7 +751,7 @@ "sensor_index": "191311", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-2/fan-module-1-1", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -775,7 +775,7 @@ "sensor_index": "191314", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-2/fan-module-1-2", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -799,7 +799,7 @@ "sensor_index": "191317", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-2/fan-module-1-3", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -823,7 +823,7 @@ "sensor_index": "191320", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-2/fan-module-1-4", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -847,7 +847,7 @@ "sensor_index": "191323", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-2/fan-module-1-5", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -871,7 +871,7 @@ "sensor_index": "191326", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-2/fan-module-1-6", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -895,7 +895,7 @@ "sensor_index": "191329", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-2/fan-module-1-7", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -919,7 +919,7 @@ "sensor_index": "191332", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-2/fan-module-1-8", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -943,7 +943,7 @@ "sensor_index": "196842", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-5/fan-module-1-1", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -967,7 +967,7 @@ "sensor_index": "196845", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-5/fan-module-1-2", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -991,7 +991,7 @@ "sensor_index": "196848", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-5/fan-module-1-3", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1015,7 +1015,7 @@ "sensor_index": "196851", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-5/fan-module-1-4", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1039,7 +1039,7 @@ "sensor_index": "196854", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-5/fan-module-1-5", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1063,7 +1063,7 @@ "sensor_index": "196857", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-5/fan-module-1-6", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1087,7 +1087,7 @@ "sensor_index": "196860", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-5/fan-module-1-7", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1111,7 +1111,7 @@ "sensor_index": "196863", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-5/fan-module-1-8", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1135,7 +1135,7 @@ "sensor_index": "197988", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-6/fan-module-1-1", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1159,7 +1159,7 @@ "sensor_index": "197991", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-6/fan-module-1-2", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1183,7 +1183,7 @@ "sensor_index": "197994", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-6/fan-module-1-3", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1207,7 +1207,7 @@ "sensor_index": "197997", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-6/fan-module-1-4", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1231,7 +1231,7 @@ "sensor_index": "198000", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-6/fan-module-1-5", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1255,7 +1255,7 @@ "sensor_index": "198003", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-6/fan-module-1-6", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1279,7 +1279,7 @@ "sensor_index": "198006", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-6/fan-module-1-7", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1303,7 +1303,7 @@ "sensor_index": "198009", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/chassis-6/fan-module-1-8", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1327,7 +1327,7 @@ "sensor_index": "94743", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/switch-A/fan-module-1-1", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1351,7 +1351,7 @@ "sensor_index": "94744", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/switch-A/fan-module-1-2", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1375,7 +1375,7 @@ "sensor_index": "95038", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/switch-B/fan-module-1-1", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1399,7 +1399,7 @@ "sensor_index": "95039", "sensor_type": "cucsEquipmentFanModuleOperState", "sensor_descr": "Fan Module - sys/switch-B/fan-module-1-2", - "group": null, + "group": "Fans", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1423,7 +1423,7 @@ "sensor_index": "187107", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-1/psu-1", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1447,7 +1447,7 @@ "sensor_index": "187109", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-1/psu-2", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1471,7 +1471,7 @@ "sensor_index": "187111", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-1/psu-3", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 8, @@ -1495,7 +1495,7 @@ "sensor_index": "187113", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-1/psu-4", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1519,7 +1519,7 @@ "sensor_index": "189482", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-4/psu-1", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1543,7 +1543,7 @@ "sensor_index": "189484", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-4/psu-2", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1567,7 +1567,7 @@ "sensor_index": "189486", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-4/psu-3", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1591,7 +1591,7 @@ "sensor_index": "189488", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-4/psu-4", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 8, @@ -1615,7 +1615,7 @@ "sensor_index": "189625", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-3/psu-1", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1639,7 +1639,7 @@ "sensor_index": "189627", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-3/psu-2", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1663,7 +1663,7 @@ "sensor_index": "189629", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-3/psu-3", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1687,7 +1687,7 @@ "sensor_index": "189631", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-3/psu-4", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 8, @@ -1711,7 +1711,7 @@ "sensor_index": "191287", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-2/psu-1", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1735,7 +1735,7 @@ "sensor_index": "191293", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-2/psu-2", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1759,7 +1759,7 @@ "sensor_index": "191299", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-2/psu-3", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1783,7 +1783,7 @@ "sensor_index": "191305", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-2/psu-4", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 8, @@ -1807,7 +1807,7 @@ "sensor_index": "196818", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-5/psu-1", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1831,7 +1831,7 @@ "sensor_index": "196824", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-5/psu-2", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1855,7 +1855,7 @@ "sensor_index": "196830", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-5/psu-3", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1879,7 +1879,7 @@ "sensor_index": "196836", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-5/psu-4", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 8, @@ -1903,7 +1903,7 @@ "sensor_index": "197964", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-6/psu-1", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1927,7 +1927,7 @@ "sensor_index": "197970", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-6/psu-2", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1951,7 +1951,7 @@ "sensor_index": "197976", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-6/psu-3", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -1975,7 +1975,7 @@ "sensor_index": "197982", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/chassis-6/psu-4", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 8, @@ -1999,7 +1999,7 @@ "sensor_index": "94756", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/switch-A/psu-1", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2023,7 +2023,7 @@ "sensor_index": "94758", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/switch-A/psu-2", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2047,7 +2047,7 @@ "sensor_index": "95051", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/switch-B/psu-1", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -2071,7 +2071,7 @@ "sensor_index": "95053", "sensor_type": "cucsEquipmentPsuPower", "sensor_descr": "PSU - sys/switch-B/psu-2", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, diff --git a/tests/data/omnitron-iconverter.json b/tests/data/omnitron-iconverter.json index cd61f94a05..b59b7446df 100644 --- a/tests/data/omnitron-iconverter.json +++ b/tests/data/omnitron-iconverter.json @@ -8,13 +8,13 @@ "sysDescr": "Omnitron iConverter GM4-HPOE 8991T11D v5.2.14 s/n 00827398 - GM4-PoE - x", "sysContact": null, "version": null, - "hardware": "", + "hardware": null, "features": null, - "location": null, "os": "omnitron-iconverter", "type": "management", "serial": null, - "icon": "omnitron.png" + "icon": "omnitron.png", + "location": null } ] }, @@ -28,11 +28,11 @@ "version": "v5.2.14", "hardware": "GM4-HPOE 8991T11D", "features": null, - "location": "", "os": "omnitron-iconverter", "type": "management", "serial": "00000000", - "icon": "omnitron.png" + "icon": "omnitron.png", + "location": "" } ] } @@ -48,11 +48,11 @@ "sensor_index": "pseCurrent.2", "sensor_type": "omnitron-iconverter", "sensor_descr": "PSE Port Ouput Current 2", - "group": null, + "group": "", "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 0.07678, - "sensor_limit": 0.11517, + "sensor_current": 0.076780000000000001, + "sensor_limit": 0.11516999999999999, "sensor_limit_warn": null, "sensor_limit_low": null, "sensor_limit_low_warn": null, @@ -72,10 +72,10 @@ "sensor_index": "pwr.0", "sensor_type": "omnitron-iconverter", "sensor_descr": "Total Power", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 4.2815, + "sensor_current": 4.2815000000000003, "sensor_limit": 6.42225, "sensor_limit_warn": null, "sensor_limit_low": null, @@ -96,7 +96,7 @@ "sensor_index": "pseHeart.2", "sensor_type": "PoePortHeartbeatStatus", "sensor_descr": "PSE Port Heartbeat Status 2", - "group": null, + "group": "PSE", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -120,7 +120,7 @@ "sensor_index": "pseStatus.2", "sensor_type": "PoePortPseStatus", "sensor_descr": "PSE Port Status 2", - "group": null, + "group": "PSE", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 2, @@ -144,7 +144,7 @@ "sensor_index": "ps1Status.1.1", "sensor_type": "PSstatus", "sensor_descr": "PS1 Status", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 3, @@ -168,7 +168,7 @@ "sensor_index": "ps2Status.1.1", "sensor_type": "PSstatus", "sensor_descr": "PS2 Status", - "group": null, + "group": "PSU", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 1, @@ -192,7 +192,7 @@ "sensor_index": "cpuTemp.1.1", "sensor_type": "omnitron-iconverter", "sensor_descr": "CPU Ambient Temperature", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 56, @@ -216,7 +216,7 @@ "sensor_index": "envTemp.1.1", "sensor_type": "omnitron-iconverter", "sensor_descr": "Module Internal Ambient Temperature", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 56, @@ -240,13 +240,13 @@ "sensor_index": "cpuVoltIn.1.1", "sensor_type": "omnitron-iconverter", "sensor_descr": "CPU Input Voltage", - "group": null, + "group": "CPU", "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 61.132, + "sensor_current": 61.131999999999998, "sensor_limit": 70.3018, "sensor_limit_warn": null, - "sensor_limit_low": 51.9622, + "sensor_limit_low": 51.962200000000003, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -264,13 +264,13 @@ "sensor_index": "cpuVoltOut1.1", "sensor_type": "omnitron-iconverter", "sensor_descr": "CPU Output Voltage", - "group": null, + "group": "CPU", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 3.302, - "sensor_limit": 3.7973, + "sensor_limit": 3.7972999999999999, "sensor_limit_warn": null, - "sensor_limit_low": 2.8067, + "sensor_limit_low": 2.8067000000000002, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -288,13 +288,13 @@ "sensor_index": "ps1VoltIn.1.1", "sensor_type": "omnitron-iconverter", "sensor_descr": "PS1 Input Voltage", - "group": null, + "group": "PS1", "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 0.054, - "sensor_limit": 0.0621, + "sensor_current": 0.053999999999999999, + "sensor_limit": 0.062100000000000002, "sensor_limit_warn": null, - "sensor_limit_low": 0.0459, + "sensor_limit_low": 0.045900000000000003, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -312,13 +312,13 @@ "sensor_index": "ps1VoltOut.1.1", "sensor_type": "omnitron-iconverter", "sensor_descr": "PS1 Output Votlage", - "group": null, + "group": "PS1", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 3.302, - "sensor_limit": 3.7973, + "sensor_limit": 3.7972999999999999, "sensor_limit_warn": null, - "sensor_limit_low": 2.8067, + "sensor_limit_low": 2.8067000000000002, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -336,7 +336,7 @@ "sensor_index": "ps2VoltIn.1.1", "sensor_type": "omnitron-iconverter", "sensor_descr": "PS2 Input Voltage", - "group": null, + "group": "PS2", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 0, @@ -360,7 +360,7 @@ "sensor_index": "ps2VoltOut.1.1", "sensor_type": "omnitron-iconverter", "sensor_descr": "PS2 Output Voltage", - "group": null, + "group": "PS2", "sensor_divisor": 1000, "sensor_multiplier": 1, "sensor_current": 0, @@ -384,11 +384,11 @@ "sensor_index": "pseVoltage.2", "sensor_type": "omnitron-iconverter", "sensor_descr": "PSE Port Output Voltage 2", - "group": null, + "group": "PSE", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": 55.14, - "sensor_limit": 63.411, + "sensor_current": 55.140000000000001, + "sensor_limit": 63.411000000000001, "sensor_limit_warn": null, "sensor_limit_low": 46.869, "sensor_limit_low_warn": null, diff --git a/tests/data/vrp.json b/tests/data/vrp.json index cbf5c00f4d..10f0ce6514 100644 --- a/tests/data/vrp.json +++ b/tests/data/vrp.json @@ -16,11 +16,11 @@ "version": null, "hardware": null, "features": null, - "location": null, "os": "vrp", "type": "network", "serial": null, - "icon": "huawei.svg" + "icon": "huawei.svg", + "location": null } ] }, @@ -34,11 +34,11 @@ "version": "5.120 (V200R003C01SPC900)", "hardware": "Huawei AR1220", "features": null, - "location": null, "os": "vrp", "type": "network", "serial": null, - "icon": "huawei.svg" + "icon": "huawei.svg", + "location": null } ] } diff --git a/tests/data/vrp_5720-vrf.json b/tests/data/vrp_5720-vrf.json index c753d026b0..e1a6164842 100644 --- a/tests/data/vrp_5720-vrf.json +++ b/tests/data/vrp_5720-vrf.json @@ -10,11 +10,11 @@ "version": null, "hardware": null, "features": null, - "location": null, "os": "vrp", "type": "network", "serial": null, - "icon": "huawei.svg" + "icon": "huawei.svg", + "location": null } ] }, @@ -28,11 +28,11 @@ "version": "5.170 (V200R010C00SPC600)", "hardware": "Huawei S5720", "features": null, - "location": "", "os": "vrp", "type": "network", "serial": null, - "icon": "huawei.svg" + "icon": "huawei.svg", + "location": "" } ] } @@ -34383,11 +34383,11 @@ "sensor_index": "67469390", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/1", - "group": null, + "group": "", "sensor_divisor": 1000000, "sensor_multiplier": 1, - "sensor_current": 0.0051, - "sensor_limit": 0.00765, + "sensor_current": 0.0051000000000000004, + "sensor_limit": 0.0076499999999999997, "sensor_limit_warn": null, "sensor_limit_low": null, "sensor_limit_low_warn": null, @@ -34407,11 +34407,11 @@ "sensor_index": "68517966", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet1/0/1", - "group": null, + "group": "", "sensor_divisor": 1000000, "sensor_multiplier": 1, - "sensor_current": 0.005498, - "sensor_limit": 0.008247, + "sensor_current": 0.0054980000000000003, + "sensor_limit": 0.0082470000000000009, "sensor_limit_warn": null, "sensor_limit_low": null, "sensor_limit_low_warn": null, @@ -34431,11 +34431,11 @@ "sensor_index": "69566542", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet2/0/1", - "group": null, + "group": "", "sensor_divisor": 1000000, "sensor_multiplier": 1, - "sensor_current": 0.006082, - "sensor_limit": 0.009123, + "sensor_current": 0.0060819999999999997, + "sensor_limit": 0.0091229999999999992, "sensor_limit_warn": null, "sensor_limit_low": null, "sensor_limit_low_warn": null, @@ -34455,11 +34455,11 @@ "sensor_index": "rx-67469390", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/1 Rx", - "group": null, + "group": "XGigabitEthernet0/0/1", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": -2.2184874961635637, - "sensor_limit": -2.10756312136, + "sensor_limit": -2.1075631213600001, "sensor_limit_warn": null, "sensor_limit_low": -2.32941187097, "sensor_limit_low_warn": null, @@ -34479,13 +34479,13 @@ "sensor_index": "rx-68517966", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet1/0/1 Rx", - "group": null, + "group": "XGigabitEthernet1/0/1", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": -2.58060922270801, + "sensor_current": -2.5806092227080102, "sensor_limit": -2.45157876157, "sensor_limit_warn": null, - "sensor_limit_low": -2.70963968384, + "sensor_limit_low": -2.7096396838399999, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -34503,13 +34503,13 @@ "sensor_index": "rx-69566542", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet2/0/1 Rx", - "group": null, + "group": "XGigabitEthernet2/0/1", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": -3.036436112666679, - "sensor_limit": -2.88461430703, + "sensor_current": -3.0364361126666788, + "sensor_limit": -2.8846143070300001, "sensor_limit_warn": null, - "sensor_limit_low": -3.1882579183, + "sensor_limit_low": -3.1882579183000002, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -34527,13 +34527,13 @@ "sensor_index": "tx-67469390", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/1 Tx", - "group": null, + "group": "XGigabitEthernet0/0/1", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": -2.3807216157947098, - "sensor_limit": -2.261685535, + "sensor_limit": -2.2616855349999998, "sensor_limit_warn": null, - "sensor_limit_low": -2.49975769658, + "sensor_limit_low": -2.4997576965800001, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -34551,11 +34551,11 @@ "sensor_index": "tx-68517966", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet1/0/1 Tx", - "group": null, + "group": "XGigabitEthernet1/0/1", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": -2.2112552799726046, - "sensor_limit": -2.10069251597, + "sensor_limit": -2.1006925159700001, "sensor_limit_warn": null, "sensor_limit_low": -2.32181804397, "sensor_limit_low_warn": null, @@ -34575,13 +34575,13 @@ "sensor_index": "tx-69566542", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet2/0/1 Tx", - "group": null, + "group": "XGigabitEthernet2/0/1", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": -2.3433144524098592, - "sensor_limit": -2.22614872979, + "sensor_limit": -2.2261487297899998, "sensor_limit_warn": null, - "sensor_limit_low": -2.46048017503, + "sensor_limit_low": -2.4604801750299998, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -34599,7 +34599,7 @@ "sensor_index": "67108873", "sensor_type": "vrp", "sensor_descr": "MPU Board 0", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 44, @@ -34623,7 +34623,7 @@ "sensor_index": "67469390", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/1", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 37, @@ -34647,7 +34647,7 @@ "sensor_index": "68157449", "sensor_type": "vrp", "sensor_descr": "MPU Board 1", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 44, @@ -34671,7 +34671,7 @@ "sensor_index": "68517966", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet1/0/1", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 40, @@ -34695,7 +34695,7 @@ "sensor_index": "69206025", "sensor_type": "vrp", "sensor_descr": "MPU Board 2", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 43, @@ -34719,7 +34719,7 @@ "sensor_index": "69566542", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet2/0/1", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 41, @@ -34743,13 +34743,13 @@ "sensor_index": "67469390", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/1", - "group": null, + "group": "", "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 3.309, - "sensor_limit": 3.80535, + "sensor_current": 3.3090000000000002, + "sensor_limit": 3.8053499999999998, "sensor_limit_warn": null, - "sensor_limit_low": 2.81265, + "sensor_limit_low": 2.8126500000000001, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -34767,13 +34767,13 @@ "sensor_index": "68517966", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet1/0/1", - "group": null, + "group": "", "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 3.265, + "sensor_current": 3.2650000000000001, "sensor_limit": 3.75475, "sensor_limit_warn": null, - "sensor_limit_low": 2.77525, + "sensor_limit_low": 2.7752500000000002, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -34791,11 +34791,11 @@ "sensor_index": "69566542", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet2/0/1", - "group": null, + "group": "", "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 3.288, - "sensor_limit": 3.7812, + "sensor_current": 3.2879999999999998, + "sensor_limit": 3.7812000000000001, "sensor_limit_warn": null, "sensor_limit_low": 2.7948, "sensor_limit_low_warn": null, diff --git a/tests/data/vrp_5720.json b/tests/data/vrp_5720.json index 867b3b559f..550f8ca653 100644 --- a/tests/data/vrp_5720.json +++ b/tests/data/vrp_5720.json @@ -10,11 +10,11 @@ "version": null, "hardware": null, "features": null, - "location": null, "os": "vrp", "type": "network", "serial": null, - "icon": "huawei.svg" + "icon": "huawei.svg", + "location": null } ] }, @@ -28,11 +28,11 @@ "version": "5.170 (V200R010C00SPC600)", "hardware": "Huawei S5720-56C-PWR-EI-AC", "features": null, - "location": "", "os": "vrp", "type": "network", "serial": null, - "icon": "huawei.svg" + "icon": "huawei.svg", + "location": "" } ] } @@ -13749,11 +13749,11 @@ "sensor_index": "67469390", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/1", - "group": null, + "group": "", "sensor_divisor": 1000000, "sensor_multiplier": 1, - "sensor_current": 0.005232, - "sensor_limit": 0.007848, + "sensor_current": 0.0052319999999999997, + "sensor_limit": 0.0078480000000000008, "sensor_limit_warn": null, "sensor_limit_low": null, "sensor_limit_low_warn": null, @@ -13773,11 +13773,11 @@ "sensor_index": "67469454", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/2", - "group": null, + "group": "", "sensor_divisor": 1000000, "sensor_multiplier": 1, - "sensor_current": 0.00629, - "sensor_limit": 0.009435, + "sensor_current": 0.0062899999999999996, + "sensor_limit": 0.0094350000000000007, "sensor_limit_warn": null, "sensor_limit_low": null, "sensor_limit_low_warn": null, @@ -13797,11 +13797,11 @@ "sensor_index": "67469582", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/4", - "group": null, + "group": "", "sensor_divisor": 1000000, "sensor_multiplier": 1, - "sensor_current": 0.005796, - "sensor_limit": 0.008694, + "sensor_current": 0.0057959999999999999, + "sensor_limit": 0.0086940000000000003, "sensor_limit_warn": null, "sensor_limit_low": null, "sensor_limit_low_warn": null, @@ -13821,7 +13821,7 @@ "sensor_index": "rx-67469390", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/1 Rx", - "group": null, + "group": "XGigabitEthernet0/0/1", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": -2.7083521030722997, @@ -13845,11 +13845,11 @@ "sensor_index": "rx-67469454", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/2 Rx", - "group": null, + "group": "XGigabitEthernet0/0/2", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": -2.189630613788682, - "sensor_limit": -2.0801490831, + "sensor_current": -2.1896306137886818, + "sensor_limit": -2.0801490830999998, "sensor_limit_warn": null, "sensor_limit_low": -2.29911214448, "sensor_limit_low_warn": null, @@ -13869,11 +13869,11 @@ "sensor_index": "rx-67469582", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/4 Rx", - "group": null, + "group": "XGigabitEthernet0/0/4", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": -2.4033215531036953, - "sensor_limit": -2.28315547545, + "sensor_limit": -2.2831554754500001, "sensor_limit_warn": null, "sensor_limit_low": -2.52348763076, "sensor_limit_low_warn": null, @@ -13893,13 +13893,13 @@ "sensor_index": "tx-67469390", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/1 Tx", - "group": null, + "group": "XGigabitEthernet0/0/1", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": -2.2841251911874463, - "sensor_limit": -2.16991893163, + "sensor_limit": -2.1699189316299998, "sensor_limit_warn": null, - "sensor_limit_low": -2.39833145075, + "sensor_limit_low": -2.3983314507500002, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -13917,13 +13917,13 @@ "sensor_index": "tx-67469454", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/2 Tx", - "group": null, + "group": "XGigabitEthernet0/0/2", "sensor_divisor": 1, "sensor_multiplier": 1, - "sensor_current": -2.291479883578558, + "sensor_current": -2.2914798835785581, "sensor_limit": -2.1769058894, "sensor_limit_warn": null, - "sensor_limit_low": -2.40605387776, + "sensor_limit_low": -2.4060538777599998, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -13941,13 +13941,13 @@ "sensor_index": "tx-67469582", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/4 Tx", - "group": null, + "group": "XGigabitEthernet0/0/4", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": -2.2040350874217545, - "sensor_limit": -2.09383333305, + "sensor_limit": -2.0938333330500001, "sensor_limit_warn": null, - "sensor_limit_low": -2.31423684179, + "sensor_limit_low": -2.3142368417900001, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -13965,7 +13965,7 @@ "sensor_index": "67108873", "sensor_type": "vrp", "sensor_descr": "MPU Board 0", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 42, @@ -13989,7 +13989,7 @@ "sensor_index": "67469390", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/1", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 39, @@ -14013,7 +14013,7 @@ "sensor_index": "67469454", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/2", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 41, @@ -14037,7 +14037,7 @@ "sensor_index": "67469582", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/4", - "group": null, + "group": "", "sensor_divisor": 1, "sensor_multiplier": 1, "sensor_current": 40, @@ -14061,13 +14061,13 @@ "sensor_index": "67469390", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/1", - "group": null, + "group": "", "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 3.299, - "sensor_limit": 3.79385, + "sensor_current": 3.2989999999999999, + "sensor_limit": 3.7938499999999999, "sensor_limit_warn": null, - "sensor_limit_low": 2.80415, + "sensor_limit_low": 2.8041499999999999, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -14085,13 +14085,13 @@ "sensor_index": "67469454", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/2", - "group": null, + "group": "", "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 3.285, - "sensor_limit": 3.77775, + "sensor_current": 3.2850000000000001, + "sensor_limit": 3.7777500000000002, "sensor_limit_warn": null, - "sensor_limit_low": 2.79225, + "sensor_limit_low": 2.7922500000000001, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", @@ -14109,13 +14109,13 @@ "sensor_index": "67469582", "sensor_type": "vrp", "sensor_descr": "XGigabitEthernet0/0/4", - "group": null, + "group": "", "sensor_divisor": 1000, "sensor_multiplier": 1, - "sensor_current": 3.284, - "sensor_limit": 3.7766, + "sensor_current": 3.2839999999999998, + "sensor_limit": 3.7766000000000002, "sensor_limit_warn": null, - "sensor_limit_low": 2.7914, + "sensor_limit_low": 2.7913999999999999, "sensor_limit_low_warn": null, "sensor_alert": 1, "sensor_custom": "No", diff --git a/tests/data/vrp_ce12804-entity.json b/tests/data/vrp_ce12804-entity.json index 7c9ffacb21..37233f05ef 100644 --- a/tests/data/vrp_ce12804-entity.json +++ b/tests/data/vrp_ce12804-entity.json @@ -10,11 +10,11 @@ "version": null, "hardware": null, "features": null, - "location": null, "os": "vrp", "type": "network", "serial": null, - "icon": "huawei.svg" + "icon": "huawei.svg", + "location": null } ] }, @@ -28,11 +28,11 @@ "version": "8.150 (V200R002C50SPC800)", "hardware": "Huawei CE12800", "features": null, - "location": "", "os": "vrp", "type": "network", "serial": null, - "icon": "huawei.svg" + "icon": "huawei.svg", + "location": "" } ] } diff --git a/tests/data/vrp_ce12804-withvrf.json b/tests/data/vrp_ce12804-withvrf.json index 5785d5aaf6..fca56bdd66 100644 --- a/tests/data/vrp_ce12804-withvrf.json +++ b/tests/data/vrp_ce12804-withvrf.json @@ -10,11 +10,11 @@ "version": null, "hardware": null, "features": null, - "location": null, "os": "vrp", "type": "network", "serial": null, - "icon": "huawei.svg" + "icon": "huawei.svg", + "location": null } ] }, @@ -28,11 +28,11 @@ "version": "8.150 (V200R002C50SPC800)", "hardware": "Huawei CE12800", "features": null, - "location": "", "os": "vrp", "type": "network", "serial": null, - "icon": "huawei.svg" + "icon": "huawei.svg", + "location": "" } ] }