diff --git a/.gencode_hash.txt b/.gencode_hash.txt index 967506a17f..7d14567549 100644 --- a/.gencode_hash.txt +++ b/.gencode_hash.txt @@ -1,27 +1,27 @@ 433b3c972a2d4de6f54cf32f00f918fa7e3fd80d4bf29a2c7bee182f532bc660 gencode/docs/command_discovery.html -41c2bc68fc3b8151b6a504c8adfe47d7453b972a38e4e056238241ae12ad2859 gencode/docs/command_mapping.html -81ba8b959b8ac79fe792eef5a4aaf984fcfbe3e7b94987556dd23a329dbaac5b gencode/docs/config.html +158e714e54b2a6d0b90bfca00d178369b04508dc4fa84a979690a813ca2dd724 gencode/docs/command_mapping.html +4e2480661fabd32eba35d3ae9a4af94f08eb7cfdd62e75b45ade560078fe389c gencode/docs/config.html 22bfb3fd7c0e73dac4cbd830aa7983714917ec6da813f6bf5768ce3aa9786fb2 gencode/docs/config_mapping.html a626529e7bbcfbe32e734585c342a300b26161afaab4565d6328726bfb1da7c2 gencode/docs/configuration_endpoint.html 2ca2acaca1c68ff641a60873ed18e49416b2fe8419df88902b5eb9c248bb42e5 gencode/docs/configuration_execution.html b052fb2c7db24f398ade7a490230f40b8db7d3fd1ed06f081ec14998bcadb2de gencode/docs/configuration_pod.html f8c01f4bf8a8dc13db3458d4f01ebec64c79417e76caa066f8279cd0fb7a062c gencode/docs/configuration_pubber.html -9a4c3876ca5dd7bbbec722a88cfbf99deef5eda23e62404259cad0a3bc242cfd gencode/docs/event.html -06e6f3a4d8de12d11fce0071baff640a9c4dc01d72d537557ed10b08eda4ccab gencode/docs/event_discovery.html -78f655972772f4bee92d88c3a26535612735c794837bfd6f479faeb2e8d8691e gencode/docs/event_mapping.html +69c8b50030bc0bdf266f0fbfb7b42b1b8a83d93a3e6d6cd0d9e5052292a52dd0 gencode/docs/event.html +650307c3419833aff9db3b0304258489ef84db1fbff5fbb3ceb3011eabdda961 gencode/docs/event_discovery.html +b9dde27aceea28283a4c51f8f9b74db72b305a06ff4f68c625b035dc86267f8c gencode/docs/event_mapping.html f6ca85990e940f109a48e35b25102d8860e5707a7b2145412046f44d599ef635 gencode/docs/event_pointset.html f849ebe1085d81fb0f16654b7c9d3d14c59b56b1c75154e100b85398694657fd gencode/docs/event_system.html a4a99c4be9483e889c2d0d180d72d2ed332d587ac9305c7615da0e70fd55a56d gencode/docs/event_validation.html -61326830be577c3f594a8e7fb5c7f078be47fbcbef2f222e70d9e64517b12209 gencode/docs/metadata.html +f322770ed1b3d4c75a824739db79ad1b66dcd081506f5cbca3fa1cd6c639ed5d gencode/docs/metadata.html 93bfecd5facd0ead4c75a90f350fa715e6fb8bdab71d81b1f3e46994f03c1c2e gencode/docs/monitoring.html 96808a602a71cec03e205466f93e0a27c6bf642d08d70ea80dbe00a5adf61410 gencode/docs/persistent_device.html 5d039d607af9ec75ee552dfe36b16c702687ea16f5663f41fc49b4533b86e00d gencode/docs/properties.html 9b4413e13e835bc4f76d6f74e7a6935eb58255ca95d499256a6ee6c37d3afc49 gencode/docs/query_cloud.html -3ad206c2afce110cdeb0bc5bb13cd959a2d7016ca40caec6fcc544a451469af4 gencode/docs/readme.md +8da8d767f09155383319e69d93451b9fde63c32ba139a813973b31a010fca86e gencode/docs/readme.md 741b880216be3743f6747800a042f2dbd89f3b0344c6b0a965f4bc010f03a930 gencode/docs/schema_doc.css 878ea88206c974f40643c3cc430875f9c4e8c5e3fd6bcd6358bd3eb6d48699a9 gencode/docs/schema_doc.min.js 7ed934930aee763e0beebc349725ba3909115e8d346bb762f28bcbe745bb163a gencode/docs/schema_extras.js -4e3d45425d94a2ca826fea24ded247dc812264e580087f6c69d860cf5c79688d gencode/docs/state.html +dadeb50ae80ff361095487176febef4f096ec858f14655f10e1c3a0d47f5af91 gencode/docs/state.html b2398e7f9e352c47867e38f97168f3eb88e23280c7dd576f13e038c8c3f714c9 gencode/docs/state_mapping.html 567b27a9257816eb9a9063ce089fe0f58c5962f10ea449bb7c653bd6151365a8 gencode/docs/state_udmi.html c47793798acffff5a0db724674bb21c1d5780789c63379b57be698aafd12b477 gencode/docs/state_validation.html @@ -37,35 +37,36 @@ fcbed49f1af8b791d8c52bcbe18f65521a79d9ac3eb33ec3afd9b342ab2bfc56 gencode/java/u 3ee2d42e34f36350925595a6904978698c0d92b0b5d417876bd7bf25b0780210 gencode/java/udmi/schema/BridgePodConfiguration.java 2e7c0912c6f43b8dae9e9149b7361d3640bde4f01de6e13d8e487fe01be2c2c0 gencode/java/udmi/schema/Bucket.java 0a4f6bcd5065418c1cdc6c05b900b3de31744847d25b6ab6de7aabb1e724710e gencode/java/udmi/schema/BuildingTranslation.java -c47b17d70ed7fffae5cb829623088358eca22c8fa5613edd97518bed0b522620 gencode/java/udmi/schema/CapabilityValidationState.java +0c133f64013d5f2c4be203708def7ae11be631e90d5992222d6b4c97eef2573e gencode/java/udmi/schema/CapabilityValidationState.java ec164962f2f00924ecb41ae07c2e01d6bf027951ccc605e0210988370b987973 gencode/java/udmi/schema/Category.java f6a557eb73dfa077d7c5daf897bde345c7403232808608c39e24a0cbee2755c9 gencode/java/udmi/schema/CloudModel.java 8b3c78c77a6ccade42d8c3fea9a7c8196344f2f68dfac1dd8685a0727ec31bac gencode/java/udmi/schema/CloudQuery.java 377eb78de936317676faaf7ec5a32ad17f2c2c54a3280df87f5fcc2d36c7014d gencode/java/udmi/schema/Config.java cf9762392e02b5d04c6498963222cc0c00f7be6c3cd82bde3d063a5eceba2b65 gencode/java/udmi/schema/Connections.java 8164e93ccc76d78548d456890e064df8427a09bbcd50686b37a10d3ff5ad429f gencode/java/udmi/schema/Credential.java +a88865e2260d532380323e4679be87f50fa0f48d48b337ded2213060ecf7470f gencode/java/udmi/schema/DeviceDiscovery.java 10d67bf2080403fd196f63097e4ce2151edaafe3cf4ac77598ef83e06f94cb05 gencode/java/udmi/schema/DeviceMappingConfig.java 5ffb3bf92436c469eee16fe1e472efc89d1c466785be6ce30148188439314afe gencode/java/udmi/schema/DeviceMappingState.java 9b3e011019ecd3bd2c7b64714c6c30d765e879d7ab00f9cddb212dd3f51502eb gencode/java/udmi/schema/DevicePersistent.java d4a82e132b2d223c4a82384d22455283c0b64aba3100fc210e72f9700b9df2d0 gencode/java/udmi/schema/DeviceValidationEvent.java 73399ed2459902c3d81e95fde2caa5033c76f8cfd89e96338c8923529763e52c gencode/java/udmi/schema/DiscoveryCommand.java -e809df42a73ed843977e447fa3333140dcdbe7d09b4e88bf1b8fd52fbaf9ae1a gencode/java/udmi/schema/DiscoveryConfig.java -5b4508ce3ac0235c9ab97494aa0f2d2ccad88ebc83da28eca2c405fd906e84af gencode/java/udmi/schema/DiscoveryEvent.java -04112dd47b0f761131c276c67d3cd8b789d25e6716b5732be9fef14fc6831f1d gencode/java/udmi/schema/DiscoveryModel.java -0a11a539707571f79bd82b1958886cecae3209e2daef36dfca885adb4c61a07a gencode/java/udmi/schema/DiscoveryState.java +8a92ae5440b6beeb5965c836a36207bc0db0c8d5af4bc4d297c414703815db78 gencode/java/udmi/schema/DiscoveryConfig.java +b318d39cc2fbd62ec23bb2ade8741920f0b3014a1156bd407c6ff6d1dfc76a86 gencode/java/udmi/schema/DiscoveryEvent.java +ea90103e88db5d2413bfd2f87bf13dbb9024a8028504766af828e95ceec38b7e gencode/java/udmi/schema/DiscoveryModel.java +b632725290607273c7796d0b73ad8cead3a249217b1c158897c40acd224d7cda gencode/java/udmi/schema/DiscoveryState.java fe9eb9928e66f8f34863312778959f49f6a6f2b5f6fa4e647b68c21aa61f0521 gencode/java/udmi/schema/EndpointConfiguration.java dc25e685886e11a741418be9191a478e13c0244647b5a0cac65d6c1e55055578 gencode/java/udmi/schema/Entry.java -06758aca1e0043ddf343b504030f47bb19260e99a82e2d66f12e86092a2434ca gencode/java/udmi/schema/Enumerate.java +aa39553b6498bcc2876a525b24b7797c860a4d6deb5c3b4b48312383333d6270 gencode/java/udmi/schema/Enumerate.java 8a51984458d96d1798d067005902defa57410167a27dcfb0b730ea38a3326011 gencode/java/udmi/schema/Envelope.java -e9f5c77be81486b6b8c6d88f70f2d50583d8c3fafa2ac09ead80f44b8d5e751e gencode/java/udmi/schema/Event.java +c6cdc63b7044af906236f1ae545079dc07279adddd4d67ef98c595174a712e36 gencode/java/udmi/schema/Event.java 9ff3d1819b5a92713b26f56d08c77dcbb467c6ffc10f75744c6b6a227a13319b gencode/java/udmi/schema/ExecutionConfiguration.java +25815abe54d4671858f55bd5d911292bd50f122b80878064b014afcfcbd86ea7 gencode/java/udmi/schema/FamilyDiscovery.java 2e77a29988e6c17875d3f781be931e3b835bb310639f60d3bb28f24405a86bed gencode/java/udmi/schema/FamilyDiscoveryConfig.java -9643391d71c6bd206a4ec69ee7b46ba2bf061b85ccd0bc050046a84df85c8414 gencode/java/udmi/schema/FamilyDiscoveryEvent.java +5f50abca612a3ef122f76e07590ccd9f674698ebef63e4901d49a62a0382c957 gencode/java/udmi/schema/FamilyDiscoveryModel.java 5ad9bf328fa1500250ff8bc75f2044b3815c5c11cb368e1cc228ac8ca16639c2 gencode/java/udmi/schema/FamilyDiscoveryState.java -9959a84eea3e549c142c3edf637c86eb56eca138108ebd51fc2985e45aa41484 gencode/java/udmi/schema/FamilyDiscoveryTestingModel.java 09be38b6d52ea4150fecc3e97adc6793030fcf71da01df12ccb05dc4dd3dad9d gencode/java/udmi/schema/FamilyLocalnetModel.java a7ad0cf79a86a92c8d22b5ac3e609f321454ba4834065e24de208b1f6ebba447 gencode/java/udmi/schema/FamilyLocalnetState.java -d33fe8178d2a18cb588dd29edb0e5659af044634b02d7850623cbc057ccb8c6f gencode/java/udmi/schema/FeatureEnumeration.java +d0f9e9a2576b322c42b25ec656501797204ce4209cd4031b86c8e492e2131a22 gencode/java/udmi/schema/FeatureDiscovery.java d3fdb2d8b485c1e61786dfde45cc8be08294339bb31a1b8f02180485789a3ab2 gencode/java/udmi/schema/FeatureValidationState.java a4fac9e07e930eec7735f67d78eab1e72881987ecc0475c41ce46ae5a9bc5ea7 gencode/java/udmi/schema/GatewayConfig.java ce79df57185ee108f6a60efb49c2ea80f249e678d3ccd4d91e702b653571c21b gencode/java/udmi/schema/GatewayModel.java @@ -77,23 +78,23 @@ a5e5adfc187709e8646a11c92e804acfb67743f9d72149008aaca954df3177f6 gencode/java/u 910c68183db7703b00bcb81146ad73e6fe0d4bbc4caec4dc9c621f3cc2e5eee5 gencode/java/udmi/schema/LocalnetModel.java f6dd2fff0e100160f84a5d62c137c618ed616c82f8722a0530f5393bfc82e281 gencode/java/udmi/schema/LocalnetState.java 2df4ae32d0bbecc21f7c3f6a416a195baa766a6210cfa8abca4a7bb45b9c7961 gencode/java/udmi/schema/Location.java -0e5e87848de3dabaf6521afc3fa217f162cdbc76e2bc8796b57e2d07865a5107 gencode/java/udmi/schema/MappingCommand.java +7f71faa644ac86f3dcaf832d39a0deecfe443fc6a3bff912c0a66c09243c4cd9 gencode/java/udmi/schema/MappingCommand.java 0f6f85a4aaffb90735acc2565e8e4afa349d3ded5781cb1dce1ebbaa237feaa7 gencode/java/udmi/schema/MappingConfig.java 39f4cf5f89dc52f24ea02246e17668ebc85ed0fab351e69138e477bcc048d79c gencode/java/udmi/schema/MappingEvent.java -052b6b7f9ca8173901d9d2fae314f5858e034f20efa5d184780b800bd870cb2b gencode/java/udmi/schema/MappingEventEntity.java +2786ae25faad6bd0d9f20985e3576ffbe15c1b98c16033f7459a00df3573c44b gencode/java/udmi/schema/MappingEventEntity.java 84fc81b687d42c689b6b9794716e34bdfd06daf3ab3640a5cf47baf74c185cee gencode/java/udmi/schema/MappingState.java -6c766a915871d07a7559e1b21886f69f1be6cebdbdfa0a605a0c3b1ede71d9e9 gencode/java/udmi/schema/Metadata.java +1a8d432677de0d8803954eff42ae46d4cac7a9f1fe028332d84e66dfd3f7c60b gencode/java/udmi/schema/Metadata.java df64e4ddbf543ac70e7c2af9d3fbc20ffe3dff68c6718aa9ceadab7f64d3d171 gencode/java/udmi/schema/Metrics.java 14722df90406cdcd29c7c946e5fcdf6a3e513eb879a7fbb493801fc0d9093504 gencode/java/udmi/schema/Monitoring.java b3b7ef6cae004d5fdb4052f860df0aa583df87bb798a027fc769aeaf16489789 gencode/java/udmi/schema/MonitoringMetric.java 4e7fb33911cf11845d494a07502577647cb96e1196cb7b76553190d14b6ed099 gencode/java/udmi/schema/Operation.java 5e1c5411fae4d7c47391ceb5d19ae864fcd484df75ac6b6db39fd2d12647dec8 gencode/java/udmi/schema/Physical_tag.java afd4e8dcf55ac7fd91a00bc5348efb7dfe7950037a0eae9365a27d24c4f2f2e9 gencode/java/udmi/schema/PodConfiguration.java -d808259db6bbcd26ecf438844ce286d15d4750906be24588d97acfbe8a4ae315 gencode/java/udmi/schema/PointEnumerationEvent.java +a6c694f877c3898bf315f90898a1e60f7ff4605d0f58fad4d87f11883c5b4772 gencode/java/udmi/schema/PointDiscovery.java 468c2c95e9dcbaf4ff706fad7f168c14321eaa35b7fb190848ea8bfd86d981d7 gencode/java/udmi/schema/PointPointsetConfig.java 8f3fc1cdc2dcd3e524863f4675aebabc450a35f5fd1cdc3fd37289b5cab7f2ec gencode/java/udmi/schema/PointPointsetEvent.java 65337109653a93d873dae40eb517857149bae1b20c7b479f41b35c0822d94ba0 gencode/java/udmi/schema/PointPointsetModel.java -a77b840d671100245c7b68ef8b0130d1ea6375c6ed8a2e145b4208b5962bbc66 gencode/java/udmi/schema/PointPointsetState.java +eb4b94f5f0324e74e10efd6b8b9652e1d612531a6d77c941d7967672f99e90af gencode/java/udmi/schema/PointPointsetState.java 1ba0fbfeedddc1a4e39efdff85cf5905c91fb7a4b5ff7d87ed9359ee61f060cc gencode/java/udmi/schema/PointsetConfig.java 4d718196af20797b60e745e99a791e41b7bc15b4a9c2e6ab11083a75b233edec gencode/java/udmi/schema/PointsetEvent.java 715a12e646aa32a7d36f51f72914bd678afab9475ef0791eed6d427f254c8175 gencode/java/udmi/schema/PointsetModel.java @@ -103,8 +104,9 @@ ca2e7566106818ca7e5190c8041eb86f0c9b3251b0bda8c3ea7ce11a0c891a0a gencode/java/u 3df66bb1a37a9e0b2b6cf392f8c64d404a73c83e5e13c02bb4844f09b9a04b70 gencode/java/udmi/schema/Properties.java d5e11dc354995681b894bcb62e4e21da7f0be68aaa3643a3dc5aa13610741f29 gencode/java/udmi/schema/PubberConfiguration.java 8e0490eed4499749b422ffde98a9588a597e8860b74dedae979abdb22f94c38a gencode/java/udmi/schema/PubberOptions.java -703ed0cecb60f284b52e76dc4d612eb798ba3e8781cc40698a46611b36e6b0c9 gencode/java/udmi/schema/SchemaValidationState.java -dc7c549b3358f9b2ceccc8633af3d0fca7eed7c05c94c3396815363b889b4c16 gencode/java/udmi/schema/SequenceValidationState.java +eebd8dcf8a37b85fc5c3c8c0f4d164f6b58fd7822cba595d9a2f31c228144300 gencode/java/udmi/schema/RegistryDiscovery.java +01df260ecaa5c396045931756ff02f8ec65321908bd08b25cecd7d6086825fef gencode/java/udmi/schema/SchemaValidationState.java +77067279077ed48dddfd53f930ba37567b5bc2555e1a4a7808eeba82d211584f gencode/java/udmi/schema/SequenceValidationState.java 9da49b22341a65580d085fd9d00eaadcaefcf7b813988ef844c617aa4b8a9a4f gencode/java/udmi/schema/SetupUdmiConfig.java e79f3842470cc1f12b1d0a9d6691b147aeb4d6bf29e24872721133352aed1cc9 gencode/java/udmi/schema/SetupUdmiState.java d67a313587648034d5423dc7ea0c6d6a46149a33086a4deec79ee3eb3af65410 gencode/java/udmi/schema/State.java @@ -125,7 +127,7 @@ e657fce78cbce01fa4747f1da62dc0442b20ec2d1c196b6e56f3dd465c078ad4 gencode/java/u d54631f8bada01ffecf34361891ee52d41786b1289ce56a9edb696b6ad2d3ace gencode/java/udmi/schema/ValidationState.java e007ddd1ceeae3603c85110c33e1bb4a418ff9c7a791ca0df25b7ea3caeafd36 gencode/java/udmi/schema/ValidationSummary.java b77d953fd22e655c0f10ae32deeaa222769d971f8c38b3379eba45720fb910cc gencode/java/udmi/schema/VirtualEquipmentLinks.java -16db8b6457e9e4a568996fd6b512ffa0344b51469c7f24c2b473411caeeef462 gencode/python/udmi/schema/__init__.py +4b52985a410c660e6f0fbf41b82b8d96b52e14101c495aad539788ea5945849a gencode/python/udmi/schema/__init__.py 21a1521cef58f195ef6c44f2b63b820bf981408806f58d3370eeeea07cc5436c gencode/python/udmi/schema/access_iot.py 4b25dd95f863059b761269f93adcae7049507924a1c6e74d6856849203c179db gencode/python/udmi/schema/ancillary_properties.py dab4f5fca272ec48c2881bca2b6bc43786ada47fa1f6dd935c35f7ce0eb6b0f6 gencode/python/udmi/schema/building_translation.py @@ -136,7 +138,7 @@ dab4f5fca272ec48c2881bca2b6bc43786ada47fa1f6dd935c35f7ce0eb6b0f6 gencode/python 53961cd8a6ddd118143457ca60d765e12b21bcdf98fc2d648ebac0172ffca880 gencode/python/udmi/schema/config.py 79eb0299b3751d93c01a5de65eacc717283e99caf0996f3db48a15247f69c8eb gencode/python/udmi/schema/config_blobset.py 59039eaf2812392329c641ad387f7e27790cf804fc94a014626d2da5ab426e3d gencode/python/udmi/schema/config_blobset_blob.py -7a6411ba2646881ffad5b6ad472c980e48a11b36ab2c9c77d12608ccc7225594 gencode/python/udmi/schema/config_discovery.py +dd518169acd87b7c290fc5dae35780ffd86da41b9222550ae85336db47f518e5 gencode/python/udmi/schema/config_discovery.py a5edb9ac5ecd5a4459f93ce613691735f299f35718f2e35410206fc91c263dd1 gencode/python/udmi/schema/config_discovery_family.py 428c11f554390cf6f564a8195607458dec4fb9349b82259a4ca333d9a9b7aa7e gencode/python/udmi/schema/config_gateway.py 8b321b699019dda888783b87655546d6624814fd156c54ed572c0467b5547fca gencode/python/udmi/schema/config_localnet.py @@ -153,14 +155,16 @@ afc89a204d7099791303cf9231b19cc6ba320d1de95a921381f5e47bbafac842 gencode/python c61ee66daa7e632850bc2705370baa8c057e7a34792c6a29b9e4ca00c0eb195b gencode/python/udmi/schema/configuration_pod_base.py ef61eea743cc2629893b18411636672cdfec0e209e58eb7918b33b43edab5196 gencode/python/udmi/schema/configuration_pod_bridge.py bed77c13436a192047a0dcdcaea7c5d7175e99a76c6c40409cce9e232ab5bc12 gencode/python/udmi/schema/configuration_pubber.py +23aec441e0761f9067030fa1a757c3921c4dd2906758b9e1f00b67b903be7be4 gencode/python/udmi/schema/discovery_device.py +80fc56594a2a0696d325e5e2ac1b4e3058c1533267e87181177356c9b99e7085 gencode/python/udmi/schema/discovery_family.py +eebb10ed73e4046ee2c5a271219b9547751835a15069968790ab44580a7225f7 gencode/python/udmi/schema/discovery_feature.py +bd132b930f41bbcfbb4726627d14361d4a73ecc3b44782b62c7940774a8095b7 gencode/python/udmi/schema/discovery_point.py +7ad6dc56aaa013f76186a64841db082e3e72fd7dea535fed794c4ee9bcf83dba gencode/python/udmi/schema/discovery_registry.py fbb4b2c04c170c0da5cdd868612429fe920e44b591fcad2522b2e047d580d537 gencode/python/udmi/schema/entry.py -fcc75eec4263b11b378e30f929687cfb9619c8dfc524863b6bfb11b7e33be241 gencode/python/udmi/schema/enumeration_feature.py 5b9982e15ff770bc5af75b7891285aec956e873c9a855a29ea2122314a2b76c0 gencode/python/udmi/schema/envelope.py ed8ace0196c5e99d20778cb4210aa88cfe44a5e4539af98a1e194b9a71fa538e gencode/python/udmi/schema/equipment_translation.py 1eb9019b9d0b4ff7de2df8beb625a4f89292d636ece0c02f160495c537bd6c2c gencode/python/udmi/schema/event.py -f11a6ef09e9fcfe20cdec446037ee89a7f182e83a6016073ec5180ae802bc26d gencode/python/udmi/schema/event_discovery.py -4f63fe1ce9493a5dcaf2c2bad84b5c279e54eb4de17b26a79a21dc17563c1f02 gencode/python/udmi/schema/event_discovery_family.py -e285b2af68d9cc1f019642f763ae62c35a482e652c1def8715bae5a487af4153 gencode/python/udmi/schema/event_discovery_point.py +887f21dcc3a36fe8f3dd4cbd0cece1f28dfa33c6230fc6d6e9f888b3015ed263 gencode/python/udmi/schema/event_discovery.py dd30f748b5321223933c272d58f5fa6dc319912737255170322f0df3244732a7 gencode/python/udmi/schema/event_mapping.py 6163270aa726ef29bc9285d224ec5c2611aab5d19f6ed09d711e6c816fc7e467 gencode/python/udmi/schema/event_mapping_entities.py 3652a73a7df2d9df18a45b72d948c38a84a61e008d7543d006dad1832640c54f gencode/python/udmi/schema/event_mapping_entity.py @@ -169,10 +173,10 @@ dd30f748b5321223933c272d58f5fa6dc319912737255170322f0df3244732a7 gencode/python 7d520df05f839ed4a7472c395c77cf1d2cbf47e3162e87e43ed5c9ae9e979af6 gencode/python/udmi/schema/event_system.py 4361f48caba6a948a5916f67c8168215721cb3cc2384649f0336804785f01f1d gencode/python/udmi/schema/event_validation.py 633c85b0999d969310918bb03e9a40a08960f420b862340045a0290f8f5c4fe5 gencode/python/udmi/schema/event_validation_device.py -02e464aec10ae7f8cf10045f6107e069de4b852a24cd8fae6a4290a01c0d2ac8 gencode/python/udmi/schema/metadata.py +0936dcf3fdd01ef7e7a4d9938dae46acc109e3894acdbe0f4fb700bdbae78405 gencode/python/udmi/schema/metadata.py 8324124d37edc203800ec722b6eb2d4b3baef836bd4bd72c221b499b8a4bd125 gencode/python/udmi/schema/model_cloud.py -805cc8dcb29732d1965bbd533b12d2bc4966d584f05b8a478dd2cac98fd99d52 gencode/python/udmi/schema/model_discovery.py -44d057dffcac3a994e7b894f8e1ebb643ba49d7dbfbb0bfea9cc04f97af0bc47 gencode/python/udmi/schema/model_discovery_family.py +387e3f68dad9ddd6211a4e10d25c35026a4c0083b606819fdb4e338be9e135ca gencode/python/udmi/schema/model_discovery.py +cead43bbefcc2d957bf8316560edf849d74df9270f9473d87c2a3bdf61f08332 gencode/python/udmi/schema/model_discovery_family.py bef91798566798ec70b2fe10ae52c909090de9095b92e2567da3cbdcec29cd2c gencode/python/udmi/schema/model_features.py 72d17ba53c9d537720bb0ddf24d615b838fc2b9bb2a5c288742a8d82c77bd85d gencode/python/udmi/schema/model_gateway.py ae6a7bc93b520cdc90cd158f876a58e98a3e000402ebb1ca632f01ee492d408a gencode/python/udmi/schema/model_localnet.py diff --git a/docs/specs/sequences/generated.md b/docs/specs/sequences/generated.md index 8db7c43735..20ba1afa74 100644 --- a/docs/specs/sequences/generated.md +++ b/docs/specs/sequences/generated.md @@ -49,10 +49,9 @@ Some caveats: * [gateway_attach_handling](#gateway_attach_handling-preview): Check adequate logging for gateway detach, errors, and reattach * [gateway_proxy_events](#gateway_proxy_events-beta): Check that a gateway proxies pointset events for indicated devices * [pointset_publish](#pointset_publish-beta): Check that a device publishes pointset events -* [pointset_publish_interval](#pointset_publish_interval-beta): Check handling of sample rate and sample limit sec +* [pointset_publish_interval](#pointset_publish_interval-beta): Check handling of sample_rate_sec and sample_limit_sec * [pointset_remove_point](#pointset_remove_point-beta): Check that pointset state does not report an unconfigured point * [pointset_request_extraneous](#pointset_request_extraneous-beta): Check error when pointset configuration contains extraneous point -* [pointset_sample_rate](#pointset_sample_rate-beta): Check that a device publishes pointset events not faster than config sample_rate_sec * [state_make_model](#state_make_model-beta): Check that a device publishes correct make and model information in state messages * [state_software](#state_software-beta): Check that a device publishes correct software information in state messages * [system_last_update](#system_last_update-stable): Check that last_update state is correctly set in response to a config update. @@ -308,7 +307,7 @@ Check that a device publishes pointset events ## pointset_publish_interval (BETA) -Check handling of sample rate and sample limit sec +Check handling of sample_rate_sec and sample_limit_sec 1. Update config before receive at least 4 pointset events: * Add `pointset.sample_rate_sec` = `8` @@ -355,17 +354,6 @@ Check error when pointset configuration contains extraneous point 1. Wait for pointset state reports same points as defined in config 1. Wait for pointset event contains correct points with present_value -## pointset_sample_rate (BETA) - -Check that a device publishes pointset events not faster than config sample_rate_sec - -1. Wait for measure initial sample rate -1. Update config before receive at least 5 pointset events: - * Add `pointset.sample_rate_sec` = `5` - * Add `pointset.sample_limit_sec` = `1` -1. Wait for receive at least 5 pointset events -1. Check that time period between successive pointset events is between 1 and 5 seconds - ## state_make_model (BETA) Check that a device publishes correct make and model information in state messages diff --git a/etc/schema_itemized.out b/etc/schema_itemized.out index 4e45a1b671..9ca3cbdf7f 100644 --- a/etc/schema_itemized.out +++ b/etc/schema_itemized.out @@ -9,7 +9,7 @@ 07 valid_serial_no RESULT pass schemas state_update_beta BETA 5/5 Schema validation passed 08 writeback_success 09 writeback_success -10 pointset_sample_rate +10 pointset_publish_interval 11 system_mode_restart 12 config_logging 13 broken_config diff --git a/etc/sequencer.out b/etc/sequencer.out index 914fcd279a..81bfc81217 100644 --- a/etc/sequencer.out +++ b/etc/sequencer.out @@ -19,7 +19,6 @@ RESULT pass pointset pointset_publish BETA 5/5 Sequence complete RESULT pass pointset pointset_publish_interval BETA 5/5 Sequence complete RESULT pass pointset pointset_remove_point BETA 5/5 Sequence complete RESULT pass pointset pointset_request_extraneous BETA 5/5 Sequence complete -RESULT pass pointset pointset_sample_rate BETA 5/5 Sequence complete RESULT pass system broken_config BETA 5/5 Sequence complete CPBLTY pass system broken_config.logging ALPHA 1/1 Capability functional RESULT pass system config_logging BETA 5/5 Sequence complete diff --git a/etc/sequencer_nostate.out b/etc/sequencer_nostate.out index 4e967f01f6..cf135961d4 100644 --- a/etc/sequencer_nostate.out +++ b/etc/sequencer_nostate.out @@ -12,7 +12,6 @@ RESULT pass pointset pointset_publish BETA 5/5 Sequence complete RESULT pass pointset pointset_publish_interval BETA 5/5 Sequence complete RESULT skip pointset pointset_remove_point BETA 0/0 State testing disabled RESULT skip pointset pointset_request_extraneous BETA 0/0 State testing disabled -RESULT skip pointset pointset_sample_rate BETA 0/0 State testing disabled RESULT skip system broken_config BETA 0/1 State testing disabled CPBLTY skip system broken_config.logging ALPHA 0/1 Never executed RESULT skip system config_logging BETA 0/0 State testing disabled diff --git a/etc/test_itemized.in b/etc/test_itemized.in index a45b5d4cec..e9960f6c8e 100644 --- a/etc/test_itemized.in +++ b/etc/test_itemized.in @@ -7,7 +7,7 @@ TEST feature_enumeration featureEnableSwap TEST valid_serial_no noLastStart TEST writeback_success noWriteback TEST writeback_success noPointState -TEST pointset_sample_rate fixedSampleRate=10 +TEST pointset_publish_interval fixedSampleRate=10 TEST system_mode_restart noPersist TEST config_logging badVersion TEST broken_config barfConfig diff --git a/etc/test_itemized.out b/etc/test_itemized.out index 62b4ec835d..130ed82b36 100644 --- a/etc/test_itemized.out +++ b/etc/test_itemized.out @@ -7,7 +7,7 @@ 07 RESULT pass system valid_serial_no BETA 5/5 Sequence complete 08 RESULT fail writeback writeback_success ALPHA 0/5 Timeout waiting for point filter_differential_pressure_setpoint to have value_state applied 09 RESULT fail writeback writeback_success ALPHA 0/5 Timeout waiting for point filter_differential_pressure_setpoint to have value_state applied -10 RESULT fail pointset pointset_sample_rate BETA 0/5 Failed check that time period between successive pointset events is between 1 and 5 seconds +10 RESULT fail pointset pointset_publish_interval BETA 0/5 Failed check that time period between successive pointset events is between 5 and 8 seconds 11 RESULT fail system.mode system_mode_restart ALPHA 0/5 Failed check that restart count increased by one 12 RESULT fail system config_logging BETA 0/5 Bad version string number format 13 CPBLTY pass system broken_config.logging ALPHA 1/1 Capability functional diff --git a/gencode/docs/command_mapping.html b/gencode/docs/command_mapping.html index 6e2a81c526..181aa54eab 100644 --- a/gencode/docs/command_mapping.html +++ b/gencode/docs/command_mapping.html @@ -2112,7 +2112,7 @@
Discovery result with implicit enumeration
+Discovery result with implicit results
No Additional Properties diff --git a/gencode/docs/config.html b/gencode/docs/config.html index cb8119fecc..e033c9cda2 100644 --- a/gencode/docs/config.html +++ b/gencode/docs/config.html @@ -902,7 +902,8 @@Indicates which discovery sub-categories to activate
+ No Additional Properties @@ -956,18 +957,65 @@Address family config for a scan. Not included for device enumeration messages.
+Address family config for a scan.
No Additional Properties diff --git a/gencode/docs/event.html b/gencode/docs/event.html index 73138d23df..8038bc3096 100644 --- a/gencode/docs/event.html +++ b/gencode/docs/event.html @@ -3491,7 +3491,7 @@Discovery result with implicit enumeration
+Discovery result with implicit discovery
No Additional Properties @@ -5965,7 +5965,7 @@Address family discovery results.
+Address family discovery discovery results.
No Additional Properties @@ -6013,8 +6013,8 @@Discovery information for an individual protocol family.
+ discovery_family.jsonDiscovery information for a protocol family.
No Additional Properties @@ -6059,7 +6059,7 @@Registry discovery results.
No Additional Properties @@ -6124,18 +6124,328 @@All property whose name matches the following regular expression must respect the following conditions
+ Property name regular expression:^[A-Z]{2,6}-[1-9][0-9]*$
+ Information about an individual registry.
+ + + No Additional Properties + + + + + + +Timestamp of when a message was last seen for this registry
+ + + + + + +"2019-01-17T14:02:29.364Z"
+
Last update of the registry information
+ + + + + + +"2019-01-17T14:02:29.364Z"
+
Device discovery scan results.
+ No Additional Properties + + + + + + +All property whose name matches the following regular expression must respect the following conditions
+ Property name regular expression:^[A-Z]{2,6}-[1-9][0-9]*$
+ Information about an individual device scan result.
+ + + + + + + + + +Collection of data points available for this device.
+ No Additional Properties + + + + + + +Object representation for for a single point enumeration
+ discovery_point.json#Object representation for for a single point discovery
No Additional Properties @@ -6175,18 +6485,18 @@List of possible enumerated values for the point
@@ -6282,7 +6592,7 @@Reference parameter for this point (e.g. BACnet object)
@@ -6499,18 +6809,18 @@Indicates if this point is writable or not
@@ -6554,18 +6864,18 @@Human-readable description of this point
@@ -6609,18 +6919,18 @@A human-readable one-line description of the entry
@@ -6720,25 +7030,25 @@"Point is not writable"
+
"Point is not writable"
An optional extensive entry which can include more detail, e.g. a complete program stack-trace
@@ -6789,18 +7099,18 @@^system\.base\.ready$
+ item 2^system\.base\.ready$
@@ -7213,7 +7523,7 @@ ^system\.config\.receive$
+ item 3^system\.config\.receive$
@@ -7274,7 +7584,7 @@ ^system\.config\.parse$
+ item 4^system\.config\.parse$
@@ -7335,7 +7645,7 @@ ^system\.config\.apply$
+ item 5^system\.config\.apply$
@@ -7396,7 +7706,7 @@ ^system\.auth\.login$
+ item 6^system\.auth\.login$
@@ -7457,7 +7767,7 @@ ^system\.auth\.logout$
+ item 7^system\.auth\.logout$
@@ -7518,7 +7828,7 @@ ^system\.auth\.fail$
+ item 8^system\.auth\.fail$
@@ -7579,7 +7889,7 @@ ^pointset\.point\.nominal$
+ item 9^pointset\.point\.nominal$
@@ -7640,7 +7950,7 @@ ^pointset\.point\.applied$
+ item 10^pointset\.point\.applied$
@@ -7701,7 +8011,7 @@ ^pointset\.point\.updating$
+ item 11^pointset\.point\.updating$
@@ -7762,7 +8072,7 @@ ^pointset\.point\.overridden$
+ item 12^pointset\.point\.overridden$
@@ -7823,7 +8133,7 @@ ^pointset\.point\.failure$
+ item 13^pointset\.point\.failure$
@@ -7884,7 +8194,7 @@ ^pointset\.point\.invalid$
+ item 14^pointset\.point\.invalid$
@@ -7945,7 +8255,7 @@ ^localnet\.network$
+ item 15^localnet\.network$
@@ -8006,7 +8316,7 @@ ^localnet\.network\.connect$
+ item 16^localnet\.network\.connect$
@@ -8067,7 +8377,7 @@ ^gateway\.setup\.attach$
+ item 17^gateway\.setup\.attach$
@@ -8128,7 +8438,7 @@ ^gateway\.proxy\.target$
+ item 18^gateway\.proxy\.target$
@@ -8189,7 +8499,7 @@ ^gateway\.proxy\.connect$
+ item 19^gateway\.proxy\.connect$
@@ -8250,7 +8560,7 @@ ^discovery\.family\.scan$
+ item 20^discovery\.family\.scan$
@@ -8311,7 +8621,7 @@ ^discovery\.device\.enumerate$
+ item 21^discovery\.device\.enumerate$
@@ -8372,7 +8682,7 @@ ^discovery\.point\.describe$
+ item 22^discovery\.point\.describe$
@@ -8433,7 +8743,7 @@ ^mapping\.device\.apply$
+ item 23^mapping\.device\.apply$
@@ -8494,7 +8804,7 @@ ^blobset\.blob\.receive$
+ item 24^blobset\.blob\.receive$
@@ -8555,7 +8865,7 @@ ^blobset\.blob\.fetch$
+ item 25^blobset\.blob\.fetch$
@@ -8616,7 +8926,7 @@ ^blobset\.blob\.apply$
+ item 26^blobset\.blob\.apply$
@@ -8677,7 +8987,7 @@ ^validation\.device\.receive$
+ item 27^validation\.device\.receive$
@@ -8738,7 +9048,7 @@ ^validation\.device\.schema$
+ item 28^validation\.device\.schema$
@@ -8799,7 +9109,7 @@ ^validation\.device\.content$
+ item 29^validation\.device\.content$
@@ -8860,7 +9170,7 @@ ^validation\.device\.multiple$
+ item 30^validation\.device\.multiple$
@@ -8921,7 +9231,7 @@ ^validation\.device\.extra$
+ item 31^validation\.device\.extra$
@@ -8982,7 +9292,7 @@ ^validation\.summary\.report$
+ item 32^validation\.summary\.report$
@@ -9043,7 +9353,7 @@ ^validation\.feature\.sequence$
+ item 33^validation\.feature\.sequence$
@@ -9104,7 +9414,7 @@ ^validation\.feature\.schema$
+ item 34^validation\.feature\.schema$
@@ -9165,7 +9475,7 @@ ^validation\.feature\.capability$
+ item 35^validation\.feature\.capability$
@@ -9226,7 +9536,7 @@ ^device(\.[a-z]+((_[a-z]+))*)+$
+ item 36^device(\.[a-z]+((_[a-z]+))*)+$
@@ -9297,18 +9607,18 @@ FC 3339 UTC timestamp the condition was triggered, or most recently updated
@@ -9356,25 +9666,25 @@"2018-08-26T21:39:28.364Z"
+
"2018-08-26T21:39:28.364Z"
The status level
should conform to the numerical Stackdriver LogEntry levels. The DEFAULT
value of 0 is not allowed (lowest value is 100, maximum 800).
Value must be greater or equal to 100
and lesser or equal to 800
and a multiple of 1
Value must be greater or equal to 100
and lesser or equal to 800
and a multiple of 1
600
+
600
Enumeration of features supported by this device.
+Discovery of features supported by this device.
No Additional Properties @@ -9575,8 +9885,8 @@Object representation for for a single feature enumeration
+ discovery_feature.jsonObject representation for for a single feature
No Additional Properties @@ -9621,7 +9931,7 @@Address family discovery results.
+Address family discovery discovery results.
No Additional Properties @@ -2191,8 +2191,8 @@Discovery information for an individual protocol family.
+ discovery_family.jsonDiscovery information for a protocol family.
No Additional Properties @@ -2230,7 +2230,7 @@Registry discovery results.
No Additional Properties @@ -2288,18 +2288,286 @@All property whose name matches the following regular expression must respect the following conditions
+ Property name regular expression:^[A-Z]{2,6}-[1-9][0-9]*$
+ Information about an individual registry.
+ + + No Additional Properties + + + + + + +Timestamp of when a message was last seen for this registry
+ + + + + + +"2019-01-17T14:02:29.364Z"
+
Last update of the registry information
+ + + + + + +"2019-01-17T14:02:29.364Z"
+
Device discovery scan results.
+ No Additional Properties + + + + + + +All property whose name matches the following regular expression must respect the following conditions
+ Property name regular expression:^[A-Z]{2,6}-[1-9][0-9]*$
+ Information about an individual device scan result.
+ + + + + + + + + +Collection of data points available for this device.
+ No Additional Properties + + + + + + +Object representation for for a single point enumeration
+ discovery_point.json#Object representation for for a single point discovery
No Additional Properties @@ -2332,18 +2600,18 @@List of possible enumerated values for the point
@@ -2425,7 +2693,7 @@Reference parameter for this point (e.g. BACnet object)
@@ -2614,18 +2882,18 @@Indicates if this point is writable or not
@@ -2662,18 +2930,18 @@Human-readable description of this point
@@ -2710,18 +2978,18 @@A human-readable one-line description of the entry
@@ -2807,25 +3075,25 @@"Point is not writable"
+
"Point is not writable"
An optional extensive entry which can include more detail, e.g. a complete program stack-trace
@@ -2869,18 +3137,18 @@^system\.base\.ready$
+ item 2^system\.base\.ready$
@@ -3265,7 +3533,7 @@ ^system\.config\.receive$
+ item 3^system\.config\.receive$
@@ -3319,7 +3587,7 @@ ^system\.config\.parse$
+ item 4^system\.config\.parse$
@@ -3373,7 +3641,7 @@ ^system\.config\.apply$
+ item 5^system\.config\.apply$
@@ -3427,7 +3695,7 @@ ^system\.auth\.login$
+ item 6^system\.auth\.login$
@@ -3481,7 +3749,7 @@ ^system\.auth\.logout$
+ item 7^system\.auth\.logout$
@@ -3535,7 +3803,7 @@ ^system\.auth\.fail$
+ item 8^system\.auth\.fail$
@@ -3589,7 +3857,7 @@ ^pointset\.point\.nominal$
+ item 9^pointset\.point\.nominal$
@@ -3643,7 +3911,7 @@ ^pointset\.point\.applied$
+ item 10^pointset\.point\.applied$
@@ -3697,7 +3965,7 @@ ^pointset\.point\.updating$
+ item 11^pointset\.point\.updating$
@@ -3751,7 +4019,7 @@ ^pointset\.point\.overridden$
+ item 12^pointset\.point\.overridden$
@@ -3805,7 +4073,7 @@ ^pointset\.point\.failure$
+ item 13^pointset\.point\.failure$
@@ -3859,7 +4127,7 @@ ^pointset\.point\.invalid$
+ item 14^pointset\.point\.invalid$
@@ -3913,7 +4181,7 @@ ^localnet\.network$
+ item 15^localnet\.network$
@@ -3967,7 +4235,7 @@ ^localnet\.network\.connect$
+ item 16^localnet\.network\.connect$
@@ -4021,7 +4289,7 @@ ^gateway\.setup\.attach$
+ item 17^gateway\.setup\.attach$
@@ -4075,7 +4343,7 @@ ^gateway\.proxy\.target$
+ item 18^gateway\.proxy\.target$
@@ -4129,7 +4397,7 @@ ^gateway\.proxy\.connect$
+ item 19^gateway\.proxy\.connect$
@@ -4183,7 +4451,7 @@ ^discovery\.family\.scan$
+ item 20^discovery\.family\.scan$
@@ -4237,7 +4505,7 @@ ^discovery\.device\.enumerate$
+ item 21^discovery\.device\.enumerate$
@@ -4291,7 +4559,7 @@ ^discovery\.point\.describe$
+ item 22^discovery\.point\.describe$
@@ -4345,7 +4613,7 @@ ^mapping\.device\.apply$
+ item 23^mapping\.device\.apply$
@@ -4399,7 +4667,7 @@ ^blobset\.blob\.receive$
+ item 24^blobset\.blob\.receive$
@@ -4453,7 +4721,7 @@ ^blobset\.blob\.fetch$
+ item 25^blobset\.blob\.fetch$
@@ -4507,7 +4775,7 @@ ^blobset\.blob\.apply$
+ item 26^blobset\.blob\.apply$
@@ -4561,7 +4829,7 @@ ^validation\.device\.receive$
+ item 27^validation\.device\.receive$
@@ -4615,7 +4883,7 @@ ^validation\.device\.schema$
+ item 28^validation\.device\.schema$
@@ -4669,7 +4937,7 @@ ^validation\.device\.content$
+ item 29^validation\.device\.content$
@@ -4723,7 +4991,7 @@ ^validation\.device\.multiple$
+ item 30^validation\.device\.multiple$
@@ -4777,7 +5045,7 @@ ^validation\.device\.extra$
+ item 31^validation\.device\.extra$
@@ -4831,7 +5099,7 @@ ^validation\.summary\.report$
+ item 32^validation\.summary\.report$
@@ -4885,7 +5153,7 @@ ^validation\.feature\.sequence$
+ item 33^validation\.feature\.sequence$
@@ -4939,7 +5207,7 @@ ^validation\.feature\.schema$
+ item 34^validation\.feature\.schema$
@@ -4993,7 +5261,7 @@ ^validation\.feature\.capability$
+ item 35^validation\.feature\.capability$
@@ -5047,7 +5315,7 @@ ^device(\.[a-z]+((_[a-z]+))*)+$
+ item 36^device(\.[a-z]+((_[a-z]+))*)+$
@@ -5111,18 +5379,18 @@ FC 3339 UTC timestamp the condition was triggered, or most recently updated
@@ -5163,25 +5431,25 @@"2018-08-26T21:39:28.364Z"
+
"2018-08-26T21:39:28.364Z"
The status level
should conform to the numerical Stackdriver LogEntry levels. The DEFAULT
value of 0 is not allowed (lowest value is 100, maximum 800).
Value must be greater or equal to 100
and lesser or equal to 800
and a multiple of 1
Value must be greater or equal to 100
and lesser or equal to 800
and a multiple of 1
600
+
600
Enumeration of features supported by this device.
+Discovery of features supported by this device.
No Additional Properties @@ -5354,8 +5622,8 @@Object representation for for a single feature enumeration
+ discovery_feature.jsonObject representation for for a single feature
No Additional Properties @@ -5393,7 +5661,7 @@Discovery result with implicit enumeration
+Discovery result with implicit results
No Additional Properties diff --git a/gencode/docs/metadata.html b/gencode/docs/metadata.html index 102f6ec234..e687529623 100644 --- a/gencode/docs/metadata.html +++ b/gencode/docs/metadata.html @@ -2909,8 +2909,8 @@Object representation for for a single feature enumeration
+ discovery_feature.jsonObject representation for for a single feature
No Additional Properties @@ -2948,7 +2948,7 @@Generational marker for enumeration
+Generational marker to group results together
@@ -17072,7 +17072,7 @@Optional enumeration indicating the state of the points value.
+State of the individual point
diff --git a/gencode/java/udmi/schema/DeviceDiscovery.java b/gencode/java/udmi/schema/DeviceDiscovery.java new file mode 100644 index 0000000000..f85d93586d --- /dev/null +++ b/gencode/java/udmi/schema/DeviceDiscovery.java @@ -0,0 +1,41 @@ + +package udmi.schema; + +import javax.annotation.processing.Generated; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; + + +/** + * Device Discovery + *
+ * Information about an individual device scan result.
+ *
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+
+})
+@Generated("jsonschema2pojo")
+public class DeviceDiscovery {
+
+
+ @Override
+ public int hashCode() {
+ int result = 1;
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+ if ((other instanceof DeviceDiscovery) == false) {
+ return false;
+ }
+ DeviceDiscovery rhs = ((DeviceDiscovery) other);
+ return true;
+ }
+
+}
diff --git a/gencode/java/udmi/schema/DiscoveryConfig.java b/gencode/java/udmi/schema/DiscoveryConfig.java
index 2aedce7266..6aeaff8ba3 100644
--- a/gencode/java/udmi/schema/DiscoveryConfig.java
+++ b/gencode/java/udmi/schema/DiscoveryConfig.java
@@ -32,14 +32,19 @@ public class DiscoveryConfig {
@JsonProperty("generation")
@JsonPropertyDescription("Generational marker for controlling enumeration")
public Date generation;
+ /**
+ * Indicates which discovery sub-categories to activate
+ *
+ */
@JsonProperty("enumerate")
+ @JsonPropertyDescription("Indicates which discovery sub-categories to activate")
public Enumerate enumerate;
/**
- * Address family config for a scan. Not included for device enumeration messages.
+ * Address family config for a scan.
*
*/
@JsonProperty("families")
- @JsonPropertyDescription("Address family config for a scan. Not included for device enumeration messages.")
+ @JsonPropertyDescription("Address family config for a scan.")
public HashMap
- * [Discovery result](../docs/specs/discovery.md) with implicit enumeration
+ * [Discovery result](../docs/specs/discovery.md) with implicit discovery
*
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
@@ -25,7 +25,9 @@
"scan_family",
"scan_addr",
"families",
- "uniqs",
+ "registries",
+ "devices",
+ "points",
"features",
"system"
})
@@ -79,26 +81,40 @@ public class DiscoveryEvent {
@JsonPropertyDescription("The primary address of the device (for scan_family)")
public java.lang.String scan_addr;
/**
- * Address family discovery results.
+ * Address family discovery discovery results.
*
*/
@JsonProperty("families")
- @JsonPropertyDescription("Address family discovery results.")
- public Map
@@ -112,12 +128,14 @@ public class DiscoveryEvent {
public int hashCode() {
int result = 1;
result = ((result* 31)+((this.generation == null)? 0 :this.generation.hashCode()));
+ result = ((result* 31)+((this.devices == null)? 0 :this.devices.hashCode()));
+ result = ((result* 31)+((this.registries == null)? 0 :this.registries.hashCode()));
+ result = ((result* 31)+((this.families == null)? 0 :this.families.hashCode()));
+ result = ((result* 31)+((this.version == null)? 0 :this.version.hashCode()));
+ result = ((result* 31)+((this.points == null)? 0 :this.points.hashCode()));
result = ((result* 31)+((this.features == null)? 0 :this.features.hashCode()));
result = ((result* 31)+((this.system == null)? 0 :this.system.hashCode()));
- result = ((result* 31)+((this.uniqs == null)? 0 :this.uniqs.hashCode()));
result = ((result* 31)+((this.scan_family == null)? 0 :this.scan_family.hashCode()));
- result = ((result* 31)+((this.families == null)? 0 :this.families.hashCode()));
- result = ((result* 31)+((this.version == null)? 0 :this.version.hashCode()));
result = ((result* 31)+((this.timestamp == null)? 0 :this.timestamp.hashCode()));
result = ((result* 31)+((this.status == null)? 0 :this.status.hashCode()));
result = ((result* 31)+((this.scan_addr == null)? 0 :this.scan_addr.hashCode()));
@@ -133,7 +151,7 @@ public boolean equals(Object other) {
return false;
}
DiscoveryEvent rhs = ((DiscoveryEvent) other);
- return (((((((((((this.generation == rhs.generation)||((this.generation!= null)&&this.generation.equals(rhs.generation)))&&((this.features == rhs.features)||((this.features!= null)&&this.features.equals(rhs.features))))&&((this.system == rhs.system)||((this.system!= null)&&this.system.equals(rhs.system))))&&((this.uniqs == rhs.uniqs)||((this.uniqs!= null)&&this.uniqs.equals(rhs.uniqs))))&&((this.scan_family == rhs.scan_family)||((this.scan_family!= null)&&this.scan_family.equals(rhs.scan_family))))&&((this.families == rhs.families)||((this.families!= null)&&this.families.equals(rhs.families))))&&((this.version == rhs.version)||((this.version!= null)&&this.version.equals(rhs.version))))&&((this.timestamp == rhs.timestamp)||((this.timestamp!= null)&&this.timestamp.equals(rhs.timestamp))))&&((this.status == rhs.status)||((this.status!= null)&&this.status.equals(rhs.status))))&&((this.scan_addr == rhs.scan_addr)||((this.scan_addr!= null)&&this.scan_addr.equals(rhs.scan_addr))));
+ return (((((((((((((this.generation == rhs.generation)||((this.generation!= null)&&this.generation.equals(rhs.generation)))&&((this.devices == rhs.devices)||((this.devices!= null)&&this.devices.equals(rhs.devices))))&&((this.registries == rhs.registries)||((this.registries!= null)&&this.registries.equals(rhs.registries))))&&((this.families == rhs.families)||((this.families!= null)&&this.families.equals(rhs.families))))&&((this.version == rhs.version)||((this.version!= null)&&this.version.equals(rhs.version))))&&((this.points == rhs.points)||((this.points!= null)&&this.points.equals(rhs.points))))&&((this.features == rhs.features)||((this.features!= null)&&this.features.equals(rhs.features))))&&((this.system == rhs.system)||((this.system!= null)&&this.system.equals(rhs.system))))&&((this.scan_family == rhs.scan_family)||((this.scan_family!= null)&&this.scan_family.equals(rhs.scan_family))))&&((this.timestamp == rhs.timestamp)||((this.timestamp!= null)&&this.timestamp.equals(rhs.timestamp))))&&((this.status == rhs.status)||((this.status!= null)&&this.status.equals(rhs.status))))&&((this.scan_addr == rhs.scan_addr)||((this.scan_addr!= null)&&this.scan_addr.equals(rhs.scan_addr))));
}
}
diff --git a/gencode/java/udmi/schema/DiscoveryModel.java b/gencode/java/udmi/schema/DiscoveryModel.java
index 0ecd62459a..5bc91ca460 100644
--- a/gencode/java/udmi/schema/DiscoveryModel.java
+++ b/gencode/java/udmi/schema/DiscoveryModel.java
@@ -22,7 +22,7 @@
public class DiscoveryModel {
@JsonProperty("families")
- public HashMap
- * [Discovery result](../docs/specs/discovery.md) with implicit enumeration
+ * [Discovery result](../docs/specs/discovery.md) with implicit discovery
*
*/
@JsonProperty("discovery")
- @JsonPropertyDescription("[Discovery result](../docs/specs/discovery.md) with implicit enumeration")
+ @JsonPropertyDescription("[Discovery result](../docs/specs/discovery.md) with implicit discovery")
public DiscoveryEvent discovery;
@Override
diff --git a/gencode/java/udmi/schema/FamilyDiscoveryEvent.java b/gencode/java/udmi/schema/FamilyDiscovery.java
similarity index 81%
rename from gencode/java/udmi/schema/FamilyDiscoveryEvent.java
rename to gencode/java/udmi/schema/FamilyDiscovery.java
index 4434567d18..bb13fe6b9d 100644
--- a/gencode/java/udmi/schema/FamilyDiscoveryEvent.java
+++ b/gencode/java/udmi/schema/FamilyDiscovery.java
@@ -9,9 +9,9 @@
/**
- * Family Discovery Event
+ * Family Discovery
*
- * Discovery information for an individual protocol family.
+ * Discovery information for a protocol family.
*
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
@@ -19,7 +19,7 @@
"addr"
})
@Generated("jsonschema2pojo")
-public class FamilyDiscoveryEvent {
+public class FamilyDiscovery {
/**
* Device addr in the namespace of the given family
@@ -42,10 +42,10 @@ public boolean equals(Object other) {
if (other == this) {
return true;
}
- if ((other instanceof FamilyDiscoveryEvent) == false) {
+ if ((other instanceof FamilyDiscovery) == false) {
return false;
}
- FamilyDiscoveryEvent rhs = ((FamilyDiscoveryEvent) other);
+ FamilyDiscovery rhs = ((FamilyDiscovery) other);
return ((this.addr == rhs.addr)||((this.addr!= null)&&this.addr.equals(rhs.addr)));
}
diff --git a/gencode/java/udmi/schema/FamilyDiscoveryTestingModel.java b/gencode/java/udmi/schema/FamilyDiscoveryModel.java
similarity index 71%
rename from gencode/java/udmi/schema/FamilyDiscoveryTestingModel.java
rename to gencode/java/udmi/schema/FamilyDiscoveryModel.java
index 89c4ccbe58..93cca8fc3d 100644
--- a/gencode/java/udmi/schema/FamilyDiscoveryTestingModel.java
+++ b/gencode/java/udmi/schema/FamilyDiscoveryModel.java
@@ -7,7 +7,7 @@
/**
- * Family Discovery Testing Model
+ * Family Discovery Model
*
*
*
@@ -17,7 +17,7 @@
})
@Generated("jsonschema2pojo")
-public class FamilyDiscoveryTestingModel {
+public class FamilyDiscoveryModel {
@Override
@@ -31,10 +31,10 @@ public boolean equals(Object other) {
if (other == this) {
return true;
}
- if ((other instanceof FamilyDiscoveryTestingModel) == false) {
+ if ((other instanceof FamilyDiscoveryModel) == false) {
return false;
}
- FamilyDiscoveryTestingModel rhs = ((FamilyDiscoveryTestingModel) other);
+ FamilyDiscoveryModel rhs = ((FamilyDiscoveryModel) other);
return true;
}
diff --git a/gencode/java/udmi/schema/FeatureEnumeration.java b/gencode/java/udmi/schema/FeatureDiscovery.java
similarity index 76%
rename from gencode/java/udmi/schema/FeatureEnumeration.java
rename to gencode/java/udmi/schema/FeatureDiscovery.java
index fd93c48ca9..cd416652a4 100644
--- a/gencode/java/udmi/schema/FeatureEnumeration.java
+++ b/gencode/java/udmi/schema/FeatureDiscovery.java
@@ -13,9 +13,9 @@
/**
- * Feature Enumeration
+ * Feature Discovery
*
- * Object representation for for a single feature enumeration
+ * Object representation for for a single feature
*
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
@@ -23,7 +23,7 @@
"stage"
})
@Generated("jsonschema2pojo")
-public class FeatureEnumeration {
+public class FeatureDiscovery {
/**
* FeatureStage
@@ -33,7 +33,7 @@ public class FeatureEnumeration {
*/
@JsonProperty("stage")
@JsonPropertyDescription("Stage of a feature implemenation")
- public FeatureEnumeration.FeatureStage stage;
+ public FeatureDiscovery.FeatureStage stage;
@Override
public int hashCode() {
@@ -47,10 +47,10 @@ public boolean equals(Object other) {
if (other == this) {
return true;
}
- if ((other instanceof FeatureEnumeration) == false) {
+ if ((other instanceof FeatureDiscovery) == false) {
return false;
}
- FeatureEnumeration rhs = ((FeatureEnumeration) other);
+ FeatureDiscovery rhs = ((FeatureDiscovery) other);
return ((this.stage == rhs.stage)||((this.stage!= null)&&this.stage.equals(rhs.stage)));
}
@@ -70,10 +70,10 @@ public enum FeatureStage {
BETA("beta"),
STABLE("stable");
private final String value;
- private final static Map
- * [Discovery result](../docs/specs/discovery.md) with implicit enumeration
+ * [Discovery result](../docs/specs/discovery.md) with implicit results
*
*/
@JsonProperty("translation")
- @JsonPropertyDescription("[Discovery result](../docs/specs/discovery.md) with implicit enumeration")
+ @JsonPropertyDescription("[Discovery result](../docs/specs/discovery.md) with implicit results")
public HashMap
- * [Discovery result](../docs/specs/discovery.md) with implicit enumeration
+ * [Discovery result](../docs/specs/discovery.md) with implicit results
*
*/
@JsonProperty("translation")
- @JsonPropertyDescription("[Discovery result](../docs/specs/discovery.md) with implicit enumeration")
+ @JsonPropertyDescription("[Discovery result](../docs/specs/discovery.md) with implicit results")
public HashMap
diff --git a/gencode/java/udmi/schema/PointEnumerationEvent.java b/gencode/java/udmi/schema/PointDiscovery.java
similarity index 94%
rename from gencode/java/udmi/schema/PointEnumerationEvent.java
rename to gencode/java/udmi/schema/PointDiscovery.java
index 054f7bb8dc..f3fb5d09d0 100644
--- a/gencode/java/udmi/schema/PointEnumerationEvent.java
+++ b/gencode/java/udmi/schema/PointDiscovery.java
@@ -12,9 +12,9 @@
/**
- * Point Enumeration Event
+ * Point Discovery
*
- * Object representation for for a single point enumeration
+ * Object representation for for a single point discovery
*
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
@@ -30,7 +30,7 @@
"ancillary"
})
@Generated("jsonschema2pojo")
-public class PointEnumerationEvent {
+public class PointDiscovery {
/**
* Friendly name for the point, if known
@@ -119,10 +119,10 @@ public boolean equals(java.lang.Object other) {
if (other == this) {
return true;
}
- if ((other instanceof PointEnumerationEvent) == false) {
+ if ((other instanceof PointDiscovery) == false) {
return false;
}
- PointEnumerationEvent rhs = ((PointEnumerationEvent) other);
+ PointDiscovery rhs = ((PointDiscovery) other);
return ((((((((((this.ref == rhs.ref)||((this.ref!= null)&&this.ref.equals(rhs.ref)))&&((this.possible_values == rhs.possible_values)||((this.possible_values!= null)&&this.possible_values.equals(rhs.possible_values))))&&((this.name == rhs.name)||((this.name!= null)&&this.name.equals(rhs.name))))&&((this.description == rhs.description)||((this.description!= null)&&this.description.equals(rhs.description))))&&((this.units == rhs.units)||((this.units!= null)&&this.units.equals(rhs.units))))&&((this.type == rhs.type)||((this.type!= null)&&this.type.equals(rhs.type))))&&((this.ancillary == rhs.ancillary)||((this.ancillary!= null)&&this.ancillary.equals(rhs.ancillary))))&&((this.writable == rhs.writable)||((this.writable!= null)&&this.writable.equals(rhs.writable))))&&((this.status == rhs.status)||((this.status!= null)&&this.status.equals(rhs.status))));
}
diff --git a/gencode/java/udmi/schema/PointPointsetState.java b/gencode/java/udmi/schema/PointPointsetState.java
index 89cff4244e..550c31a326 100644
--- a/gencode/java/udmi/schema/PointPointsetState.java
+++ b/gencode/java/udmi/schema/PointPointsetState.java
@@ -35,11 +35,11 @@ public class PointPointsetState {
@JsonPropertyDescription("If specified, indicates a programmed point unit. If empty, means unspecified or matches configured point.")
public String units;
/**
- * Optional enumeration indicating the state of the points value.
+ * State of the individual point
*
*/
@JsonProperty("value_state")
- @JsonPropertyDescription("Optional enumeration indicating the state of the points value.")
+ @JsonPropertyDescription("State of the individual point")
public PointPointsetState.Value_state value_state;
/**
* Entry
@@ -73,7 +73,7 @@ public boolean equals(Object other) {
/**
- * Optional enumeration indicating the state of the points value.
+ * State of the individual point
*
*/
@Generated("jsonschema2pojo")
diff --git a/gencode/java/udmi/schema/RegistryDiscovery.java b/gencode/java/udmi/schema/RegistryDiscovery.java
new file mode 100644
index 0000000000..bc01537ace
--- /dev/null
+++ b/gencode/java/udmi/schema/RegistryDiscovery.java
@@ -0,0 +1,61 @@
+
+package udmi.schema;
+
+import java.util.Date;
+import javax.annotation.processing.Generated;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyDescription;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+
+/**
+ * Registry Discovery
+ *
+ * Information about an individual registry.
+ *
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+@JsonPropertyOrder({
+ "last_seen",
+ "last_update"
+})
+@Generated("jsonschema2pojo")
+public class RegistryDiscovery {
+
+ /**
+ * Timestamp of when a message was last seen for this registry
+ *
+ */
+ @JsonProperty("last_seen")
+ @JsonPropertyDescription("Timestamp of when a message was last seen for this registry")
+ public Date last_seen;
+ /**
+ * Last update of the registry information
+ *
+ */
+ @JsonProperty("last_update")
+ @JsonPropertyDescription("Last update of the registry information")
+ public Date last_update;
+
+ @Override
+ public int hashCode() {
+ int result = 1;
+ result = ((result* 31)+((this.last_seen == null)? 0 :this.last_seen.hashCode()));
+ result = ((result* 31)+((this.last_update == null)? 0 :this.last_update.hashCode()));
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object other) {
+ if (other == this) {
+ return true;
+ }
+ if ((other instanceof RegistryDiscovery) == false) {
+ return false;
+ }
+ RegistryDiscovery rhs = ((RegistryDiscovery) other);
+ return (((this.last_seen == rhs.last_seen)||((this.last_seen!= null)&&this.last_seen.equals(rhs.last_seen)))&&((this.last_update == rhs.last_update)||((this.last_update!= null)&&this.last_update.equals(rhs.last_update))));
+ }
+
+}
diff --git a/gencode/java/udmi/schema/SchemaValidationState.java b/gencode/java/udmi/schema/SchemaValidationState.java
index 2b3c79c6cb..f7b437296c 100644
--- a/gencode/java/udmi/schema/SchemaValidationState.java
+++ b/gencode/java/udmi/schema/SchemaValidationState.java
@@ -6,7 +6,7 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import udmi.schema.FeatureEnumeration.FeatureStage;
+import udmi.schema.FeatureDiscovery.FeatureStage;
/**
diff --git a/gencode/java/udmi/schema/SequenceValidationState.java b/gencode/java/udmi/schema/SequenceValidationState.java
index 967c253f0d..459d05412e 100644
--- a/gencode/java/udmi/schema/SequenceValidationState.java
+++ b/gencode/java/udmi/schema/SequenceValidationState.java
@@ -41,7 +41,7 @@ public class SequenceValidationState {
*/
@JsonProperty("stage")
@JsonPropertyDescription("Stage of a feature implemenation")
- public udmi.schema.FeatureEnumeration.FeatureStage stage;
+ public udmi.schema.FeatureDiscovery.FeatureStage stage;
@JsonProperty("capabilities")
public Map Pass if: final interval < new sample_rate_min + tolerance
- * Fail if: final interval > new sample_rate_min + tolerance Skip if: initial interval < 5s (too
- * fast for automated test)
- */
- @Test(timeout = THREE_MINUTES_MS)
- @Feature(stage = BETA, bucket = POINTSET)
- @Summary("Check that a device publishes pointset events not faster than config sample_rate_sec")
- public void pointset_sample_rate() {
- ifNullSkipTest(deviceConfig.pointset, "no pointset found in config");
-
- // Clear received events because this could contain messages from a previous sample rate test
- popReceivedEvents(PointsetEvent.class);
-
- Instant endTime = Instant.now().plusSeconds(DEFAULT_SAMPLE_RATE_SEC * 3);
- // To pick the test sample rate, either measure the devices
- // given sampling rate from its last 2 messages and half it or use
- // a value if long
- untilTrue("measure initial sample rate",
- () -> (countReceivedEvents(PointsetEvent.class) > 1
- || Instant.now().isAfter(endTime))
- );
-
- final int testSampleRate;
- if (countReceivedEvents(PointsetEvent.class) < 2) {
- // 2 messages not seen, assume interval is longer than wait period, pick a small number
- testSampleRate = DEFAULT_SAMPLE_RATE_SEC;
- } else {
- List