Clean up discovery schema and some validation (faucetsdn#992)

.gencode_hash.txt

@@ -1,21 +1,21 @@
 433b3c972a2d4de6f54cf32f00f918fa7e3fd80d4bf29a2c7bee182f532bc660  gencode/docs/commands_discovery.html
 158e714e54b2a6d0b90bfca00d178369b04508dc4fa84a979690a813ca2dd724  gencode/docs/commands_mapping.html
-fb876b8f7bfdccf156d751efddf2660a7a7ab5585e89be0f82c59f7a61e68d4c  gencode/docs/config.html
+b6ea4cd4f4b14b7af3c02b429ebbd27c1c8224e167b462d469534db5568ad19e  gencode/docs/config.html
 22bfb3fd7c0e73dac4cbd830aa7983714917ec6da813f6bf5768ce3aa9786fb2  gencode/docs/config_mapping.html
 f9a67145928e192687c7984c82c2d39450bf6d0d4fd2f95f397e60e8ac619da2  gencode/docs/configuration_endpoint.html
 8ac76a1b8c0c62f19be8cafa36b1f58bc03f3f129e10def91566d0b9172b0c82  gencode/docs/configuration_execution.html
 ed7a8b71e2a0b002151a1a5fa0c038f1af811f7567250c724ac3c4b245ccc6b4  gencode/docs/configuration_pod.html
 1bcbfda7922a7c2d3aa17944b4637124d90940c0bc8db3d36995914873daa341  gencode/docs/configuration_pubber.html
 f24d15e549f1b143b50d6011f2f7fd03286e1cd128a3e25591195b25f8efc472  gencode/docs/data_template.html
-45d39c61ce39afc0d14f3dc99a93947587d63999cd373cb44b63ce8f576c6e7e  gencode/docs/events.html
-45f60d2b63951448dded8c9c170913af428e50e8b4cff2143c97304332077df6  gencode/docs/events_discovery.html
+d09362ab71f2949015bd69ce19598cf56a4173f27777c620581a977797b703c6  gencode/docs/events.html
+6f4e875a72ff9ef60622a38eee2d9b81b628f51ff5fc0aa5057ab6227610db26  gencode/docs/events_discovery.html
 65858e981eaad27e41fd7f64aae7d6a82d4519e798145eb10898e59cead517c3  gencode/docs/events_mapping.html
 c3bae844432d172033bc416e623fecee7608efd01d916b7eaee96252932c552a  gencode/docs/events_pointset.html
-eed6ae125d94cf1986de96c210b0937b9c7b199724839f43fce3b357b057f8be  gencode/docs/events_system.html
+d001ca2ede044a183ef25617e6d7bd87840695d0b2aeb03a0d3d7b8d7bbebe42  gencode/docs/events_system.html
 e59e52110ec12d7b82351abfc28c31255c57e2af637adf3fa5cbb7e3b26b49fe  gencode/docs/events_udmi.html
 e3683cb4561b6dda5703cb659fd6a8f12242725de389709a12eb45f146cbb295  gencode/docs/events_validation.html
 3e02bab5ef46438c99f20049f30f8dd4428530b6036aa20f29a8a3964ac2b580  gencode/docs/metadata.html
-76f3516867ce60ae3e65f483a5319786eef6f3c3781c2b310d860ec5edaec490  gencode/docs/monitoring.html
+424f8e053c5a7002c4117a70bd84731e3bb6e0f696b607aba412c2aee44d9f91  gencode/docs/monitoring.html
 3421bdc8c63872fb47795993a2d21da0d03a7ec4e6de0ac7cfe7a48ef60e743b  gencode/docs/persistent_device.html
 5d039d607af9ec75ee552dfe36b16c702687ea16f5663f41fc49b4533b86e00d  gencode/docs/properties.html
 16512c8cc60e4f1a0e01555f3fb6c8a49d3f2b609275a8dc9e62f38fa7b404ca  gencode/docs/query_cloud.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
-12a32a1555e58e6ba35566e6613eea5f9b70f80a02d58146ad250acb830cf378  gencode/docs/state.html
+bf92d6ef696d04ece66ee2e6d5542a54528a9077580d9caa9065bbf444f596f7  gencode/docs/state.html
 b2398e7f9e352c47867e38f97168f3eb88e23280c7dd576f13e038c8c3f714c9  gencode/docs/state_mapping.html
 b8ff4cdb4b79449166b1c6e09ac0e58273ae62865b47bf943fdd365739c62a4c  gencode/docs/state_validation.html
 a9ac875562f5f5431e6f090cd63950e452c2fff43a221561929a0747e775964d  gencode/java/udmi/schema/Adjunct.java
@@ -58,7 +58,7 @@ fd289a9a132a880bf0a14b80ed082ab1dcd77caab54175f8d6ccfc381d2d21ab  gencode/java/u
 ec863d0b69880bd2c3030abcdce1d2b8992a475908ead979cc30722b25c1ead2  gencode/java/udmi/schema/Dimension.java
 09c9d674ffdde05f00878924a00ef81dc18d1135d5969e8ab9a8db80038198b7  gencode/java/udmi/schema/DiscoveryCommand.java
 a83286d885ec79ccae1eea966e3b7caf99558c2f26165f207707ad4c5178acb4  gencode/java/udmi/schema/DiscoveryConfig.java
-3d5dad447ed4f6067c0331f4909882b6f9767f8f4d5ab8cad1a0be796a258e84  gencode/java/udmi/schema/DiscoveryEvents.java
+d00b5aac8febbc0621fdff5c90e39dfa19daa16acc14d95415741c9ef7379621  gencode/java/udmi/schema/DiscoveryEvents.java
 1a04079116f4032b17108e873719bbb2c60c19f392136e7c906122199b472227  gencode/java/udmi/schema/DiscoveryModel.java
 4337500c28669631efaf01dd98d9156e2514e44b804142e6707a92550b8e3ba8  gencode/java/udmi/schema/DiscoveryState.java
 7019b8a1522261a69d708e2e7725b8bc44510c5c80f5c056543af2b7728bfa42  gencode/java/udmi/schema/Electricity.java
@@ -68,9 +68,9 @@ e0ca9b52b4cfb4be9d6c911a549a9f2f69f5f948f05a9e3a7b224c988f932ae3  gencode/java/u
 4163478ed17191461b0a65abd11c4ddf912cbc104f040a734efd290306fab7b7  gencode/java/udmi/schema/Events.java
 1960750d0b8f2e18ea02230a51b6380cf555e21de46d6d38d649e626660ba0e2  gencode/java/udmi/schema/ExecutionConfiguration.java
 40686ad8c86447e5f760b6503c26afb6c404950c4458272d9d3fb874ab8ee624  gencode/java/udmi/schema/FamilyDiscovery.java
-a4ba10a0c78ece12640e742d3d0e61ede88eddef9b13f9d1665012579082fbb6  gencode/java/udmi/schema/FamilyDiscoveryConfig.java
+b4e01d9633db88501d27cd9d1ccd209520137b1586a1d4f500f490800aa787bb  gencode/java/udmi/schema/FamilyDiscoveryConfig.java
 dc1affcb39be03fc5b974aa5216d7d3b692d5bcea292724c33d3323dfe03b771  gencode/java/udmi/schema/FamilyDiscoveryModel.java
-2d914231b02f2e594278d1d54fafa154c8f1c9b61c9b151749d0ce9980d1c026  gencode/java/udmi/schema/FamilyDiscoveryState.java
+c242fa94f3cbbfc801c96fa1e9409c8ec84db2a5d0b3a861acff0fc85d7976c7  gencode/java/udmi/schema/FamilyDiscoveryState.java
 2145077e0e2f43d6a4d9c54a3b92b952ee47bbf86866f6052807a70987cefc28  gencode/java/udmi/schema/FamilyLocalnetConfig.java
 9767387da6ee90f8c73b23f92e52aa0649f5bcd55d52e4084925102a818dc518  gencode/java/udmi/schema/FamilyLocalnetModel.java
 54a115b97388b0d8e46a05db5677e4391e5ccb148c0f2348883151928c885845  gencode/java/udmi/schema/FamilyLocalnetState.java
@@ -115,7 +115,7 @@ d874679ab365897a23bc4009d254470542cc5f865759d84e0b777554e756199c  gencode/java/u
 d87deaba67bb3272c528e3491d378bde059b626964a4a2aed15f5643305c2463  gencode/java/udmi/schema/Properties.java
 4cdd5dc6b2e054a43f2e70adeb46ef8e3ff78288d4315923a925415f87e871aa  gencode/java/udmi/schema/PubberConfiguration.java
 078be5eaf90e5eba1bc99252be3a11a99fdbcad0685ca82c070af1a8e956ff50  gencode/java/udmi/schema/PubberOptions.java
-9fba0aec550c20d32b8fccf364e66fe854d33400559402248bc118e89709dfda  gencode/java/udmi/schema/RefDiscovery.java
+e9f8ecb5da2c95124cd30b83daf767bc64836b274c398ce6859b7df7ddb4d5c2  gencode/java/udmi/schema/RefDiscovery.java
 14faa115d13ee46d10935b13753bff85758f3b64b5136a59f60d36b5b541687c  gencode/java/udmi/schema/SchemaValidationState.java
 fadf083200e73d46cfdec2f710d40e3d2bc4dbf05196e4d0900186e72b62d95e  gencode/java/udmi/schema/Scoring.java
 ad70168de2e1801e26f2c1a8c33a6169e236682de59fd3f6038a77ac264aca14  gencode/java/udmi/schema/SequenceValidationState.java
@@ -129,7 +129,7 @@ a371232810e8a2ffb380384ca717da1ee5cc0b2e1129df9b5d8faa07ab4b1f46  gencode/java/u
 80a1dc79418b3793ca481edfb06f75a7b72029e8fb44a398d1cc368fe66b6c2e  gencode/java/udmi/schema/StateSystemOperation.java
 92abcbe3bfe447810f9954b83327da1d3e012f3e54fa49c3f108d385b97bc1c0  gencode/java/udmi/schema/SystemConfig.java
 20c8e5a1f17a266644a2b059f625bbbb56d3172571b04d8bc82f6e51a7e0ce24  gencode/java/udmi/schema/SystemDiscoveryData.java
-497cd5b79fd9d6651d2eb7b82a4b876a7b43f8d9c91580efafc630d71753731a  gencode/java/udmi/schema/SystemEvents.java
+339ec973d04ec1458eb05c3c4c4fc2a11623a45518ab3d36a6a014330954d4f6  gencode/java/udmi/schema/SystemEvents.java
 d36e487e0f59e6d9416c661aa6a70589a7e5b1763a2ff5a556fea7984b40200f  gencode/java/udmi/schema/SystemHardware.java
 fb3b391c375d69770029a0561ffb833f90e272ff2a0f4c10385e69b76a6e0c21  gencode/java/udmi/schema/SystemModel.java
 18a5e1e4daf656776d101aeda94021e6cab6f47f2caab88b7aba8abbbf5d2a7a  gencode/java/udmi/schema/SystemState.java
@@ -156,7 +156,7 @@ cfaeca16d0420f4553acf594f85a80ceb149487f1c41d02ee6e73a6ce5e1ac5b  gencode/python
 79eb0299b3751d93c01a5de65eacc717283e99caf0996f3db48a15247f69c8eb  gencode/python/udmi/schema/config_blobset.py
 59039eaf2812392329c641ad387f7e27790cf804fc94a014626d2da5ab426e3d  gencode/python/udmi/schema/config_blobset_blob.py
 d1e54ee9c2a87e0df7083b78705d41f2a88d8cc4262b07bed1223d24b0de6e5d  gencode/python/udmi/schema/config_discovery.py
-a681af64599436e912aac1dcb5161a367d03b2af0756b612bf964f7209c21d6a  gencode/python/udmi/schema/config_discovery_family.py
+c37f24712bdd2c134a85a10ec8ebfb8107c1f485023742a3825510764b027d9e  gencode/python/udmi/schema/config_discovery_family.py
 428c11f554390cf6f564a8195607458dec4fb9349b82259a4ca333d9a9b7aa7e  gencode/python/udmi/schema/config_gateway.py
 e2d63bfe79295a0075b9327f4b8a392716b635c5b827339877f3ce9d8480436b  gencode/python/udmi/schema/config_localnet.py
 326e1bf7ee95926e999d138849928aa2c71a9866ee2214fe63f5c31ad85e0bf4  gencode/python/udmi/schema/config_localnet_family.py
@@ -182,13 +182,13 @@ fbb4b2c04c170c0da5cdd868612429fe920e44b591fcad2522b2e047d580d537  gencode/python
 488802e1b19cbe4e7e02e6ddfdcd0e0c0dbcb71f2439f76ac9bb63aa7c4ffca9  gencode/python/udmi/schema/envelope.py
 ed8ace0196c5e99d20778cb4210aa88cfe44a5e4539af98a1e194b9a71fa538e  gencode/python/udmi/schema/equipment_translation.py
 419d6a7197ca98b192888d13e5937c7e19b3a4f14518629e7a8e4c4c57dd3e14  gencode/python/udmi/schema/events.py
-6550cf10030ea330d26eed4587d9dcde344267a748e8eed11ee9ad18538055ce  gencode/python/udmi/schema/events_discovery.py
+724afe20e714061728f17f156a480805c9e8ec539b9415358232d83a44d1ca87  gencode/python/udmi/schema/events_discovery.py
 000d3cb03f3514bdc6fc5b33823a17829d74f065bf8b3e07107299056f071ae8  gencode/python/udmi/schema/events_mapping.py
 2a9f0f3689bfcb38e4fd67eb7a22119a83281817d0e1516c6a38f3935cf286a6  gencode/python/udmi/schema/events_mapping_entities.py
 2cfde3102400f7e103638563da6fcde8e4906b9ac49440163021b0c2af773990  gencode/python/udmi/schema/events_mapping_entity.py
 b22823e8c01909ce7dc454e6a99e199add763163ebf9c329ad9f28544e97e4af  gencode/python/udmi/schema/events_pointset.py
 e0f14e21c3a56768981eaf561431d52933c629c16b865df2b99585d6d6082462  gencode/python/udmi/schema/events_pointset_point.py
-a61368a737743f63365d1ec4c49ddc84c0e9a09452c6d73d4a4cd013e4bd015f  gencode/python/udmi/schema/events_system.py
+dc4bef0026ac8d9b0e5b13fe675b16df889e38671a7946371fe47d0443d82e4d  gencode/python/udmi/schema/events_system.py
 0423bfd2158a71a1ce3961054aceacbe6603ad1f65a707b586d17bfabb2a99cb  gencode/python/udmi/schema/events_udmi.py
 8f4ec5b4d717a0c497e914a2e15c72d96bfd3bbb119fa3b1e21ac96243c195bd  gencode/python/udmi/schema/events_validation.py
 3707a9a5a07b7cf80e4ce6b0ca81584de74a9d5fe361214a4d3b6f22dd30cad8  gencode/python/udmi/schema/events_validation_device.py
@@ -218,7 +218,7 @@ e604cf0280fe772de5f4e5ecf10dc6c564b6177eeff9cd9fb8b385af8fe10a95  gencode/python
 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
-5d9c314f6b9fc2c301bfdd9c701b3d824aeee9350b8cdebbf2a816b4ea83ab35  gencode/python/udmi/schema/state_discovery_family.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
 041415747e97a3bdcf8a0974fe280e4f1852c0837e981e1006f01b4bdf2ba0ab  gencode/python/udmi/schema/state_localnet_family.py

.github/workflows/integration.yaml

@@ -88,20 +88,9 @@ jobs:
           docker network create udminet --subnet 192.168.99.0/24
       - name: Start UDMIS container
         run: |
-          cat udmi_site_model/cloud_iot_config.json
-          docker run -d --net udminet --name udmis -p 8883:8883 \
-            -v $(realpath site_model):/root/site_model \
-            -v $PWD/var/tmp:/tmp \
-            -v $PWD/var/etcd:/root/udmi/var/etcd \
-            -v $PWD/var/mosquitto:/etc/mosquitto \
-            ghcr.io/$IMAGE_NAME:udmis-$REF_NAME udmi/bin/start_local block site_model/cloud_iot_config.json
-          for count in `seq 0 30`; do
-            echo Waiting for UDMIS startup $((30 - count))
-            [[ ! -f var/tmp/pod_ready.txt ]] || break
-            (docker ps | fgrep -q udmis) || break
-            sleep 1
-          done
-          ls -l var/tmp/pod_ready.txt 2>&1
+          export IMAGE_TAG=ghcr.io/$IMAGE_NAME:udmis-$REF_NAME
+          docker run $IMAGE_TAG cat bin/actualize > /tmp/actualize.sh
+          cat /tmp/actualize.sh && bash /tmp/actualize.sh
       - name: Registrar run
         run: |
           docker run --net udminet --name registrar -v $(realpath site_model):/root/site_model \