Updates to hardware/firmware version reporting

.gencode_hash.txt

@@ -1,14 +1,14 @@
-d821da14e66bbcc229c0ad47d7b36e08aaab566a89e6e4f0cc3a6a03578209f1  gencode/docs/config.html
+477bfaa6fe5b2e55a2afaa3c3897e19a090c490f8a14344a84240420289e8ef6  gencode/docs/config.html
 8221d216d08bc6b67f6f081132aa86f78934149bc5be23fe9132eb187d176a86  gencode/docs/envelope.html
-25dcf7a055cd9df0a44144920ddec89383c97af53268e78ff60c892e65f5ef32  gencode/docs/event_discovery.html
-44a33225964713ba8b6fd4661fff52f75dc0e9d11919e1535020dfab7bfc77b7  gencode/docs/event_pointset.html
-5d173e050b2583b442636153559fe3bd2fb26efe85ff6db01cc0123bcff9b266  gencode/docs/event_system.html
+559379abd267e9719a2bee98e56c21301853b6f69bc37fddc501acc57ce7cd63  gencode/docs/event_discovery.html
+987503860562a3971314a98d75890b6c7615fee84bff6bede7010231f469c035  gencode/docs/event_pointset.html
+e3fb2b1a96f6fcb06f5af6cff32829abc825065ed52de81c3d379c8c8070fe09  gencode/docs/event_system.html
 a82821e72af6d0ee35800e6262eb9bb05256309b98aed2dad1a368fd2d6882bb  gencode/docs/index.html
-715451ecedd871a76fedac8ac90ed5c53e12c9ec34796b7cd976637b4a55bdd2  gencode/docs/metadata.html
+1ab355f19f6de50e2c91ba5f05161e0d6347d92f9b70dd96ce4d4188ebdd6d7e  gencode/docs/metadata.html
 741b880216be3743f6747800a042f2dbd89f3b0344c6b0a965f4bc010f03a930  gencode/docs/schema_doc.css
 878ea88206c974f40643c3cc430875f9c4e8c5e3fd6bcd6358bd3eb6d48699a9  gencode/docs/schema_doc.min.js
 7ed934930aee763e0beebc349725ba3909115e8d346bb762f28bcbe745bb163a  gencode/docs/schema_extras.js
-98009226a4219f8770f2fb0e0329e376dfc586b210ac86d4e51dd8d6174b90d3  gencode/docs/state.html
+5ed3aec445c397d50eef8c6d2baa01c8d9b59efaa83640d1d4033c13dca9b044  gencode/docs/state.html
 68f8919d59556c7c781958baaac0b8cc629b6c4ce86e6ffd0171d23536747ec6  gencode/java/udmi/schema/Ancillary.java
 d39d7fe37a41c74a40080af7b0a429d201ab1fdff7444428c4b98eb7b38c332b  gencode/java/udmi/schema/Asset.java
 0825a5cec83003bb0a6488c4ed7010a04ae0d3848ef36fe01bb4e6718ba7b96d  gencode/java/udmi/schema/Aux.java
@@ -18,9 +18,9 @@ d39d7fe37a41c74a40080af7b0a429d201ab1fdff7444428c4b98eb7b38c332b  gencode/java/u
 d2c5b5aae8db27b68104fc83a1f38de0a3f1b5d683f2b13599adf24e96c7d124  gencode/java/udmi/schema/BlobsetConfig.java
 b6ff9b8739a9c3bb6972f73db6fc54f451189c13b273e58bc11cb3d82c74ad40  gencode/java/udmi/schema/BlobsetState.java
 90d6e869087d4dfdc2c29c7f51872e630ad8135542dd432629bf4edac807053a  gencode/java/udmi/schema/CloudMetadata.java
-d7b178ce5b178f4ce651d534314312dc898721b64c2dbbbafe0a834401e20623  gencode/java/udmi/schema/Config.java
+28001569e7902d3aa39aa3749ca08fb8e29460ba97a4b560d266b365bf5f8c46  gencode/java/udmi/schema/Config.java
 3d9a243dcdc6dce31a2b0671d473c60d4cc972087025c7e099f8b4bf85a800da  gencode/java/udmi/schema/DiscoveryConfig.java
-b6f1a52b71e4c64518756b4468821b576adc8209286ef47a94b72fb3b87233d1  gencode/java/udmi/schema/DiscoveryEvent.java
+eb3df3042d3c2008e51c35f35074741ba94a5a7fd590b5f1e59bd30ec19b4c2f  gencode/java/udmi/schema/DiscoveryEvent.java
 b9b1c6dc52c28630021c76d51305cb2fe634c557f3cf9b8e5c8c8abf456e6216  gencode/java/udmi/schema/DiscoveryState.java
 090bbaf1508aa6ca8380af936af990673f300eb5a940c9e8ab94deb64efa2b7b  gencode/java/udmi/schema/Entry.java
 e22684e98a6dd9f213093c4e8293f353cd5faafb66264fc34a06167c6c3833a3  gencode/java/udmi/schema/Envelope.java
@@ -29,33 +29,33 @@ e9f5c77be81486b6b8c6d88f70f2d50583d8c3fafa2ac09ead80f44b8d5e751e  gencode/java/u
 aa0885ca43ab38c7597eacc38b7c512940a1a9fa061abd47d02c28e66b6fd93e  gencode/java/udmi/schema/FamilyDiscoveryConfig.java
 ae4a645f199c8e24b3303463d428ca17af7603ae9ae9238397a6a82e752ab454  gencode/java/udmi/schema/FamilyDiscoveryEvent.java
 0afc15acd72874e5a0c47f546abc0c4569f5bc37838fdcac77bc7bd55cc53a6d  gencode/java/udmi/schema/FamilyDiscoveryState.java
-47eb74677159f66303e85b39c9a73ab24993dc8ceae241ef7566a52fdf814ec7  gencode/java/udmi/schema/Firmware.java
 60a8115ae1acae7c199b63180823198d38ec50d57b48dd85aca1ccc865058f85  gencode/java/udmi/schema/GatewayConfig.java
 4e9a913d5cf47a5901a63ec005115c58884e06c2cd6ba6bb786ffbb7c7fdaf74  gencode/java/udmi/schema/GatewayMetadata.java
 c1f0e51c41fb044e1d1bb5f975e5e686be3fb36eaf716da6ba7d9980897d45a0  gencode/java/udmi/schema/GatewayState.java
 a10ca7383711269fbd2bb5ed8de9438f71673c47dd68de7bbd32bf8ba79913d6  gencode/java/udmi/schema/Level.java
 f53c891932643871f93368cfe797cac6fd4ed0f64e71c893f275cd7184cb8019  gencode/java/udmi/schema/LocalnetConfig.java
 fc2bf2d94a9cbfb600a381c7b3dad66850b2646a388183848e913de1b102a40f  gencode/java/udmi/schema/LocalnetMetadata.java
 2df4ae32d0bbecc21f7c3f6a416a195baa766a6210cfa8abca4a7bb45b9c7961  gencode/java/udmi/schema/Location.java
-0fab3af2aa9435d56c12a493a57e0fd131ded128ffafddd4de228bce682211f4  gencode/java/udmi/schema/Metadata.java
+09b7447c86ae5361019be8f6c12d80465679f5525fc1a4528607642c0d5f035d  gencode/java/udmi/schema/Metadata.java
+a4e8f69100ab678a8236f481c558d677bbaea3e76c853bbd9262113d2a9c031d  gencode/java/udmi/schema/Metrics.java
 5e1c5411fae4d7c47391ceb5d19ae864fcd484df75ac6b6db39fd2d12647dec8  gencode/java/udmi/schema/Physical_tag.java
 0868f0a9beb671dd08f066e7e7e796531fe151307a0b853b1f1a1aafe50ee746  gencode/java/udmi/schema/PointEnumerationEvent.java
 2cca321fb2fbc00d2082fd918062f6b02e8f2dbe1359c0fbb6a3f47a946838c7  gencode/java/udmi/schema/PointPointsetConfig.java
 8f3fc1cdc2dcd3e524863f4675aebabc450a35f5fd1cdc3fd37289b5cab7f2ec  gencode/java/udmi/schema/PointPointsetEvent.java
 09a99eddb418ef56a4744f94a1d15815e5c460c5e2bd0ea2badfc0662986a853  gencode/java/udmi/schema/PointPointsetMetadata.java
 db8d6dd3498019ad12e0f328b6237d07e52f133f8b08858b712611a52c198009  gencode/java/udmi/schema/PointPointsetState.java
 3d973f05d67b53fe25cfa1780e13d3a09fea53e64241d9e4c18734d370004fec  gencode/java/udmi/schema/PointsetConfig.java
-cca2ee160ed60a0407cf98f107bc12a948052bc8915322d59b4067421647d6cf  gencode/java/udmi/schema/PointsetEvent.java
+f3aea029530d0d8c6f50a75f266fd222d3f5ad92004f40675d6a99c906d22c82  gencode/java/udmi/schema/PointsetEvent.java
 7987adebea9103a857493bb7698913d0891fcb4a77cec0e208c655953df82243  gencode/java/udmi/schema/PointsetMetadata.java
 37d1918ba0a79d60497b3ee4827f714054047bfa1e592f95fdd962f00ff6f4ff  gencode/java/udmi/schema/PointsetState.java
 ca2e7566106818ca7e5190c8041eb86f0c9b3251b0bda8c3ea7ce11a0c891a0a  gencode/java/udmi/schema/Position.java
-d9f04c5ce40a5f0045fc4113ed5da9cde354140d70335cf43be68018b53e8477  gencode/java/udmi/schema/Properties.java
-28db2b1637a78c3c43c5668a13d5288b267583082dc583c6d62bdb0e9eafc73b  gencode/java/udmi/schema/State.java
+6ddce136f5e34e7e8c7d101c8a729f1fdd323befdfa52590ebdf0028f970bdf5  gencode/java/udmi/schema/Properties.java
+0a1a025dde88fd46925cbb56f5179ed2803ea97948292809ff328a5201d90a3e  gencode/java/udmi/schema/State.java
 b4ea53b14862fa50403cdfc481d55ea2b2eb5e3b3aae43d54c9181114e8fff04  gencode/java/udmi/schema/SubsystemLocalnetMetadata.java
-cf408aaba1934447f4be520e2486301c0e9a3f3741137975e1161113c193951a  gencode/java/udmi/schema/SystemConfig.java
-bc86dbf424f67009b80f1a9a4b3d856524ed90f66205f5556232c620063508c6  gencode/java/udmi/schema/SystemEvent.java
+6b8b054c5fa2baef5163d42cd6bf1b0aeb4d07aa881529d81f4ae7dfa4c2906e  gencode/java/udmi/schema/SystemConfig.java
+8075f2133463e55ac24fccf9391c94698c580b860ad1a0901d5346a2f369030b  gencode/java/udmi/schema/SystemEvent.java
 c46848327791cec1f1e62dbee2ad66951af7f61ed3c56eeaa8e563774e305bf4  gencode/java/udmi/schema/SystemMetadata.java
-6f34676b4827b87fd120b33db0c98d125ecd0430f6d96a87b3bca5277fad5ff8  gencode/java/udmi/schema/SystemState.java
+451217e2cce0ae9224a86f35b3bdea14b36658efe6f94f4a2dff4f4b1dc51cf7  gencode/java/udmi/schema/SystemState.java
 27d6b50dc51b373d24a701728b4d43d31fe841a9a1d77fe3e45dac332674c308  gencode/java/udmi/schema/TargetTestingMetadata.java
 a77e801f3b07cd8b7042adfe8e5e62d7a83b63a1b449a356fa13c846811ab576  gencode/java/udmi/schema/TestingMetadata.java
 3b5a12c57a8898b320fe5bc2e4855493d8c3c0ebd6656ed7bf8a0da226f4e741  gencode/python/udmi/schema/__init__.py
@@ -69,7 +69,7 @@ b461bdc24310ef972faf579b5be577b5af67fb0977d6afb4c42955211b26e3d5  gencode/python
 30a3402a54386032928bda5b9e60e5fd9ac47c53b4ffc5679fe24d24901ed660  gencode/python/udmi/schema/config_localnet.py
 f816f18ba2e9594a351b040425f4efe2f1f0f654307ac8213dc7603fe1402814  gencode/python/udmi/schema/config_pointset.py
 3f23e78163fdc4a2638b2691fdf3f45f1547e8f9b605073339b16e76d894d401  gencode/python/udmi/schema/config_pointset_point.py
-b92059568fc9f8472ea9e01fa96ca4b986e295379ea2c002c02cd71a41683bbb  gencode/python/udmi/schema/config_system.py
+1c178f298884d66c72b295319f3e29b4178b0eaf5201aebd93ba80699e7466d5  gencode/python/udmi/schema/config_system.py
 631371489cb1275517bebcc4040cbc655d18ca147ab540701b3fd9cedba138c5  gencode/python/udmi/schema/envelope.py
 1eb9019b9d0b4ff7de2df8beb625a4f89292d636ece0c02f160495c537bd6c2c  gencode/python/udmi/schema/event.py
 f74b62b11bbbd37ea8968ead811dc2534c4996a3dcfd3671807988b7874de347  gencode/python/udmi/schema/event_discovery.py
@@ -78,7 +78,7 @@ ad33b91a7fabb4eed7e49c30a983a2106c96330facbe0f376f94d06e2263d6d0  gencode/python
 266c36a6174c959017894de6051f7d6071ac59ed3f049df9cbb49b894c11c84e  gencode/python/udmi/schema/event_discovery_point.py
 ddf849bfeb2b87d071cefd5e6feacabc57375a7fff6d72b6d42ffb89f33c859b  gencode/python/udmi/schema/event_pointset.py
 44aff1bc930dbdbadd51ac3fe0e7d9c83ad84a6a9f9d1c809b3fce66cbcd5e00  gencode/python/udmi/schema/event_pointset_point.py
-23f790f5d6b3802d3806de65e8277dd1b624245d51bc2a83e2027d96dacaa201  gencode/python/udmi/schema/event_system.py
+a27b3b2ace3f301b5fa08a3763f792158f9725a5fbed5cd7b5fac8a6701080e4  gencode/python/udmi/schema/event_system.py
 b1271f8c9fb880a7b77e17d8e8923cf11966eaa9cbee2905e17b4e3355843b3e  gencode/python/udmi/schema/metadata.py
 c5434d7d243b1c14f948129ec4c05e7545801e56112f44523ad335878b26e651  gencode/python/udmi/schema/metadata_cloud.py
 4489d99f73617e9fcb340f5b249df67ebfb9b3340ef9d33c61fac789a62fdac9  gencode/python/udmi/schema/metadata_gateway.py
@@ -98,4 +98,4 @@ a5a914cb5d74c29671a4d29dfa6c700b3fec27d695d607e28814ad31307e82da  gencode/python
 fc40816c3483ede5ad4e4a74a8b494a3582085cdd1f49da4155e40f6ae7dae32  gencode/python/udmi/schema/state_gateway.py
 8bac9baabe83e2bf682b6376fee1eba2564a34c867f47f0c73eda44d6b3d8bb1  gencode/python/udmi/schema/state_pointset.py
 837ecc89c477abe3a1faf837733ca05475774891b55353d84ca231d90a1fbf31  gencode/python/udmi/schema/state_pointset_point.py
-adaf946039dd6ebe29a2f2efc1441ba5509156fe4bbad08492d572e106adc0a6  gencode/python/udmi/schema/state_system.py
+c7e5245ac7fb8a17691e8bd5b71ff47b6b586f33b01e5c0150706598ee58aed5  gencode/python/udmi/schema/state_system.py

.github/workflows/testing.yml

@@ -19,8 +19,10 @@ jobs:
           sudo apt-get install openjdk-11-jdk
           sudo update-alternatives --set java /usr/lib/jvm/adoptopenjdk-11-hotspot-amd64/bin/java
       - name: Running unit tests
+        if: ${{ always() }}
         run: bin/test_schema -p
       - name: Run registrar validation
+        if: ${{ always() }}
         run: bin/test_registrar
 
   ui:

bin/test_schema

@@ -89,7 +89,7 @@ for subset in $subsets; do
           reltest=$reldir:$(realpath --relative-to $testdir $testpath)
         fi
         (
-            (cd $schemadir; java -jar -Dnashorn.args=--no-deprecation-warning $jarfile -- $schemaname files $reltest --) 2> $output || true
+            (cd $schemadir; java -jar -Dnashorn.args=--no-deprecation-warning $jarfile -- $schemaname files $reltest --) || true
             if [ $force == y ]; then
                 diff $output $expected || echo Updating $expected && cp $output $expected
             else

etc/validator.out

@@ -18,6 +18,7 @@ While converting to json node: 2 schema violations found
   2 schema violations found
     instance value ("states") not found in enum (possible values: ["update","discovery","system","gateway","localnet","metadata","pointset","blobset"])
     instance value ("update") not found in enum (possible values: ["event","command","state","config"])
-While converting to json node: 1 schema violations found
-  1 schema violations found
+While converting to json node: 2 schema violations found
+  2 schema violations found
     object has missing required properties (["last_config"])
+    object has missing required properties (["version"])