Rebase

faucetsdn · Mar 21, 2022 · b33af9f · b33af9f
1 parent 6100886
commit b33af9f
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 7 deletions.
diff --git a/tests/config.tests/example.json b/tests/config.tests/example.json
@@ -2,6 +2,7 @@
   "version": 1,
   "timestamp": "2018-08-26T21:39:29.364Z",
   "system": {
+    "metrics_rate_sec": 10,
     "min_loglevel": 400
   },
   "pointset": {

diff --git a/tests/event_system.tests/metrics.json b/tests/event_system.tests/metrics.json
@@ -0,0 +1,10 @@
+{
+  "version": 1,
+  "timestamp": "2018-08-26T21:39:29.364Z",
+  "metrics": {
+    "restart_count": 10,
+    "mem_total_mb": 250164.88,
+    "mem_free_mb": 169104.33,
+    "cpu_usage": 1.00
+  }
+}
diff --git a/tests/event_system.tests/metrics.out b/tests/event_system.tests/metrics.out
diff --git a/tests/state.tests/gateway.json b/tests/state.tests/gateway.json
@@ -2,9 +2,22 @@
   "version": 1,
   "timestamp": "2018-08-26T21:39:29.364Z",
   "system": {
-    "make_model": "ACME Gateway v2",
-    "firmware": {
-      "version": "3.2a"
+    "hardware": {  // Fixed set of keys with arbitrary values indicating hardware items.
+      "make": "ACME",
+      "model": "Gateway",
+      "sku": "A9BB-F",
+      "rev": "2183147c"
+    },
+    "software": {  // Keys and expected values defined by hardware type lookup.
+      "firmware": "3.2a",
+      "baseband": "1287ab787e98df01",
+      "application": "4.13.0.347 (4130-001) D",
+      "python": "3.8",
+      "monkey_rabbits": "These are all arbitrary key/value pairs"
+    },
+    "config": {  // Keys defined by hardwre type lookup, values are unique per device.
+      "wpa_key": "ab7879e2873c871e",
+      "iot_config": "cc8d93e8f87a7ec9"
     },
     "serial_no": "182732142",
     "last_config": "2018-08-26T21:49:29.364Z",

diff --git a/tests/state.tests/writeback.json b/tests/state.tests/writeback.json
@@ -25,17 +25,17 @@
       "entryway_lock": {
         "value_state": "failure",
         "status": {
-          "message": "Failure to confirm point",
-          "category": "state.pointset.points.config.failure",
+          "message": "Point entryway_lock failed to confirm",
+          "category": "pointset.points.set_value.failure",
           "timestamp": "2018-08-26T21:39:28.364Z",
           "level": 600
         }
       },
       "scale_sensor": {
         "value_state": "invalid",
         "status": {
-          "message": "Point is not writable",
-          "category": "state.pointset.points.config.invalid",
+          "message": "Point scale_sensor is not writeable",
+          "category": "pointset.points.set_value.invalid",
           "timestamp": "2018-08-26T21:39:28.364Z",
           "level": 600
         }