From 2f39917f3ba8ad4b90548007344d01bb475b9a46 Mon Sep 17 00:00:00 2001 From: Tony Murray Date: Tue, 25 Apr 2023 20:53:17 -0500 Subject: [PATCH] Fix up icr-os outdated test data (#15006) * Fix up icr-os outdated test data * fix sensor data too --- tests/data/icr-os.json | 61 +++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 34 deletions(-) diff --git a/tests/data/icr-os.json b/tests/data/icr-os.json index 0ecfe26fb7..a8278a86ba 100644 --- a/tests/data/icr-os.json +++ b/tests/data/icr-os.json @@ -10,11 +10,11 @@ "version": "6.3.6 (2022-06-16)", "hardware": "LR77-v2", "features": null, + "location": "", "os": "icr-os", "type": "network", "serial": "1234567", - "icon": "advantech.svg", - "location": "" + "icon": "advantech.svg" } ] }, @@ -36,7 +36,6 @@ "ifSpeed": null, "ifSpeed_prev": null, "ifConnectorPresent": null, - "ifPromiscuousMode": null, "ifOperStatus": "up", "ifOperStatus_prev": null, "ifAdminStatus": null, @@ -46,15 +45,11 @@ "ifType": "ethernetCsmacd", "ifAlias": "eth0", "ifPhysAddress": null, - "ifHardType": null, "ifLastChange": 0, - "ifVlan": "", + "ifVlan": null, "ifTrunk": null, - "counter_in": null, - "counter_out": null, "ignore": 0, "disabled": 0, - "detailed": 0, "deleted": 0, "pagpOperationMode": null, "pagpPortState": null, @@ -141,7 +136,6 @@ "ifSpeed": null, "ifSpeed_prev": null, "ifConnectorPresent": null, - "ifPromiscuousMode": null, "ifOperStatus": "down", "ifOperStatus_prev": null, "ifAdminStatus": null, @@ -151,15 +145,11 @@ "ifType": "other", "ifAlias": "mwan0", "ifPhysAddress": null, - "ifHardType": null, "ifLastChange": 0, - "ifVlan": "", + "ifVlan": null, "ifTrunk": null, - "counter_in": null, - "counter_out": null, "ignore": 0, "disabled": 0, - "detailed": 0, "deleted": 0, "pagpOperationMode": null, "pagpPortState": null, @@ -250,7 +240,6 @@ "ifSpeed": 100000000, "ifSpeed_prev": null, "ifConnectorPresent": null, - "ifPromiscuousMode": null, "ifOperStatus": "up", "ifOperStatus_prev": "up", "ifAdminStatus": "up", @@ -260,15 +249,11 @@ "ifType": "ethernetCsmacd", "ifAlias": "eth0", "ifPhysAddress": "aabbccddeeff", - "ifHardType": null, "ifLastChange": 0, - "ifVlan": "", + "ifVlan": null, "ifTrunk": null, - "counter_in": null, - "counter_out": null, "ignore": 0, "disabled": 0, - "detailed": 0, "deleted": 0, "pagpOperationMode": null, "pagpPortState": null, @@ -355,7 +340,6 @@ "ifSpeed": 0, "ifSpeed_prev": null, "ifConnectorPresent": null, - "ifPromiscuousMode": null, "ifOperStatus": "down", "ifOperStatus_prev": "down", "ifAdminStatus": "down", @@ -365,15 +349,11 @@ "ifType": "other", "ifAlias": "mwan0", "ifPhysAddress": null, - "ifHardType": null, "ifLastChange": 0, - "ifVlan": "", + "ifVlan": null, "ifTrunk": null, - "counter_in": null, - "counter_out": null, "ignore": 0, "disabled": 0, - "detailed": 0, "deleted": 0, "pagpOperationMode": null, "pagpPortState": null, @@ -520,6 +500,7 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, + "rrd_type": "GAUGE", "state_name": "CONEL-IO-MIB::ioBin0" }, { @@ -544,6 +525,7 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, + "rrd_type": "GAUGE", "state_name": "CONEL-IO-MIB::ioOut0" }, { @@ -568,6 +550,7 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, + "rrd_type": "GAUGE", "state_name": "CONEL-STATUS-MIB::statusRTCBattery" }, { @@ -592,6 +575,7 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, + "rrd_type": "GAUGE", "state_name": null }, { @@ -616,6 +600,7 @@ "entPhysicalIndex_measured": null, "sensor_prev": null, "user_func": null, + "rrd_type": "GAUGE", "state_name": null } ], @@ -695,7 +680,8 @@ "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.30140.4.41.0\"]" + "sensor_oids": "[\".1.3.6.1.4.1.30140.4.41.0\"]", + "rrd_type": "GAUGE" }, { "sensor_deleted": 0, @@ -716,7 +702,8 @@ "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.30140.4.32.0\"]" + "sensor_oids": "[\".1.3.6.1.4.1.30140.4.32.0\"]", + "rrd_type": "GAUGE" }, { "sensor_deleted": 0, @@ -737,7 +724,8 @@ "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.30140.4.33.0\"]" + "sensor_oids": "[\".1.3.6.1.4.1.30140.4.33.0\"]", + "rrd_type": "GAUGE" }, { "sensor_deleted": 0, @@ -758,7 +746,8 @@ "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.30140.4.30.0\"]" + "sensor_oids": "[\".1.3.6.1.4.1.30140.4.30.0\"]", + "rrd_type": "GAUGE" } ] }, @@ -783,7 +772,8 @@ "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.30140.4.41.0\"]" + "sensor_oids": "[\".1.3.6.1.4.1.30140.4.41.0\"]", + "rrd_type": "GAUGE" }, { "sensor_deleted": 0, @@ -804,7 +794,8 @@ "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.30140.4.32.0\"]" + "sensor_oids": "[\".1.3.6.1.4.1.30140.4.32.0\"]", + "rrd_type": "GAUGE" }, { "sensor_deleted": 0, @@ -825,7 +816,8 @@ "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.30140.4.33.0\"]" + "sensor_oids": "[\".1.3.6.1.4.1.30140.4.33.0\"]", + "rrd_type": "GAUGE" }, { "sensor_deleted": 0, @@ -846,7 +838,8 @@ "sensor_custom": "No", "entPhysicalIndex": null, "entPhysicalIndex_measured": null, - "sensor_oids": "[\".1.3.6.1.4.1.30140.4.30.0\"]" + "sensor_oids": "[\".1.3.6.1.4.1.30140.4.30.0\"]", + "rrd_type": "GAUGE" } ] }