Merge branch 'master' into documentation

grafnu · Dec 9, 2024 · 370b0dd · 370b0dd
2 parents d7bfb07 + 3515783
commit 370b0dd
Show file tree

Hide file tree

Showing 282 changed files with 18,102 additions and 16,776 deletions.
diff --git a/.gencode_hash.txt b/.gencode_hash.txt
@@ -1,6 +1,6 @@
 433b3c972a2d4de6f54cf32f00f918fa7e3fd80d4bf29a2c7bee182f532bc660  gencode/docs/commands_discovery.html
 158e714e54b2a6d0b90bfca00d178369b04508dc4fa84a979690a813ca2dd724  gencode/docs/commands_mapping.html
-b6ea4cd4f4b14b7af3c02b429ebbd27c1c8224e167b462d469534db5568ad19e  gencode/docs/config.html
+975d8d9a6bba216543301255d1b8d4818efed8867f72ad532a1256f71337d836  gencode/docs/config.html
 22bfb3fd7c0e73dac4cbd830aa7983714917ec6da813f6bf5768ce3aa9786fb2  gencode/docs/config_mapping.html
 f9a67145928e192687c7984c82c2d39450bf6d0d4fd2f95f397e60e8ac619da2  gencode/docs/configuration_endpoint.html
 8ac76a1b8c0c62f19be8cafa36b1f58bc03f3f129e10def91566d0b9172b0c82  gencode/docs/configuration_execution.html
@@ -14,7 +14,7 @@ c3bae844432d172033bc416e623fecee7608efd01d916b7eaee96252932c552a  gencode/docs/e
 d001ca2ede044a183ef25617e6d7bd87840695d0b2aeb03a0d3d7b8d7bbebe42  gencode/docs/events_system.html
 e59e52110ec12d7b82351abfc28c31255c57e2af637adf3fa5cbb7e3b26b49fe  gencode/docs/events_udmi.html
 e3683cb4561b6dda5703cb659fd6a8f12242725de389709a12eb45f146cbb295  gencode/docs/events_validation.html
-93ee95500d565209e18d74da17a936621616337ad674932f77c6aef8693973cb  gencode/docs/metadata.html
+95786b8ba5445d49744bd4e649a035d42d85291fcc4d3bd1b6cc88f688532877  gencode/docs/metadata.html
 424f8e053c5a7002c4117a70bd84731e3bb6e0f696b607aba412c2aee44d9f91  gencode/docs/monitoring.html
 3421bdc8c63872fb47795993a2d21da0d03a7ec4e6de0ac7cfe7a48ef60e743b  gencode/docs/persistent_device.html
 5d039d607af9ec75ee552dfe36b16c702687ea16f5663f41fc49b4533b86e00d  gencode/docs/properties.html
@@ -24,7 +24,7 @@ eeafb6e89a6c43816cfcb26244a95615a4ee75966e1c015cae5a13b6cfcb0078  gencode/docs/r
 878ea88206c974f40643c3cc430875f9c4e8c5e3fd6bcd6358bd3eb6d48699a9  gencode/docs/schema_doc.min.js
 7ed934930aee763e0beebc349725ba3909115e8d346bb762f28bcbe745bb163a  gencode/docs/schema_extras.js
 0f16008af7116a182322736046b05c2718ac8b1f2cd755a60d28c9cfaeb6a8a9  gencode/docs/site_metadata.html
-bf92d6ef696d04ece66ee2e6d5542a54528a9077580d9caa9065bbf444f596f7  gencode/docs/state.html
+1bbcbf2d1ec1bf4554846b1daf09fa09c08dd967fa1f91ebec93027662529a31  gencode/docs/state.html
 b2398e7f9e352c47867e38f97168f3eb88e23280c7dd576f13e038c8c3f714c9  gencode/docs/state_mapping.html
 b8ff4cdb4b79449166b1c6e09ac0e58273ae62865b47bf943fdd365739c62a4c  gencode/docs/state_validation.html
 a9ac875562f5f5431e6f090cd63950e452c2fff43a221561929a0747e775964d  gencode/java/udmi/schema/Adjunct.java
@@ -60,16 +60,16 @@ ec863d0b69880bd2c3030abcdce1d2b8992a475908ead979cc30722b25c1ead2  gencode/java/u
 a83286d885ec79ccae1eea966e3b7caf99558c2f26165f207707ad4c5178acb4  gencode/java/udmi/schema/DiscoveryConfig.java
 d00b5aac8febbc0621fdff5c90e39dfa19daa16acc14d95415741c9ef7379621  gencode/java/udmi/schema/DiscoveryEvents.java
 1a04079116f4032b17108e873719bbb2c60c19f392136e7c906122199b472227  gencode/java/udmi/schema/DiscoveryModel.java
-4337500c28669631efaf01dd98d9156e2514e44b804142e6707a92550b8e3ba8  gencode/java/udmi/schema/DiscoveryState.java
+b41f59d0c1aa74bb9abbdc7525d726f45a4ba8df3866c2dd40458601ffab60fb  gencode/java/udmi/schema/DiscoveryState.java
 7019b8a1522261a69d708e2e7725b8bc44510c5c80f5c056543af2b7728bfa42  gencode/java/udmi/schema/Electricity.java
 695ba089a30cbcb6b101147031e0546cef728322bad349392462cb57688d473a  gencode/java/udmi/schema/EndpointConfiguration.java
 d2e7afd6e1a9250480144c114ee8877afb9b0dd7048495fe96a821d9e6c80475  gencode/java/udmi/schema/Entry.java
 e0ca9b52b4cfb4be9d6c911a549a9f2f69f5f948f05a9e3a7b224c988f932ae3  gencode/java/udmi/schema/Envelope.java
 4163478ed17191461b0a65abd11c4ddf912cbc104f040a734efd290306fab7b7  gencode/java/udmi/schema/Events.java
 1960750d0b8f2e18ea02230a51b6380cf555e21de46d6d38d649e626660ba0e2  gencode/java/udmi/schema/ExecutionConfiguration.java
 40686ad8c86447e5f760b6503c26afb6c404950c4458272d9d3fb874ab8ee624  gencode/java/udmi/schema/FamilyDiscovery.java
-b4e01d9633db88501d27cd9d1ccd209520137b1586a1d4f500f490800aa787bb  gencode/java/udmi/schema/FamilyDiscoveryConfig.java
-dc1affcb39be03fc5b974aa5216d7d3b692d5bcea292724c33d3323dfe03b771  gencode/java/udmi/schema/FamilyDiscoveryModel.java
+22bee7de4040a2ba00163df8c81d43923912b76d8590649e5a8a4c83fb3e5335  gencode/java/udmi/schema/FamilyDiscoveryConfig.java
+56a08262985bff885a11ff686e8f2fcb8d2f6ed258c03aada576693740fc3f61  gencode/java/udmi/schema/FamilyDiscoveryModel.java
 c242fa94f3cbbfc801c96fa1e9409c8ec84db2a5d0b3a861acff0fc85d7976c7  gencode/java/udmi/schema/FamilyDiscoveryState.java
 2145077e0e2f43d6a4d9c54a3b92b952ee47bbf86866f6052807a70987cefc28  gencode/java/udmi/schema/FamilyLocalnetConfig.java
 9767387da6ee90f8c73b23f92e52aa0649f5bcd55d52e4084925102a818dc518  gencode/java/udmi/schema/FamilyLocalnetModel.java
@@ -109,7 +109,7 @@ d48a48484965295327ef553a4f8552c44b9345224d7dbb847877c68c1e1b307e  gencode/java/u
 a9250e3208649032e954be0ce63e55ed7b50575a07a821a6ac725c7f10c8cb4b  gencode/java/udmi/schema/PointsetConfig.java
 f4735049f0c27c3f0669d8cf2d6dda6e25dc7d20cef598d5677e3a72943ff019  gencode/java/udmi/schema/PointsetEvents.java
 235e6fbd00880e36328fba8f099f788c85dcaaa94cf49ca53fa9b11429a8dc1a  gencode/java/udmi/schema/PointsetModel.java
-3940260206747f7b05bef598aec4838224ad5e32ef9faaacde43b3f33af5183c  gencode/java/udmi/schema/PointsetState.java
+c73ad6dde0db8a520f3fee5a563c55a79fc7e6d1cd7875723b10c3d34036a46b  gencode/java/udmi/schema/PointsetState.java
 d874679ab365897a23bc4009d254470542cc5f865759d84e0b777554e756199c  gencode/java/udmi/schema/PointsetSummary.java
 9637f95e8a1185b1b028308a8caa2ca5a78cb46ae97f9cc11e2731066129540e  gencode/java/udmi/schema/Position.java
 d87deaba67bb3272c528e3491d378bde059b626964a4a2aed15f5643305c2463  gencode/java/udmi/schema/Properties.java
@@ -196,7 +196,7 @@ dc4bef0026ac8d9b0e5b13fe675b16df889e38671a7946371fe47d0443d82e4d  gencode/python
 8a7736e5869c810113208cd97a14401d0fb0a3c07acc6e20fc877f49dbb961a2  gencode/python/udmi/schema/model_cloud.py
 2ec91522178789a3d5ec27ad8ed13a94b8619139359dc3dcad9601b9adc1582d  gencode/python/udmi/schema/model_cloud_config.py
 387e3f68dad9ddd6211a4e10d25c35026a4c0083b606819fdb4e338be9e135ca  gencode/python/udmi/schema/model_discovery.py
-cead43bbefcc2d957bf8316560edf849d74df9270f9473d87c2a3bdf61f08332  gencode/python/udmi/schema/model_discovery_family.py
+ab4377d772bf11fa064ce74504af753a4cfac507a7c8f807b682f972353dbc5c  gencode/python/udmi/schema/model_discovery_family.py
 bef91798566798ec70b2fe10ae52c909090de9095b92e2567da3cbdcec29cd2c  gencode/python/udmi/schema/model_features.py
 72d17ba53c9d537720bb0ddf24d615b838fc2b9bb2a5c288742a8d82c77bd85d  gencode/python/udmi/schema/model_gateway.py
 3e2f7eea6bc5f56b416d883f1da7336f479ab2f88ae47d174d22b7941ac9cfc3  gencode/python/udmi/schema/model_localnet.py
@@ -217,7 +217,7 @@ d42bae60bd667cda893d3670896ed087f20df629635949cf418ee9be2e975347  gencode/python
 e604cf0280fe772de5f4e5ecf10dc6c564b6177eeff9cd9fb8b385af8fe10a95  gencode/python/udmi/schema/state.py
 4a908cee3fb8afb559bcbfa594e57dbc515a35e4468e02600751b2fcce05a238  gencode/python/udmi/schema/state_blobset.py
 182e07b534403dcc121d980672e41b0fa2ee55c4da1f5c56f0dad5d599450c80  gencode/python/udmi/schema/state_blobset_blob.py
-8c6fc5fd63ab50768cb3662228ed893eb8b9d563cd062efaed12f5079a652d0c  gencode/python/udmi/schema/state_discovery.py
+6dccbcaf4d3c208a51d9d399fe12df2bd2a6853afc14b0100c53faa9bcc247b0  gencode/python/udmi/schema/state_discovery.py
 35d21c00848411f268f85918c6b120ec126f6c2e2c41489984b263d23abeec37  gencode/python/udmi/schema/state_discovery_family.py
 b492296db941daf0c104e53fe5bc0030b89a1f1167db2601f5c6a2f0075aa6cf  gencode/python/udmi/schema/state_gateway.py
 09ef5dc99116cf84b987a3cb014bdeb74577ccc04a4fc6b4278c8cfab9b180f4  gencode/python/udmi/schema/state_localnet.py

diff --git a/docs/specs/sequences/generated.md b/docs/specs/sequences/generated.md
@@ -259,7 +259,7 @@ Test passed.
 Check enumeration of device features
 
 1. Update config before enumeration not active
-    * Add `discovery` = { "depths": { "features": `entries` } }
+    * Add `discovery.depths` = { "features": `entries` }
 1. Wait for enumeration not active
 1. Update config before matching enumeration generation
     * Add `discovery.generation` = `generation start time`
@@ -279,7 +279,7 @@ Test passed.
 Check enumeration of nothing at all
 
 1. Update config before enumeration not active
-    * Add `discovery` = { "depths": {  } }
+    * Add `discovery.depths` = {  }
 1. Wait for enumeration not active
 1. Update config before matching enumeration generation
     * Add `discovery.generation` = `generation start time`

diff --git a/pubber/config/checkstyle/checkstyle.xml → etc/checkstyle.xml b/pubber/config/checkstyle/checkstyle.xml → etc/checkstyle.xml
@@ -48,6 +48,7 @@
 
   <module name="SuppressWarningsFilter"/>
   <module name="TreeWalker">
+    <module name="UnusedImports"/>
     <module name="SuppressWarningsHolder"/>
     <module name="OuterTypeFilename"/>
     <module name="IllegalTokenText">

diff --git a/etc/validator.out b/etc/validator.out
@@ -2,6 +2,7 @@ sites/udmi_site_model/out/devices/AHU-1/config.json
 sites/udmi_site_model/out/devices/AHU-1/events_pointset.json
 sites/udmi_site_model/out/devices/AHU-1/events_system.json
 sites/udmi_site_model/out/devices/AHU-1/persistent_data.json
+sites/udmi_site_model/out/devices/AHU-1/state_discovery.json
 sites/udmi_site_model/out/devices/AHU-1/state.json
 sites/udmi_site_model/out/devices/AHU-1/state_localnet.json
 sites/udmi_site_model/out/devices/AHU-1/state_pointset.json
@@ -26,6 +27,7 @@ sites/udmi_site_model/out/devices/GAT-123/events_mapping.json
 sites/udmi_site_model/out/devices/GAT-123/events_pointset.json
 sites/udmi_site_model/out/devices/GAT-123/events_system.json
 sites/udmi_site_model/out/devices/GAT-123/persistent_data.json
+sites/udmi_site_model/out/devices/GAT-123/state_discovery.json
 sites/udmi_site_model/out/devices/GAT-123/state_gateway.json
 sites/udmi_site_model/out/devices/GAT-123/state.json
 sites/udmi_site_model/out/devices/GAT-123/state_localnet.json
@@ -113,6 +115,29 @@ sites/udmi_site_model/out/devices/AHU-1/events_system.out
   } ]
 }
 ::::::::::::::
+sites/udmi_site_model/out/devices/AHU-1/state_discovery.out
+::::::::::::::
+{
+  "timestamp" : "REDACTED_TIMESTAMP",
+  "version" : "1.5.2",
+  "sub_folder" : "discovery",
+  "sub_type" : "state",
+  "status" : {
+    "message" : "Timestamp skew REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold",
+    "detail" : "state_discovery: Timestamp skew REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold REDACTED_ERROR",
+    "category" : "validation.device.schema",
+    "timestamp" : "REDACTED_TIMESTAMP",
+    "level" : 500
+  },
+  "errors" : [ {
+    "message" : "Timestamp skew REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold",
+    "detail" : "state_discovery: Timestamp skew REDACTED_DURATION (REDACTED_TIMESTAMP to REDACTED_TIMESTAMP) exceeds REDACTED_DURATION threshold REDACTED_ERROR",
+    "category" : "validation.device.schema",
+    "timestamp" : "REDACTED_TIMESTAMP",
+    "level" : 500
+  } ]
+}
+::::::::::::::
 sites/udmi_site_model/out/devices/AHU-1/state_localnet.out
 ::::::::::::::
 {
@@ -573,6 +598,22 @@ sites/udmi_site_model/out/devices/GAT-123/events_system.out
   "errors" : [ ]
 }
 ::::::::::::::
+sites/udmi_site_model/out/devices/GAT-123/state_discovery.out
+::::::::::::::
+{
+  "timestamp" : "REDACTED_TIMESTAMP",
+  "version" : "1.5.2",
+  "sub_folder" : "discovery",
+  "sub_type" : "state",
+  "status" : {
+    "message" : "Successful validation",
+    "category" : "validation.device.receive",
+    "timestamp" : "REDACTED_TIMESTAMP",
+    "level" : 200
+  },
+  "errors" : [ ]
+}
+::::::::::::::
 sites/udmi_site_model/out/devices/GAT-123/state_gateway.out
 ::::::::::::::
 {

diff --git a/gencode/docs/config.html b/gencode/docs/config.html