From 676ca4cb2c5742adf82e478326860a57f1eb7158 Mon Sep 17 00:00:00 2001 From: Trevor Date: Wed, 28 Feb 2024 10:56:47 -0800 Subject: [PATCH] Add proxied device sequence test (#817) --- .gencode_hash.txt | 58 +- .github/workflows/testing.yml | 32 +- .wordlist.txt | 1 + bin/sequencer | 12 +- bin/sequencer_report | 12 +- bin/support_process | 2 +- bin/test_registrar | 15 +- bin/test_sequcheck | 42 +- bin/test_sequencer | 25 +- bin/test_sequencer_plan | 10 +- bin/test_sites | 6 +- bin/test_trace | 3 + bin/test_validator | 5 +- .../com/google/udmi/util/GeneralUtils.java | 8 +- docs/specs/categories.md | 10 +- docs/specs/sequences/generated.md | 7 + etc/schema_itemized.out | 1 + etc/sequencer.out | 2 + etc/sequencer_nostate.out | 1 + etc/test_itemized.in | 1 + etc/test_itemized.out | 3 +- etc/validator.out | 17 + gencode/docs/command_mapping.html | 148 +- gencode/docs/config.html | 313 +- gencode/docs/config_mapping.html | 176 +- gencode/docs/configuration_pubber.html | 40 + gencode/docs/event.html | 528 ++- gencode/docs/event_discovery.html | 324 +- gencode/docs/event_mapping.html | 148 +- gencode/docs/event_system.html | 162 +- gencode/docs/event_validation.html | 310 +- gencode/docs/metadata.html | 185 +- gencode/docs/monitoring.html | 190 +- gencode/docs/state.html | 2541 +++++++------ gencode/docs/state_mapping.html | 176 +- gencode/docs/state_validation.html | 1238 ++++++- gencode/java/udmi/schema/Category.java | 36 +- gencode/java/udmi/schema/Config.java | 4 +- .../java/udmi/schema/FamilyLocalnetModel.java | 18 +- gencode/java/udmi/schema/GatewayConfig.java | 15 +- gencode/java/udmi/schema/GatewayModel.java | 16 +- gencode/java/udmi/schema/GatewayState.java | 16 +- gencode/java/udmi/schema/LocalnetConfig.java | 17 +- gencode/java/udmi/schema/Operation.java | 1 + gencode/java/udmi/schema/PubberOptions.java | 6 +- gencode/python/udmi/schema/config_gateway.py | 5 + gencode/python/udmi/schema/config_localnet.py | 42 +- gencode/python/udmi/schema/model_gateway.py | 9 +- .../udmi/schema/model_localnet_family.py | 4 + gencode/python/udmi/schema/options_pubber.py | 4 + gencode/python/udmi/schema/state_gateway.py | 9 +- .../main/java/daq/pubber/DeviceManager.java | 2 +- .../main/java/daq/pubber/GatewayManager.java | 58 +- .../main/java/daq/pubber/MqttPublisher.java | 25 +- schema/category.json | 6 +- schema/common.json | 1 + schema/config_gateway.json | 4 + schema/config_localnet.json | 30 +- schema/model_gateway.json | 5 +- schema/model_localnet_family.json | 11 +- schema/options_pubber.json | 3 + schema/state_gateway.json | 12 +- tests/schemas/config/delta_x1_gateway.out | 3 +- tests/schemas/config/delta_x1_target.out | 3 +- tests/schemas/config/direct.json | 16 + .../gateway_test.out => config/direct.out} | 0 tests/schemas/config/proxy.json | 11 +- tests/schemas/event_system/categories.out | 12 +- tests/schemas/event_system/errors.out | 2 +- tests/schemas/metadata/direct.json | 28 + tests/schemas/metadata/direct.out | 0 tests/schemas/metadata/proxy.json | 11 +- tests/schemas/state/direct.json | 53 + tests/schemas/state/direct.out | 0 tests/schemas/state/gateway.json | 22 +- tests/schemas/state/gateway_test.json | 40 - tests/schemas/state/proxy.json | 41 + tests/schemas/state/proxy.out | 0 .../DWN-1/expected/generated_config.json | 7 - .../AHU-1/expected/generated_config.json | 12 +- .../devices/AHU-1/expected/metadata_norm.json | 4 +- .../sites/missing/devices/AHU-1/metadata.json | 2 +- .../devices/AHU-22/expected/errors.map | 4 + .../devices/AHU-22/expected/exceptions.txt | 5 + .../AHU-22/expected/generated_config.json | 31 - .../AHU-22/expected/metadata_norm.json | 15 +- .../missing/devices/AHU-22/metadata.json | 12 +- .../SNS-4/expected/generated_config.json | 8 + .../devices/SNS-4/expected/metadata_norm.json | 19 +- .../sites/missing/devices/SNS-4/metadata.json | 14 +- .../devices/GAT-123/001_state_update.json | 8 - .../devices/GAT-123/002_state_gateway.json | 10 +- .../expected/devices/GAT-123/state.json | 11 +- .../devices/GAT-123/state_gateway.json | 8 - udmis/bin/build | 1 + .../access/ClearBladeIotAccessProvider.java | 8 +- .../udmi/service/access/ProfilingProxy.java | 1 - udmis/udmis.iml | 2 +- .../SequenceRunner_Individual_Test.xml | 2 +- .../sequences/bad_target_family/sequence.md | 6 + .../sequences/bad_target_family/sequencer.log | 29 + .../sequences/bad_target_family/system.log | 1 + .../config_update.attr | 6 +- .../config_update.json | 19 +- .../event_pointset.attr | 6 +- .../event_pointset.json | 8 +- .../event_system.attr | 6 +- .../event_system.json | 250 +- .../local_localnet.json | 7 +- .../local_pointset.json | 8 +- .../local_system.json | 2 +- .../local_update.json | 21 +- .../endpoint_connection_error/sequencer.log | 3292 +++++++++-------- .../state_blobset.attr | 6 +- .../state_blobset.json | 10 +- .../state_localnet.attr | 6 +- .../state_localnet.json | 10 +- .../state_pointset.attr | 6 +- .../state_pointset.json | 4 +- .../state_system.attr | 6 +- .../state_system.json | 12 +- .../state_update.attr | 6 +- .../state_update.json | 18 +- .../endpoint_connection_error/system.log | 113 +- .../gateway_attach_handling/sequence.md | 6 + .../gateway_attach_handling/sequencer.log | 29 + .../gateway_attach_handling/system.log | 1 + .../multi_enumeration/config_update.attr | 4 +- .../multi_enumeration/config_update.json | 9 +- .../multi_enumeration/event_discovery.attr | 4 +- .../multi_enumeration/event_discovery.json | 15 +- .../multi_enumeration/event_pointset.attr | 4 +- .../multi_enumeration/event_pointset.json | 6 +- .../multi_enumeration/event_system.attr | 4 +- .../multi_enumeration/event_system.json | 85 +- .../multi_enumeration/local_blobset.json | 1 - .../multi_enumeration/local_pointset.json | 16 + .../multi_enumeration/local_system.json | 4 +- .../multi_enumeration/local_update.json | 26 +- .../sequences/multi_enumeration/sequencer.log | 2280 +++++++----- .../multi_enumeration/state_discovery.attr | 4 +- .../multi_enumeration/state_discovery.json | 6 +- .../multi_enumeration/state_localnet.attr | 4 +- .../multi_enumeration/state_localnet.json | 10 +- .../multi_enumeration/state_pointset.attr | 4 +- .../multi_enumeration/state_pointset.json | 4 +- .../multi_enumeration/state_system.attr | 4 +- .../multi_enumeration/state_system.json | 12 +- .../multi_enumeration/state_update.attr | 4 +- .../multi_enumeration/state_update.json | 18 +- .../sequences/multi_enumeration/system.log | 33 +- .../periodic_scan/config_update.attr | 4 +- .../periodic_scan/config_update.json | 23 +- .../periodic_scan/event_discovery.attr | 4 +- .../periodic_scan/event_discovery.json | 10 +- .../periodic_scan/event_pointset.attr | 4 +- .../periodic_scan/event_pointset.json | 4 +- .../sequences/periodic_scan/event_system.attr | 4 +- .../sequences/periodic_scan/event_system.json | 22 +- .../periodic_scan/local_blobset.json | 1 - .../periodic_scan/local_discovery.json | 4 +- .../periodic_scan/local_pointset.json | 16 + .../sequences/periodic_scan/local_system.json | 4 +- .../sequences/periodic_scan/local_update.json | 30 +- validator/sequences/periodic_scan/sequence.md | 2 +- .../sequences/periodic_scan/sequencer.log | 2319 +++++++----- .../periodic_scan/state_discovery.attr | 4 +- .../periodic_scan/state_discovery.json | 8 +- .../periodic_scan/state_localnet.attr | 4 +- .../periodic_scan/state_localnet.json | 10 +- .../periodic_scan/state_pointset.attr | 4 +- .../periodic_scan/state_pointset.json | 4 +- .../sequences/periodic_scan/state_system.attr | 4 +- .../sequences/periodic_scan/state_system.json | 16 +- .../sequences/periodic_scan/state_update.attr | 4 +- .../sequences/periodic_scan/state_update.json | 26 +- validator/sequences/periodic_scan/system.log | 56 +- .../pointset_enumeration/config_update.attr | 4 +- .../pointset_enumeration/config_update.json | 19 +- .../pointset_enumeration/event_discovery.attr | 4 +- .../pointset_enumeration/event_discovery.json | 6 +- .../pointset_enumeration/event_pointset.attr | 4 +- .../pointset_enumeration/event_pointset.json | 6 +- .../pointset_enumeration/event_system.attr | 4 +- .../pointset_enumeration/event_system.json | 75 +- .../pointset_enumeration/local_blobset.json | 1 - .../pointset_enumeration/local_pointset.json | 16 + .../pointset_enumeration/local_system.json | 4 +- .../pointset_enumeration/local_update.json | 26 +- .../pointset_enumeration/sequencer.log | 2245 ++++++----- .../pointset_enumeration/state_discovery.attr | 4 +- .../pointset_enumeration/state_discovery.json | 6 +- .../pointset_enumeration/state_localnet.attr | 4 +- .../pointset_enumeration/state_localnet.json | 10 +- .../pointset_enumeration/state_pointset.attr | 4 +- .../pointset_enumeration/state_pointset.json | 4 +- .../pointset_enumeration/state_system.attr | 4 +- .../pointset_enumeration/state_system.json | 16 +- .../pointset_enumeration/state_update.attr | 4 +- .../pointset_enumeration/state_update.json | 22 +- .../sequences/pointset_enumeration/system.log | 31 +- .../pointset_remove_point/config_update.attr | 6 +- .../pointset_remove_point/config_update.json | 12 +- .../pointset_remove_point/event_pointset.attr | 6 +- .../pointset_remove_point/event_pointset.json | 8 +- .../pointset_remove_point/event_system.attr | 6 +- .../pointset_remove_point/event_system.json | 31 +- .../local_discovery.json | 1 - .../pointset_remove_point/local_system.json | 4 +- .../pointset_remove_point/local_update.json | 18 +- .../pointset_remove_point/sequencer.log | 2737 +++++++------- .../state_discovery.attr | 10 - .../state_discovery.json | 4 - .../pointset_remove_point/state_localnet.attr | 6 +- .../pointset_remove_point/state_localnet.json | 10 +- .../pointset_remove_point/state_pointset.attr | 6 +- .../pointset_remove_point/state_pointset.json | 4 +- .../pointset_remove_point/state_system.attr | 6 +- .../pointset_remove_point/state_system.json | 12 +- .../pointset_remove_point/state_update.attr | 6 +- .../pointset_remove_point/state_update.json | 19 +- .../pointset_remove_point/system.log | 53 +- .../sequences/single_scan/config_update.attr | 4 +- .../sequences/single_scan/config_update.json | 22 +- .../single_scan/event_discovery.attr | 4 +- .../single_scan/event_discovery.json | 10 +- .../sequences/single_scan/event_pointset.attr | 4 +- .../sequences/single_scan/event_pointset.json | 6 +- .../sequences/single_scan/event_system.attr | 4 +- .../sequences/single_scan/event_system.json | 20 +- .../single_scan/local_discovery.json | 4 +- .../sequences/single_scan/local_pointset.json | 16 + .../sequences/single_scan/local_system.json | 4 +- .../sequences/single_scan/local_update.json | 30 +- validator/sequences/single_scan/sequence.md | 2 +- validator/sequences/single_scan/sequencer.log | 2528 +++++++------ .../single_scan/state_discovery.attr | 4 +- .../single_scan/state_discovery.json | 8 +- .../sequences/single_scan/state_localnet.attr | 4 +- .../sequences/single_scan/state_localnet.json | 10 +- .../sequences/single_scan/state_pointset.attr | 4 +- .../sequences/single_scan/state_pointset.json | 4 +- .../sequences/single_scan/state_system.attr | 4 +- .../sequences/single_scan/state_system.json | 16 +- .../sequences/single_scan/state_update.attr | 4 +- .../sequences/single_scan/state_update.json | 26 +- validator/sequences/single_scan/system.log | 60 +- .../daq/mqtt/registrar/LocalDevice.java | 39 +- .../google/daq/mqtt/registrar/Registrar.java | 78 +- .../daq/mqtt/sequencer/PointsetBase.java | 6 + .../daq/mqtt/sequencer/SequenceBase.java | 16 +- .../sequencer/sequences/GatewaySequences.java | 19 +- .../sequencer/sequences/ProxiedSequences.java | 64 + .../google/daq/mqtt/util/BacnetFamily.java | 32 + .../google/daq/mqtt/util/CloudIotManager.java | 19 +- .../google/daq/mqtt/util/ConfigGenerator.java | 168 +- .../google/daq/mqtt/util/NetworkFamily.java | 48 + .../google/daq/mqtt/util/VendorFamily.java | 17 + 258 files changed, 15321 insertions(+), 10058 deletions(-) create mode 100644 tests/schemas/config/direct.json rename tests/schemas/{state/gateway_test.out => config/direct.out} (100%) create mode 100644 tests/schemas/metadata/direct.json create mode 100644 tests/schemas/metadata/direct.out create mode 100644 tests/schemas/state/direct.json create mode 100644 tests/schemas/state/direct.out delete mode 100644 tests/schemas/state/gateway_test.json create mode 100644 tests/schemas/state/proxy.json create mode 100644 tests/schemas/state/proxy.out create mode 100644 tests/sites/missing/devices/AHU-22/expected/errors.map create mode 100644 tests/sites/missing/devices/AHU-22/expected/exceptions.txt delete mode 100644 tests/sites/missing/devices/AHU-22/expected/generated_config.json create mode 100644 validator/sequences/bad_target_family/sequence.md create mode 100644 validator/sequences/bad_target_family/sequencer.log create mode 100644 validator/sequences/bad_target_family/system.log create mode 100644 validator/sequences/gateway_attach_handling/sequence.md create mode 100644 validator/sequences/gateway_attach_handling/sequencer.log create mode 100644 validator/sequences/gateway_attach_handling/system.log delete mode 100644 validator/sequences/multi_enumeration/local_blobset.json create mode 100644 validator/sequences/multi_enumeration/local_pointset.json delete mode 100644 validator/sequences/periodic_scan/local_blobset.json create mode 100644 validator/sequences/periodic_scan/local_pointset.json delete mode 100644 validator/sequences/pointset_enumeration/local_blobset.json create mode 100644 validator/sequences/pointset_enumeration/local_pointset.json delete mode 100644 validator/sequences/pointset_remove_point/local_discovery.json delete mode 100644 validator/sequences/pointset_remove_point/state_discovery.attr delete mode 100644 validator/sequences/pointset_remove_point/state_discovery.json create mode 100644 validator/sequences/single_scan/local_pointset.json create mode 100644 validator/src/main/java/com/google/daq/mqtt/sequencer/sequences/ProxiedSequences.java create mode 100644 validator/src/main/java/com/google/daq/mqtt/util/BacnetFamily.java create mode 100644 validator/src/main/java/com/google/daq/mqtt/util/NetworkFamily.java create mode 100644 validator/src/main/java/com/google/daq/mqtt/util/VendorFamily.java diff --git a/.gencode_hash.txt b/.gencode_hash.txt index 98f34d0d12..f40b64142f 100644 --- a/.gencode_hash.txt +++ b/.gencode_hash.txt @@ -1,29 +1,29 @@ 433b3c972a2d4de6f54cf32f00f918fa7e3fd80d4bf29a2c7bee182f532bc660 gencode/docs/command_discovery.html -e5ae5dd058ce298448741a75a6ac67166a9f197b32061b9cbfd47655861864e2 gencode/docs/command_mapping.html -99876633b27acba744ac737a9682e01258752c5439effd07193317767a41a0c6 gencode/docs/config.html -6e853ce072dde0bccd7cdeb31845301ba681841d7cb21a8ff90d023bc9597729 gencode/docs/config_mapping.html +41c2bc68fc3b8151b6a504c8adfe47d7453b972a38e4e056238241ae12ad2859 gencode/docs/command_mapping.html +81ba8b959b8ac79fe792eef5a4aaf984fcfbe3e7b94987556dd23a329dbaac5b gencode/docs/config.html +22bfb3fd7c0e73dac4cbd830aa7983714917ec6da813f6bf5768ce3aa9786fb2 gencode/docs/config_mapping.html e9f5572ab03a36aa926b5b0496fc58af03eca92b83271eafa3e2e65f7936f05b gencode/docs/configuration_endpoint.html 4ac793390f9a8e9bb6aa74f72265cd166fe185a426df7589b7bf56a5c409e3fd gencode/docs/configuration_execution.html f7fc9ba938347df94df71bb3c5fee5aae3626de8eb7f5bdc36357c186b0f7b36 gencode/docs/configuration_pod.html -5bbb3136ad3a8d3cc797767b496aa3c45c084beefba4e129d62374a64cd0fbfa gencode/docs/configuration_pubber.html -a5454f8dc6a843115823d1122ce34e36a5e9058cd3f6ea42c3482c8b4b5adf72 gencode/docs/event.html -f7268ffd426cd03007e85a7f73347888c569f2ae92f10ec5569885d1a6c5e807 gencode/docs/event_discovery.html -d0db0ed95c6e2aef32cd55749a13053db2809503e82b20ee04b98fd7f58c1e93 gencode/docs/event_mapping.html +e8c20a53a51febbeb7da3869b768635cb2030d3c690bf92cdb8516835f750664 gencode/docs/configuration_pubber.html +9a4c3876ca5dd7bbbec722a88cfbf99deef5eda23e62404259cad0a3bc242cfd gencode/docs/event.html +06e6f3a4d8de12d11fce0071baff640a9c4dc01d72d537557ed10b08eda4ccab gencode/docs/event_discovery.html +78f655972772f4bee92d88c3a26535612735c794837bfd6f479faeb2e8d8691e gencode/docs/event_mapping.html f6ca85990e940f109a48e35b25102d8860e5707a7b2145412046f44d599ef635 gencode/docs/event_pointset.html -110090929fdb5af934c852768d25467361a21be7d8a693de333219ce47fa83fb gencode/docs/event_system.html -4c15e549ded3e0489e1717e24a68a94b3995e43c2032ea7ca1c89deaa4f18c21 gencode/docs/event_validation.html -f927607a6acca2dc77bc748287c7db207b348aaef4a77811b4e0724c738ba095 gencode/docs/metadata.html -5d0fa84dde29cbc20b6fe3a3c17819c711360cc8b6388a680c3995a7dcc08a5f gencode/docs/monitoring.html +f849ebe1085d81fb0f16654b7c9d3d14c59b56b1c75154e100b85398694657fd gencode/docs/event_system.html +a4a99c4be9483e889c2d0d180d72d2ed332d587ac9305c7615da0e70fd55a56d gencode/docs/event_validation.html +1d3975eea536fc46c35818db12476296e0968b3a9bc3af787a01038b3d0a518f gencode/docs/metadata.html +93bfecd5facd0ead4c75a90f350fa715e6fb8bdab71d81b1f3e46994f03c1c2e gencode/docs/monitoring.html a300dd8e873610121d817385acbd16a75a914766ead0b0d798031d1ca0499ad4 gencode/docs/persistent_device.html 5d039d607af9ec75ee552dfe36b16c702687ea16f5663f41fc49b4533b86e00d gencode/docs/properties.html 1766f84518a315fe57e4a4bf934c0a386ad61d87091754a6bab097c686c16019 gencode/docs/readme.md 741b880216be3743f6747800a042f2dbd89f3b0344c6b0a965f4bc010f03a930 gencode/docs/schema_doc.css 878ea88206c974f40643c3cc430875f9c4e8c5e3fd6bcd6358bd3eb6d48699a9 gencode/docs/schema_doc.min.js 7ed934930aee763e0beebc349725ba3909115e8d346bb762f28bcbe745bb163a gencode/docs/schema_extras.js -bbe055a43bea21f55730f5b23b95fa634d31a806a53d3506735f44c43cd03462 gencode/docs/state.html -803eb830c325e0b75f90192d1a4bf46808e8a84198d707ae8950cd519693afb9 gencode/docs/state_mapping.html +4e3d45425d94a2ca826fea24ded247dc812264e580087f6c69d860cf5c79688d gencode/docs/state.html +b2398e7f9e352c47867e38f97168f3eb88e23280c7dd576f13e038c8c3f714c9 gencode/docs/state_mapping.html 567b27a9257816eb9a9063ce089fe0f58c5962f10ea449bb7c653bd6151365a8 gencode/docs/state_udmi.html -fd65f4f64ed324847dbcf90a5c2e215f52f367284f90914f2eba3bc9348dcfea gencode/docs/state_validation.html +c47793798acffff5a0db724674bb21c1d5780789c63379b57be698aafd12b477 gencode/docs/state_validation.html d39d7fe37a41c74a40080af7b0a429d201ab1fdff7444428c4b98eb7b38c332b gencode/java/udmi/schema/Asset.java b405ce628f7819b46b19950aeaba89ee938fea54261000616bc534b9f81bd59c gencode/java/udmi/schema/Auth_provider.java 0825a5cec83003bb0a6488c4ed7010a04ae0d3848ef36fe01bb4e6718ba7b96d gencode/java/udmi/schema/Aux.java @@ -37,9 +37,9 @@ fcbed49f1af8b791d8c52bcbe18f65521a79d9ac3eb33ec3afd9b342ab2bfc56 gencode/java/u 2e7c0912c6f43b8dae9e9149b7361d3640bde4f01de6e13d8e487fe01be2c2c0 gencode/java/udmi/schema/Bucket.java 0a4f6bcd5065418c1cdc6c05b900b3de31744847d25b6ab6de7aabb1e724710e gencode/java/udmi/schema/BuildingTranslation.java c47b17d70ed7fffae5cb829623088358eca22c8fa5613edd97518bed0b522620 gencode/java/udmi/schema/CapabilityValidationState.java -24e03efa125f374a785dc90132adec6b4e91abf0bf8cb1f9b4b7de80b27f3d09 gencode/java/udmi/schema/Category.java +ec164962f2f00924ecb41ae07c2e01d6bf027951ccc605e0210988370b987973 gencode/java/udmi/schema/Category.java f6a557eb73dfa077d7c5daf897bde345c7403232808608c39e24a0cbee2755c9 gencode/java/udmi/schema/CloudModel.java -aa3fc1777951cb1e1e2a68e4c31a9bdeeacc339cb191c347d88534b185fb04a4 gencode/java/udmi/schema/Config.java +377eb78de936317676faaf7ec5a32ad17f2c2c54a3280df87f5fcc2d36c7014d gencode/java/udmi/schema/Config.java cf9762392e02b5d04c6498963222cc0c00f7be6c3cd82bde3d063a5eceba2b65 gencode/java/udmi/schema/Connections.java 8164e93ccc76d78548d456890e064df8427a09bbcd50686b37a10d3ff5ad429f gencode/java/udmi/schema/Credential.java 10d67bf2080403fd196f63097e4ce2151edaafe3cf4ac77598ef83e06f94cb05 gencode/java/udmi/schema/DeviceMappingConfig.java @@ -61,17 +61,17 @@ e9f5c77be81486b6b8c6d88f70f2d50583d8c3fafa2ac09ead80f44b8d5e751e gencode/java/u 9643391d71c6bd206a4ec69ee7b46ba2bf061b85ccd0bc050046a84df85c8414 gencode/java/udmi/schema/FamilyDiscoveryEvent.java 5ad9bf328fa1500250ff8bc75f2044b3815c5c11cb368e1cc228ac8ca16639c2 gencode/java/udmi/schema/FamilyDiscoveryState.java 9959a84eea3e549c142c3edf637c86eb56eca138108ebd51fc2985e45aa41484 gencode/java/udmi/schema/FamilyDiscoveryTestingModel.java -6c4d5e6a713c9df0d46afac2a3967eee2f087821604f3d9d6a2ff51696486f3f gencode/java/udmi/schema/FamilyLocalnetModel.java +09be38b6d52ea4150fecc3e97adc6793030fcf71da01df12ccb05dc4dd3dad9d gencode/java/udmi/schema/FamilyLocalnetModel.java a7ad0cf79a86a92c8d22b5ac3e609f321454ba4834065e24de208b1f6ebba447 gencode/java/udmi/schema/FamilyLocalnetState.java d33fe8178d2a18cb588dd29edb0e5659af044634b02d7850623cbc057ccb8c6f gencode/java/udmi/schema/FeatureEnumeration.java d3fdb2d8b485c1e61786dfde45cc8be08294339bb31a1b8f02180485789a3ab2 gencode/java/udmi/schema/FeatureValidationState.java -60a8115ae1acae7c199b63180823198d38ec50d57b48dd85aca1ccc865058f85 gencode/java/udmi/schema/GatewayConfig.java -56b46f4914ef1f4baa59bf597186ff7901b7c8b607720ec798f4e4e6ad59aa08 gencode/java/udmi/schema/GatewayModel.java -9d606a8e0a3787fc79c3c89db5a0a3aaa58cf88972ecff7e4052e2ce0f78d3de gencode/java/udmi/schema/GatewayState.java +a4fac9e07e930eec7735f67d78eab1e72881987ecc0475c41ce46ae5a9bc5ea7 gencode/java/udmi/schema/GatewayConfig.java +ce79df57185ee108f6a60efb49c2ea80f249e678d3ccd4d91e702b653571c21b gencode/java/udmi/schema/GatewayModel.java +3ac2583e350075d5a07431c4208b87c9f02a5d1e3c651e3a67cf78f5c680ac52 gencode/java/udmi/schema/GatewayState.java 979a2e7abe2eceb74d0f5180e345ce539ccf475efaad793d0993a514abbbe982 gencode/java/udmi/schema/IotAccess.java b0d4bff14a65ebddc2dd253c996708a4cce99592e82978f057f32a6d9c7768a1 gencode/java/udmi/schema/Jwt.java a5e5adfc187709e8646a11c92e804acfb67743f9d72149008aaca954df3177f6 gencode/java/udmi/schema/Level.java -07fd4911363437b274c19b024759b04b116152176702da8d4203c4ff4cb55b7f gencode/java/udmi/schema/LocalnetConfig.java +06ed183b1a25179efbb9fdc3f077a09f5c84bf689b973cb027f892f90729cddd gencode/java/udmi/schema/LocalnetConfig.java 910c68183db7703b00bcb81146ad73e6fe0d4bbc4caec4dc9c621f3cc2e5eee5 gencode/java/udmi/schema/LocalnetModel.java f6dd2fff0e100160f84a5d62c137c618ed616c82f8722a0530f5393bfc82e281 gencode/java/udmi/schema/LocalnetState.java 2df4ae32d0bbecc21f7c3f6a416a195baa766a6210cfa8abca4a7bb45b9c7961 gencode/java/udmi/schema/Location.java @@ -84,7 +84,7 @@ f6dd2fff0e100160f84a5d62c137c618ed616c82f8722a0530f5393bfc82e281 gencode/java/u df64e4ddbf543ac70e7c2af9d3fbc20ffe3dff68c6718aa9ceadab7f64d3d171 gencode/java/udmi/schema/Metrics.java 14722df90406cdcd29c7c946e5fcdf6a3e513eb879a7fbb493801fc0d9093504 gencode/java/udmi/schema/Monitoring.java b3b7ef6cae004d5fdb4052f860df0aa583df87bb798a027fc769aeaf16489789 gencode/java/udmi/schema/MonitoringMetric.java -3896bacd5b35b37f88bea402947aae7f2f7bab6e63bc30517381158ba0826602 gencode/java/udmi/schema/Operation.java +4e7fb33911cf11845d494a07502577647cb96e1196cb7b76553190d14b6ed099 gencode/java/udmi/schema/Operation.java 5e1c5411fae4d7c47391ceb5d19ae864fcd484df75ac6b6db39fd2d12647dec8 gencode/java/udmi/schema/Physical_tag.java 3e331b3817cc87f2fe087aae3a1e599819ceda1ca086094d7f400f5f1c3bdbb9 gencode/java/udmi/schema/PodConfiguration.java d808259db6bbcd26ecf438844ce286d15d4750906be24588d97acfbe8a4ae315 gencode/java/udmi/schema/PointEnumerationEvent.java @@ -100,7 +100,7 @@ a77b840d671100245c7b68ef8b0130d1ea6375c6ed8a2e145b4208b5962bbc66 gencode/java/u ca2e7566106818ca7e5190c8041eb86f0c9b3251b0bda8c3ea7ce11a0c891a0a gencode/java/udmi/schema/Position.java 3df66bb1a37a9e0b2b6cf392f8c64d404a73c83e5e13c02bb4844f09b9a04b70 gencode/java/udmi/schema/Properties.java d5e11dc354995681b894bcb62e4e21da7f0be68aaa3643a3dc5aa13610741f29 gencode/java/udmi/schema/PubberConfiguration.java -3bff2c98c8d41816b44c7623d542428a6378d3c7a4f9440ae35b395fb1f1e386 gencode/java/udmi/schema/PubberOptions.java +8e0490eed4499749b422ffde98a9588a597e8860b74dedae979abdb22f94c38a gencode/java/udmi/schema/PubberOptions.java 703ed0cecb60f284b52e76dc4d612eb798ba3e8781cc40698a46611b36e6b0c9 gencode/java/udmi/schema/SchemaValidationState.java dc7c549b3358f9b2ceccc8633af3d0fca7eed7c05c94c3396815363b889b4c16 gencode/java/udmi/schema/SequenceValidationState.java 9da49b22341a65580d085fd9d00eaadcaefcf7b813988ef844c617aa4b8a9a4f gencode/java/udmi/schema/SetupUdmiConfig.java @@ -136,8 +136,8 @@ dab4f5fca272ec48c2881bca2b6bc43786ada47fa1f6dd935c35f7ce0eb6b0f6 gencode/python 59039eaf2812392329c641ad387f7e27790cf804fc94a014626d2da5ab426e3d gencode/python/udmi/schema/config_blobset_blob.py 7a6411ba2646881ffad5b6ad472c980e48a11b36ab2c9c77d12608ccc7225594 gencode/python/udmi/schema/config_discovery.py a5edb9ac5ecd5a4459f93ce613691735f299f35718f2e35410206fc91c263dd1 gencode/python/udmi/schema/config_discovery_family.py -b461bdc24310ef972faf579b5be577b5af67fb0977d6afb4c42955211b26e3d5 gencode/python/udmi/schema/config_gateway.py -297c1650d469d2e55fb2358d094dba5430accab2b5fd7b2b6598d7dafb3bd350 gencode/python/udmi/schema/config_localnet.py +428c11f554390cf6f564a8195607458dec4fb9349b82259a4ca333d9a9b7aa7e gencode/python/udmi/schema/config_gateway.py +8b321b699019dda888783b87655546d6624814fd156c54ed572c0467b5547fca gencode/python/udmi/schema/config_localnet.py ac3facbd96f7cb2f7e387e7497d6a36af379a2687329571f250c5670f9933244 gencode/python/udmi/schema/config_mapping.py 52bce04ef0d73ac1c543dfa676cc9d1d0b5ac8f2ba6dac84b5a26f927a6c2479 gencode/python/udmi/schema/config_mapping_device.py 9eab64849e04b25203d5da47856c3f8dda2b96903e4dc43ab932ee35014700bd gencode/python/udmi/schema/config_pointset.py @@ -172,9 +172,9 @@ dd30f748b5321223933c272d58f5fa6dc319912737255170322f0df3244732a7 gencode/python 805cc8dcb29732d1965bbd533b12d2bc4966d584f05b8a478dd2cac98fd99d52 gencode/python/udmi/schema/model_discovery.py 44d057dffcac3a994e7b894f8e1ebb643ba49d7dbfbb0bfea9cc04f97af0bc47 gencode/python/udmi/schema/model_discovery_family.py bef91798566798ec70b2fe10ae52c909090de9095b92e2567da3cbdcec29cd2c gencode/python/udmi/schema/model_features.py -9416018a6d01094ab7af77c35ae4e5e2271a5d52c3bd3e381a541650415048b2 gencode/python/udmi/schema/model_gateway.py +72d17ba53c9d537720bb0ddf24d615b838fc2b9bb2a5c288742a8d82c77bd85d gencode/python/udmi/schema/model_gateway.py ae6a7bc93b520cdc90cd158f876a58e98a3e000402ebb1ca632f01ee492d408a gencode/python/udmi/schema/model_localnet.py -15437819e992231f9c1be86f7d9c74f2ea73efe0101fda65c0bbaaeb78e6bf93 gencode/python/udmi/schema/model_localnet_family.py +083afb4579592a702876e579bdc3986d85b803f6e0b3da70729ef928502ccad8 gencode/python/udmi/schema/model_localnet_family.py cd4be21b66fb3e28dff96cfd39a878791ae8543f2fe67269b66c2c360d3f2513 gencode/python/udmi/schema/model_pointset.py 1ad65c005d865b9259bfa239b2dc4cd1cde13d312ecbc7843bb61cc31d6cabde gencode/python/udmi/schema/model_pointset_point.py bc5efd660f5ebc8cf27be9f14540fd41d35e09e582307a147eef04c2a42f1bdd gencode/python/udmi/schema/model_system.py @@ -183,7 +183,7 @@ b48ae013d203eb31cc388a084c0cc6f93d4d5534336d4da2ecbccd84a085ea2b gencode/python 5c50847e136a033ea511209238bb570499b43fbee6189dae06603132dcb9f01f gencode/python/udmi/schema/model_testing_target.py 7c9a755ae06c44fc2b8117d7918b6401ce08a7218b86033fb3320eda7286e581 gencode/python/udmi/schema/monitoring.py 3a3873c7db8d5fa13b43629031d36417a4ec4838d612a7b8c2fce7c22fdee009 gencode/python/udmi/schema/monitoring_metric.py -743395d4b764d4fd2614aef85cab680498e5f2560767bc24f424d6594f14d75c gencode/python/udmi/schema/options_pubber.py +26da2bca967fc7d5179e41e07cfa5da8b1019dd28bf55b68d89193b831b064cd gencode/python/udmi/schema/options_pubber.py 6c5f3dd1c5ca9d821e3c48298af118fc7eafd97af9265dfd34b2ed8642efca77 gencode/python/udmi/schema/persistent_device.py a58f8c98e837a5b56126ca0f410e02f1e9cfcd80a8cb429e0ef522defab1f690 gencode/python/udmi/schema/properties.py e604cf0280fe772de5f4e5ecf10dc6c564b6177eeff9cd9fb8b385af8fe10a95 gencode/python/udmi/schema/state.py @@ -191,7 +191,7 @@ e604cf0280fe772de5f4e5ecf10dc6c564b6177eeff9cd9fb8b385af8fe10a95 gencode/python 182e07b534403dcc121d980672e41b0fa2ee55c4da1f5c56f0dad5d599450c80 gencode/python/udmi/schema/state_blobset_blob.py 8c6fc5fd63ab50768cb3662228ed893eb8b9d563cd062efaed12f5079a652d0c gencode/python/udmi/schema/state_discovery.py 624af8bc5b9db460daf9458e141ebc0e29e24d698ebadd6022596d655098e771 gencode/python/udmi/schema/state_discovery_family.py -ea5b58d09ab48315a2c589dcc5b15ab9517c718dad1b8a5f5db6cd5172d1c4b1 gencode/python/udmi/schema/state_gateway.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 cb6a5558fe87dea5bce9e1cc6b22984a7d8c379babc4941c50df13edad36579a gencode/python/udmi/schema/state_mapping.py diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index fc9b1d6037..c60ccf52aa 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 15 steps: - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '17' @@ -25,7 +25,7 @@ jobs: with: python-version: '3.10' - name: Checkout source - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: start and test local servers run: | bin/setup_base @@ -43,7 +43,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 1 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Check Spelling uses: rojopolis/spellcheck-github-actions@0.35.0 with: @@ -55,8 +55,8 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 5 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 20.9.0 - name: Install Angular CLI @@ -82,11 +82,11 @@ jobs: IMAGE_NAME: ${{ github.repository }} GITHUB_REF: ${{ github.ref }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 fetch-tags: true - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '17' @@ -96,7 +96,7 @@ jobs: [[ -n $TARGET_PROJECT ]] - name: Log in to the github registry if: ${{ github.event_name == 'push' }} - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ${{ env.PUSH_REGISTRY }} username: ${{ github.actor }} @@ -113,7 +113,7 @@ jobs: echo Pushing built container as $PUSH_TAG | tee -a $GITHUB_STEP_SUMMARY - name: Build and push docker image if: ${{ github.event_name == 'push' }} - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v5 with: file: udmis/Dockerfile.udmis context: udmis @@ -142,8 +142,8 @@ jobs: MATRIX_SHARD_COUNT: 10 MATRIX_SHARD_INDEX: ${{ matrix.shard }} steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '17' @@ -194,8 +194,8 @@ jobs: TARGET_PROJECT: ${{ vars.TARGET_PROJECT }} UDMI_ALT_REGISTRY: ZZ-REDIRECT-NA steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '17' @@ -239,8 +239,8 @@ jobs: UDMI_ALT_REGISTRY: ZZ-REDIRECT-NA MQTT_PROXY_HOST: ${{ vars.MQTT_PROXY_HOST }} steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: 'temurin' java-version: '17' @@ -274,7 +274,7 @@ jobs: TARGET_PROJECT: ${{ vars.TARGET_PROJECT }} UDMI_ALT_REGISTRY: ZZ-REDIRECT-NA steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-python@v4 with: python-version: '3.10' diff --git a/.wordlist.txt b/.wordlist.txt index 8786cd0dd7..25165cb153 100644 --- a/.wordlist.txt +++ b/.wordlist.txt @@ -158,6 +158,7 @@ UI unconfigured underspecified uniqs +unprocessable unwriteable uplink url diff --git a/bin/sequencer b/bin/sequencer index 838b03c1c1..ab7e16059d 100755 --- a/bin/sequencer +++ b/bin/sequencer @@ -11,6 +11,8 @@ OUT_DIR=$UDMI_ROOT/out mkdir -p $OUT_DIR echo $(date --utc +%Y%m%d-%H%M%S) $0 $@ >> $OUT_DIR/cmd_history.log +JARFILE=validator/build/libs/validator-1.0-SNAPSHOT-all.jar +JAVA_CMD="java -cp $JARFILE com.google.daq.mqtt.sequencer.SequenceRunner" SEQUENCER_LOG=$OUT_DIR/sequencer.log SEQUENCER_OUT=$OUT_DIR/sequencer.out SCHEMA_OUT=$OUT_DIR/schema.out @@ -24,6 +26,14 @@ export LC_ALL=C rm -f $SEQUENCER_LOG $SEQUENCER_OUT $SCHEMA_OUT +# Shortcut to run sequencer with a fixed config and cmd-line tests. +# TODO: Make this a better (more standard) command line format in-line with other tools. +if [[ $1 == -- ]]; then + shift + $JAVA_CMD $@ + exit 0 +fi + while [[ $1 =~ ^- ]]; do if [[ $1 == '-a' ]]; then min_stage=ALPHA @@ -158,8 +168,6 @@ cat $SEQUENCER_CONFIG validator/bin/build -JARFILE=validator/build/libs/validator-1.0-SNAPSHOT-all.jar -JAVA_CMD="java -cp $JARFILE com.google.daq.mqtt.sequencer.SequenceRunner" echo $JAVA_CMD $test_names result=0 $JAVA_CMD $test_names 2>&1 | tee $SEQUENCER_LOG diff --git a/bin/sequencer_report b/bin/sequencer_report index 793f2f77b9..af64db4f0d 100755 --- a/bin/sequencer_report +++ b/bin/sequencer_report @@ -89,11 +89,19 @@ class Sequence: self.act_path = os.path.join(results_dir, test.name, Sequence.FILE_NAME) self.ref_path = os.path.join(reference_dir, test.name, Sequence.FILE_NAME) + if not os.path.isfile(self.act_path): + print(f"Missing input file: {self.act_path}") + sys.exit(1) + with open(self.act_path, encoding="utf-8") as f: self.act_text = f.read() - with open(self.ref_path, encoding="utf-8") as f: - self.ref_text = f.read() + if not os.path.isfile(self.ref_path): + print(f"Missing reference file: {self.ref_path}") + self.ref_text = "1. Missing input file" + else: + with open(self.ref_path, encoding="utf-8") as f: + self.ref_text = f.read() self.act = Sequence.post_process_actual_results( Sequence.get_steps(self.act_text) diff --git a/bin/support_process b/bin/support_process index 1099a34f1c..1a4332ec27 100755 --- a/bin/support_process +++ b/bin/support_process @@ -38,7 +38,7 @@ fi ls -l $archive_dir/ echo Extracting test archives... -ls $archive_dir/*sequencer*.tgz | xargs -n 1 tar -xzf +ls $archive_dir/*_udmi-support_*.tgz | xargs -n 1 tar -xzf echo Consolidating device tests... devices=$(ls -d $sites_in/out-seq/devices) diff --git a/bin/test_registrar b/bin/test_registrar index 5198c6fe32..52037ad156 100755 --- a/bin/test_registrar +++ b/bin/test_registrar @@ -8,16 +8,19 @@ bin/clone_model TEST_SITE=sites/udmi_site_model +exit_status=clean +echo '###################################' starting test section processing + bin/registrar ${TEST_SITE} output_file=${TEST_SITE}/out/registration_summary.json clean_devices=$(jq -r .Clean[] $output_file | wc -l) EXPECTED_CLEAN=3 # AHU-1 has a bad site location, so does not match as clean. -exit_status=clean -echo Found ${clean_devices} clean devices. +echo Found ${clean_devices} clean devices, expecting $EXPECTED_CLEAN. [ "${clean_devices}" == $EXPECTED_CLEAN ] || exit_status=expected_clean +echo '###################################' end test section expected_clean: $exit_status device_files=$(ls -d ${TEST_SITE}/devices/* | fgrep -v XXX) @@ -31,8 +34,7 @@ if [[ -f $error_file ]]; then echo Errors found testing generated config. exit_status=generated_config fi -echo Done with generated_config test. -echo +echo '###################################' end test section generated_config: $exit_status # Test site_metadata settings for system.location.site. site=$(jq -r .system.location.site < ${TEST_SITE}/site_metadata.json) @@ -60,6 +62,7 @@ sm_devices=$(check_norm) echo Devices with correct site_metadata: ${sm_devices} [ "${sm_devices}" == "${device_files}" ] || exit_status=site_metadata +echo '###################################' end test section site_metadata: $exit_status mv ${TEST_SITE}/site_metadata.json ${TEST_SITE}/_site_metadata.json @@ -68,14 +71,18 @@ bin/registrar ${TEST_SITE} base_devices=sites/udmi_site_model/devices/AHU-1 sm_devices=$(check_norm) echo Devices with correct no-defaults site_metadata: ${sm_devices} +echo Expecting: $base_devices [ "${sm_devices}" == "${base_devices}" ] || exit_status=no_defaults +echo '###################################' end test section no_defaults: $exit_status config_points=`jq '.pointset.points | length' $TEST_SITE/devices/AHU-22/out/generated_config.json` [[ $config_points == 3 ]] || exit_status=missing_points +echo '###################################' end test section missing_points: $exit_status config_points=`jq .pointset.points $TEST_SITE/devices/SNS-4/out/generated_config.json` [[ $config_points == null ]] || exit_status=configured_points +echo '###################################' end test section configured_points: $exit_status mv ${TEST_SITE}/_site_metadata.json ${TEST_SITE}/site_metadata.json diff --git a/bin/test_sequcheck b/bin/test_sequcheck index 8888f112c6..df57d7ba8f 100755 --- a/bin/test_sequcheck +++ b/bin/test_sequcheck @@ -4,42 +4,48 @@ suffix=$1 shift || true RUN_ROOT=$PWD -UDMI_ROOT=$(dirname $0)/.. -mkdir -p out +UDMI_ROOT=$(realpath $(dirname $0))/.. source $UDMI_ROOT/etc/shell_common.sh +mkdir -p out + failures= if [[ -z $suffix ]]; then $UDMI_ROOT/bin/sequencer_cache -t || failures+="cache " + echo '####################' Finished sequencer cache test: $failures fi -echo Comparing diff out/sequencer.out etc/sequencer${suffix}.out -diff -u out/sequencer.out $UDMI_ROOT/etc/sequencer${suffix}.out || failures+="sequencer " +echo Comparing diff out/sequencer${suffix}.out etc/sequencer${suffix}.out +diff -u out/sequencer${suffix}.out $UDMI_ROOT/etc/sequencer${suffix}.out || failures+="sequencer " -echo Comparing diff out/schema.out etc/schema${suffix}.out -diff -u out/schema.out $UDMI_ROOT/etc/schema${suffix}.out || failures+="schema " +echo Comparing diff out/schema${suffix}.out etc/schema${suffix}.out +diff -u out/schema${suffix}.out $UDMI_ROOT/etc/schema${suffix}.out || failures+="schema " +echo '####################' Finished schema.out tests: $failures -[[ -n $suffix ]] && echo Done with suffix test checks. && exit 0 +[[ -n ${suffix} ]] && echo Done with suffix test checks. && exit 0 cp $UDMI_ROOT/docs/specs/sequences/generated.md out/generated.tmp # Save for test/comparison -bin/gencode_seq || failures+="gencode " +$UDMI_ROOT/bin/gencode_seq || failures+="gencode " +echo '####################' Finished gencode tests: $failures -mv $UDMI_ROOT/docs/specs/sequences/generated.md out/generated.out +mv $UDMI_ROOT/docs/specs/sequences/generated.md out/generated${suffix}.out mv out/generated.tmp $UDMI_ROOT/docs/specs/sequences/generated.md -echo Comparing diff out/generated.out docs/specs/sequences/generated.md -diff -u out/generated.out $UDMI_ROOT/docs/specs/sequences/generated.md || failures+="gencode_seq " +echo Comparing diff out/generated${suffix}.out docs/specs/sequences/generated.md +diff -u out/generated${suffix}.out $UDMI_ROOT/docs/specs/sequences/generated.md || failures+="gencode_seq " +echo '####################' Finished gencode_seq tests: $failures SAMPLE_TEST_ROW="| writeback | writeback_failure | alpha | pass | Sequence complete |" -target=sites/udmi_site_model/out/devices/AHU-1/results.md -echo Checking for expected entry in $target: -echo "$SAMPLE_TEST_ROW" -fgrep "$SAMPLE_TEST_ROW" $target || failures+="expected " - -echo Checking for duplication in out/sequencer.out and etc/sequencer_planning.txt -bin/test_sequencer_plan || failures+="plan " +targets=sites/udmi_site_model*/out*/devices/AHU-1/results.md +echo "Searching results.md files for: $SAMPLE_TEST_ROW" +fgrep "$SAMPLE_TEST_ROW" $targets || failures+="expected " +echo ####################' Finished expected tests: $failures + +echo Checking for duplication in out/sequencer${suffix}.out and etc/sequencer_planning.txt +$UDMI_ROOT/bin/test_sequencer_plan || failures+="plan " +echo '####################' Finished plan tests: $failures [[ -z $failures ]] || fail sequencer checks failed because of { $failures } diff --git a/bin/test_sequencer b/bin/test_sequencer index 389e83ae0f..390acdeddf 100755 --- a/bin/test_sequencer +++ b/bin/test_sequencer @@ -131,13 +131,18 @@ echo Completed execution of sequencer test run, exit code $seq_fail echo Reported cloud version info: $(jq .cloud_version.udmi_ref $output_file) echo Combining partial-run output files... -files=$(cd out; ls -1 *.out *.log) -echo Merging $files -for file in $files; do - cp out/$file out/$file.save - cat out/$file >> out/$file.combined - cp out/$file.combined out/$file -done +( + cd out + files=$(ls -1 *.out *.log) + echo Merging $files + for file in $files; do + nfile=$(echo $file | sed -E -r "s/\.(.*)\$/$suffix.\1/") + [[ $file != $nfile ]] && mv $file $nfile && echo Renamed $file to $nfile + cp $nfile $nfile.save + cat $nfile >> $nfile.combined + cp $nfile.combined $nfile + done +) if [[ -n $out_check && -z $targets ]]; then if [[ -n $clean_cache ]]; then @@ -164,8 +169,8 @@ else fi echo Sanity check for completed tests... -target_count=$(fgrep "Running target" out/sequencer.log.save | wc -l) -result_count=$(fgrep RESULT out/sequencer.out.save | wc -l) +target_count=$(fgrep "Running target" out/sequencer$suffix.log.save | wc -l) +result_count=$(fgrep RESULT out/sequencer$suffix.out.save | wc -l) if [[ $target_count != $result_count ]]; then fail Only $result_count results found for expected $target_count targets. fi @@ -174,6 +179,6 @@ GOLDEN_FILE=etc/sequencer${suffix}.out echo Checking for correctness of completed tests in $GOLDEN_FILE... while read result; do fgrep "$result" $GOLDEN_FILE || fail Expected result not found for $result -done < out/sequencer.out.save +done < out/sequencer${suffix}.out.save echo Done with $suffix test_sequencer run. diff --git a/bin/test_sequencer_plan b/bin/test_sequencer_plan index 7dbe462f65..e759e78b2b 100755 --- a/bin/test_sequencer_plan +++ b/bin/test_sequencer_plan @@ -1,6 +1,12 @@ #!/bin/bash -e -PLAN_FILE=etc/sequencer_plan.txt -SEQUENCER_OUT=etc/sequencer.out + +RUN_ROOT=$PWD +UDMI_ROOT=$(dirname $0)/.. + +source $UDMI_ROOT/etc/shell_common.sh + +PLAN_FILE=$UDMI_ROOT/etc/sequencer_plan.txt +SEQUENCER_OUT=$UDMI_ROOT/etc/sequencer.out exit=0 while read -u 7 line; do diff --git a/bin/test_sites b/bin/test_sites index 5e0096d508..cbaf071e18 100755 --- a/bin/test_sites +++ b/bin/test_sites @@ -76,7 +76,11 @@ done if [[ -s $FAILURES ]]; then echo echo :::::: Failures found, to fix execute $FAILURES: - sed -i -E -e 's/^Files (.*) and (.*) differ$/cp \1 \2/' $FAILURES + sed -i -E \ + -e 's/^Files (.*) and (.*) differ$/cp \1 \2/' \ + -e 's-^Only in (.*)/out: (.*)$-touch \1/expected/\2-' \ + -e 's-^Only in (.*)/expected: (.*)$-rm \1/expected/\2-' \ + $FAILURES cat $FAILURES false fi diff --git a/bin/test_trace b/bin/test_trace index a613376555..ae0a6ae3a0 100755 --- a/bin/test_trace +++ b/bin/test_trace @@ -25,6 +25,9 @@ trace_out=$trace_in/expected/ site_model=sites/udmi_site_model site_out=$site_model/out +# Clean up from other unit testing +rm -rf $site_model/devices/ACME-2301 + # Use a static/constant value to make output stable. export UDMI_TOOLS=test_trace diff --git a/bin/test_validator b/bin/test_validator index 80d05704a0..d41e743472 100755 --- a/bin/test_validator +++ b/bin/test_validator @@ -128,10 +128,7 @@ echo Out files for GAT-123: (cd $site_path/out/devices/GAT-123; ls -lrt *.out) || true outfiles=`find $site_path/out/devices -name \*.out | sort` || true -if [[ -z $outfiles ]]; then - echo No .out files found in $site_path/out/devices - false -fi +[[ -n $outfiles ]] || fail No .out files found in $site_path/out/devices echo Pre-REDACTED output available in $VALIDATOR_OUT.raw more $outfiles > $VALIDATOR_OUT.raw diff --git a/common/src/main/java/com/google/udmi/util/GeneralUtils.java b/common/src/main/java/com/google/udmi/util/GeneralUtils.java index 5bcf8e0250..9632a70681 100644 --- a/common/src/main/java/com/google/udmi/util/GeneralUtils.java +++ b/common/src/main/java/com/google/udmi/util/GeneralUtils.java @@ -125,7 +125,7 @@ public static T deepCopy(T object) { } public static String encodeBase64(String payload) { - return encodeBase64(payload.getBytes()); + return ifNotNullGet(payload, raw -> encodeBase64(raw.getBytes())); } public static String encodeBase64(byte[] payload) { @@ -250,6 +250,12 @@ public static void ifNullThen(Object value, Runnable action) { } } + public static void ifNotNullThrow(T value, String message) { + if (value != null) { + throw new RuntimeException(message); + } + } + public static void ifNotNullThen(T value, Consumer consumer) { ofNullable(value).ifPresent(consumer); } diff --git a/docs/specs/categories.md b/docs/specs/categories.md index 353eed2245..3f43828c7d 100644 --- a/docs/specs/categories.md +++ b/docs/specs/categories.md @@ -23,9 +23,6 @@ could be used with a **WARNING** level for a warning case during normal operatio * _receive_: (**DEBUG**) Receiving a config message * _parse_: (**DEBUG**) Parsing a received message * _apply_: (**NOTICE**) Application of a parsed config message - * _network_: Network (IP) message handling - * _connection_: (**NOTICE**) Connected to the network - * _disconnect_: (**NOTICE**) Disconnected from a network * _auth_: Authentication to local application (e.g. web server, SSH) * _login_: (**NOTICE**) Successful login. The entry message should include the username and application * _logout_: (**NOTICE**) Successful logout @@ -40,6 +37,13 @@ could be used with a **WARNING** level for a warning case during normal operatio * _invalid_: (**ERROR**) A `config` parameter for the point is invalid in some way * _localnet_: Aspects of working with various local networks * _network_: (**INFO**) Aspects of a specific network + * _connect_: (**NOTICE**) Connected status of the device on +* _gateway_: Aspects of managing gateway connections + * _setup_: Relating to initial device setup, reported in the gateway.status field + * _attach_: (**ERROR**) Expected status for attachment failures between gateway and cloud + * _proxy_: Relating to proxied devices, reported as part of the proxied device state + * _target_: (**WARNING**) Basic target block specification, missing (warning) or unprocessable (error) + * _connect_: (**ERROR**) Fieldbus connection between gateway and proxied device (error on failure) * _discovery_: Handling on-prem discovery flow * _family_: Conditions specific to an entire address family (e.g. bacnet) * _scan_: (**INFO**) Relating to scanning a particular address family diff --git a/docs/specs/sequences/generated.md b/docs/specs/sequences/generated.md index ab767a215f..8db7c43735 100644 --- a/docs/specs/sequences/generated.md +++ b/docs/specs/sequences/generated.md @@ -46,6 +46,7 @@ Some caveats: * [family_ipv4_addr](#family_ipv4_addr-preview) * [family_ipv6_addr](#family_ipv6_addr-preview) * [feature_enumeration](#feature_enumeration-preview): Check enumeration of device features +* [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 @@ -287,6 +288,12 @@ Check enumeration of device features 1. Check that all enumerated features are official buckets 1. Check that no point enumeration +## gateway_attach_handling (PREVIEW) + +Check adequate logging for gateway detach, errors, and reattach + +1. Test skipped: Not a gateway + ## gateway_proxy_events (BETA) Check that a gateway proxies pointset events for indicated devices diff --git a/etc/schema_itemized.out b/etc/schema_itemized.out index 681d0effc3..4e45a1b671 100644 --- a/etc/schema_itemized.out +++ b/etc/schema_itemized.out @@ -38,3 +38,4 @@ 36 gateway_proxy_events 37 gateway_proxy_events 41 device_config_acked +42 bad_target_family diff --git a/etc/sequencer.out b/etc/sequencer.out index 45d27caedc..3c4b3af2d8 100644 --- a/etc/sequencer.out +++ b/etc/sequencer.out @@ -1,3 +1,4 @@ +RESULT skip gateway bad_target_family ALPHA 0/0 Not a proxied device 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 @@ -16,6 +17,7 @@ RESULT pass system family_ether_addr PREVIEW 5/5 Sequence complete RESULT pass system family_ipv4_addr PREVIEW 5/5 Sequence complete RESULT pass system family_ipv6_addr PREVIEW 5/5 Sequence complete RESULT pass enumeration.features feature_enumeration PREVIEW 5/5 Sequence complete +RESULT skip gateway gateway_attach_handling PREVIEW 0/0 Not a gateway RESULT skip gateway gateway_proxy_events BETA 0/0 Not a gateway RESULT pass enumeration multi_enumeration ALPHA 5/5 Sequence complete RESULT pass discovery.scan periodic_scan ALPHA 5/5 Sequence complete diff --git a/etc/sequencer_nostate.out b/etc/sequencer_nostate.out index 3211cad25c..e77b473fe3 100644 --- a/etc/sequencer_nostate.out +++ b/etc/sequencer_nostate.out @@ -14,6 +14,7 @@ RESULT skip system family_ether_addr PREVIEW 0/0 State testing disabled RESULT skip system family_ipv4_addr PREVIEW 0/0 State testing disabled RESULT skip system family_ipv6_addr PREVIEW 0/0 State testing disabled RESULT skip enumeration.features feature_enumeration PREVIEW 0/0 State testing disabled +RESULT skip gateway gateway_attach_handling PREVIEW 0/0 Not a gateway RESULT skip gateway gateway_proxy_events BETA 0/0 Not a gateway RESULT pass pointset pointset_publish BETA 5/5 Sequence complete RESULT pass pointset pointset_publish_interval BETA 5/5 Sequence complete diff --git a/etc/test_itemized.in b/etc/test_itemized.in index 20cbfff5d8..a45b5d4cec 100644 --- a/etc/test_itemized.in +++ b/etc/test_itemized.in @@ -39,3 +39,4 @@ TEST gateway_proxy_events badState # Test proxy device configurations WITH AHU-22 TEST device_config_acked +TEST bad_target_family diff --git a/etc/test_itemized.out b/etc/test_itemized.out index 025b845c5e..62b4ec835d 100644 --- a/etc/test_itemized.out +++ b/etc/test_itemized.out @@ -5,7 +5,7 @@ 05 RESULT fail system too_much_state ALPHA 0/5 Failed check that No more than 6 state updates in 60s 06 RESULT fail enumeration.features feature_enumeration PREVIEW 0/5 Failed check that feature enumeration matches metadata; missing { enumeration }, extra { unknown } 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 +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 11 RESULT fail system.mode system_mode_restart ALPHA 0/5 Failed check that restart count increased by one @@ -32,3 +32,4 @@ 36 RESULT pass gateway gateway_proxy_events BETA 5/5 Sequence complete 37 RESULT fail gateway gateway_proxy_events BETA 0/5 Received state update with no-state device 41 RESULT skip system device_config_acked BETA 0/0 No config check for proxy device +42 RESULT pass gateway bad_target_family ALPHA 5/5 Sequence complete diff --git a/etc/validator.out b/etc/validator.out index 73792720a7..edc9874b38 100644 --- a/etc/validator.out +++ b/etc/validator.out @@ -16,6 +16,7 @@ sites/udmi_site_model/out/devices/GAT-123/event_pointset.json sites/udmi_site_model/out/devices/GAT-123/event_system.json sites/udmi_site_model/out/devices/GAT-123/persistent_data.json sites/udmi_site_model/out/devices/GAT-123/state.json +sites/udmi_site_model/out/devices/GAT-123/state_gateway.json sites/udmi_site_model/out/devices/GAT-123/state_localnet.json sites/udmi_site_model/out/devices/GAT-123/state_pointset.json sites/udmi_site_model/out/devices/GAT-123/state_system.json @@ -390,6 +391,22 @@ sites/udmi_site_model/out/devices/GAT-123/state.out "errors" : [ ] } :::::::::::::: +sites/udmi_site_model/out/devices/GAT-123/state_gateway.out +:::::::::::::: +{ + "timestamp" : "REDACTED_TIMESTAMP", + "version" : "1.4.2", + "sub_folder" : "gateway", + "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_localnet.out :::::::::::::: { diff --git a/gencode/docs/command_mapping.html b/gencode/docs/command_mapping.html index af80686ff6..6e2a81c526 100644 --- a/gencode/docs/command_mapping.html +++ b/gencode/docs/command_mapping.html @@ -494,6 +494,16 @@

id="status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_status_category_oneOf_i34" role="tab" onclick="setAnchor('#status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -768,7 +778,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -808,7 +818,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -848,7 +858,7 @@

    /> item 8Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -888,7 +898,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -928,7 +938,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -968,7 +978,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -1008,7 +1018,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -1048,7 +1058,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -1088,7 +1098,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -1128,7 +1138,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -1168,7 +1178,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -1208,7 +1218,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -1248,7 +1258,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -1288,7 +1298,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -1328,7 +1338,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -1368,7 +1378,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -1408,7 +1418,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -1448,7 +1458,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -1488,7 +1498,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -1528,7 +1538,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -1568,7 +1578,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -1608,7 +1618,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -1648,7 +1658,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -1688,7 +1698,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -1728,7 +1738,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -1768,7 +1778,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -1808,7 +1818,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -1848,7 +1858,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -1888,7 +1898,87 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + status + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + status + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ diff --git a/gencode/docs/config.html b/gencode/docs/config.html index 8c02676a2d..cb8119fecc 100644 --- a/gencode/docs/config.html +++ b/gencode/docs/config.html @@ -326,7 +326,7 @@

    Must be one of:

    -
    • "initial"
    • "active"
    • "restart"
    • "terminate"
    • "shutdown"
    +
    • "initial"
    • "active"
    • "updating"
    • "restart"
    • "terminate"
    • "shutdown"
    @@ -642,6 +642,155 @@

    Each item of this array must be:

    "AHU-22" ]
    + + + + + +
    +
    +
    +

    + +

    +
    + +
    +
    + +
    root + + + + gateway + + + + target
    Type: object
    +

    For proxied devices, this represents the target proxy device address for use by its gateway

    +     + + No Additional Properties + + + + + +
    +
    Examples:
    +
    "bacnet"
+
    +
    "modbus"
+
    +
    +
    +
    +
    +

    + +

    +
    + +
    +
    + +
    root + + + + gateway + + + + target + + + + addr
    Type: string
    +

    The address of a device on the fieldbus/local network

    +     + + + + + +
    +
    Example:
    +
    "0x414889"
+
    +
    +
    +
    +
    +
    +
    +
    +
    +

    + +

    +
    + +
    +
    + +
    root + + + + gateway + + + + target + + + + family
    Type: string
    +

    Associated address family (not used when part of a map)

    +     + + + + + + +
    +
    +
    @@ -1247,174 +1396,16 @@

    /> localnet

    Type: object
    -

    Used to describe device local network parameters

    +

    Currently unused: request local network configuration

     - No Additional Properties - - - - - - -
    -
    -
    -

    - -

    -
    - -
    -
    - -
    root - - - - localnet - - - - families
    Type: object
    - - - - - - - -
    -
    -
    -

    - -

    -
    - -
    -

    - -

    -

    All property whose name matches the following regular expression must respect the following conditions

    - Property name regular expression: ^[a-z0-9-]+$ -
    - -
    root - - - - localnet - - - - families - - - - ^[a-z0-9-]+$
    Type: object
    -

    The network family

    -     No Additional Properties + -
    -
    Examples:
    -
    "bacnet"
-
    -
    "ipv4"
-
    -
    -
    -
    -
    -

    - -

    -
    - -
    -
    - -
    root - - - - localnet - - - - families - - - - ^[a-z0-9-]+$ - - - - addr
    Type: string
    -

    The address of the device on the local network

    -     - - - - -
    -
    Example:
    -
    "4148893"
-
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    diff --git a/gencode/docs/config_mapping.html b/gencode/docs/config_mapping.html index 50e8a51683..6725b90538 100644 --- a/gencode/docs/config_mapping.html +++ b/gencode/docs/config_mapping.html @@ -700,6 +700,16 @@

    id="devices_pattern1_status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_devices_pattern1_status_category_oneOf_i34" role="tab" onclick="setAnchor('#devices_pattern1_status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -1072,7 +1082,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -1126,7 +1136,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -1180,7 +1190,7 @@

    /> item 8Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -1234,7 +1244,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -1288,7 +1298,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -1342,7 +1352,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -1396,7 +1406,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -1450,7 +1460,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -1504,7 +1514,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -1558,7 +1568,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -1612,7 +1622,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -1666,7 +1676,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -1720,7 +1730,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -1774,7 +1784,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -1828,7 +1838,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -1882,7 +1892,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -1936,7 +1946,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -1990,7 +2000,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -2044,7 +2054,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -2098,7 +2108,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -2152,7 +2162,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -2206,7 +2216,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -2260,7 +2270,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -2314,7 +2324,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -2368,7 +2378,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -2422,7 +2432,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -2476,7 +2486,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -2530,7 +2540,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -2584,7 +2594,115 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + devices + + + + Device Mapping Config + + + + status + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + devices + + + + Device Mapping Config + + + + status + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ diff --git a/gencode/docs/configuration_pubber.html b/gencode/docs/configuration_pubber.html index 1ad614af71..504154bae9 100644 --- a/gencode/docs/configuration_pubber.html +++ b/gencode/docs/configuration_pubber.html @@ -1660,6 +1660,46 @@

    +

    + + + +
    +
    +
    +

    + +

    +
    + +
    +
    + +
    root + + + + options + + + + badAddr
    Type: boolean
    + + + + + + +
    diff --git a/gencode/docs/event.html b/gencode/docs/event.html index 4055938095..73138d23df 100644 --- a/gencode/docs/event.html +++ b/gencode/docs/event.html @@ -642,6 +642,16 @@

    id="system_logentries_items_category_oneOf_i34" data-toggle="tab" href="#tab-pane_system_logentries_items_category_oneOf_i34" role="tab" onclick="setAnchor('#system_logentries_items_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -1014,7 +1024,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -1068,7 +1078,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -1122,7 +1132,7 @@

    /> item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -1176,7 +1186,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -1230,7 +1240,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -1284,7 +1294,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -1338,7 +1348,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -1392,7 +1402,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -1446,7 +1456,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -1500,7 +1510,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -1554,7 +1564,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -1608,7 +1618,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -1662,7 +1672,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -1716,7 +1726,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -1770,7 +1780,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -1824,7 +1834,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -1878,7 +1888,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -1932,7 +1942,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -1986,7 +1996,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -2040,7 +2050,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -2094,7 +2104,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -2148,7 +2158,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -2202,7 +2212,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -2256,7 +2266,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -2310,7 +2320,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -2364,7 +2374,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -2418,7 +2428,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -2472,7 +2482,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -2526,7 +2536,115 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + system + + + + logentries + + + + Entry + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + system + + + + logentries + + + + Entry + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ @@ -3867,6 +3985,16 @@

    id="discovery_status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_discovery_status_category_oneOf_i34" role="tab" onclick="setAnchor('#discovery_status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -4190,7 +4318,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -4237,7 +4365,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -4284,7 +4412,7 @@

    /> item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -4331,7 +4459,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -4378,7 +4506,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -4425,7 +4553,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -4472,7 +4600,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -4519,7 +4647,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -4566,7 +4694,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -4613,7 +4741,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -4660,7 +4788,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -4707,7 +4835,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -4754,7 +4882,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -4801,7 +4929,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -4848,7 +4976,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -4895,7 +5023,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -4942,7 +5070,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -4989,7 +5117,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -5036,7 +5164,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -5083,7 +5211,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -5130,7 +5258,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -5177,7 +5305,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -5224,7 +5352,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -5271,7 +5399,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -5318,7 +5446,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -5365,7 +5493,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -5412,7 +5540,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -5459,7 +5587,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -5506,7 +5634,101 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + discovery + + + + status + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + discovery + + + + status + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ @@ -6796,6 +7018,16 @@

    id="discovery_uniqs_pattern1_status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_discovery_uniqs_pattern1_status_category_oneOf_i34" role="tab" onclick="setAnchor('#discovery_uniqs_pattern1_status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -7217,7 +7449,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -7278,7 +7510,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -7339,7 +7571,7 @@

    /> item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -7400,7 +7632,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -7461,7 +7693,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -7522,7 +7754,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -7583,7 +7815,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -7644,7 +7876,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -7705,7 +7937,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -7766,7 +7998,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -7827,7 +8059,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -7888,7 +8120,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -7949,7 +8181,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -8010,7 +8242,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -8071,7 +8303,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -8132,7 +8364,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -8193,7 +8425,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -8254,7 +8486,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -8315,7 +8547,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -8376,7 +8608,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -8437,7 +8669,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -8498,7 +8730,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -8559,7 +8791,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -8620,7 +8852,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -8681,7 +8913,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -8742,7 +8974,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -8803,7 +9035,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -8864,7 +9096,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -8925,7 +9157,129 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + discovery + + + + uniqs + + + + Point Enumeration Event + + + + status + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + discovery + + + + uniqs + + + + Point Enumeration Event + + + + status + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ diff --git a/gencode/docs/event_discovery.html b/gencode/docs/event_discovery.html index a9a08f3f27..1667aa24e5 100644 --- a/gencode/docs/event_discovery.html +++ b/gencode/docs/event_discovery.html @@ -464,6 +464,16 @@

    id="status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_status_category_oneOf_i34" role="tab" onclick="setAnchor('#status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -738,7 +748,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -778,7 +788,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -818,7 +828,7 @@

    /> item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -858,7 +868,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -898,7 +908,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -938,7 +948,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -978,7 +988,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -1018,7 +1028,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -1058,7 +1068,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -1098,7 +1108,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -1138,7 +1148,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -1178,7 +1188,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -1218,7 +1228,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -1258,7 +1268,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -1298,7 +1308,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -1338,7 +1348,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -1378,7 +1388,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -1418,7 +1428,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -1458,7 +1468,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -1498,7 +1508,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -1538,7 +1548,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -1578,7 +1588,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -1618,7 +1628,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -1658,7 +1668,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -1698,7 +1708,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -1738,7 +1748,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -1778,7 +1788,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -1818,7 +1828,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -1858,7 +1868,87 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + status + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + status + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ @@ -3001,6 +3091,16 @@

    id="uniqs_pattern1_status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_uniqs_pattern1_status_category_oneOf_i34" role="tab" onclick="setAnchor('#uniqs_pattern1_status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -3373,7 +3473,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -3427,7 +3527,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -3481,7 +3581,7 @@

    /> item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -3535,7 +3635,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -3589,7 +3689,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -3643,7 +3743,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -3697,7 +3797,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -3751,7 +3851,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -3805,7 +3905,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -3859,7 +3959,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -3913,7 +4013,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -3967,7 +4067,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -4021,7 +4121,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -4075,7 +4175,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -4129,7 +4229,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -4183,7 +4283,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -4237,7 +4337,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -4291,7 +4391,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -4345,7 +4445,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -4399,7 +4499,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -4453,7 +4553,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -4507,7 +4607,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -4561,7 +4661,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -4615,7 +4715,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -4669,7 +4769,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -4723,7 +4823,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -4777,7 +4877,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -4831,7 +4931,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -4885,7 +4985,115 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + uniqs + + + + Point Enumeration Event + + + + status + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + uniqs + + + + Point Enumeration Event + + + + status + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ diff --git a/gencode/docs/event_mapping.html b/gencode/docs/event_mapping.html index 075fe9e4ad..a874c15f7e 100644 --- a/gencode/docs/event_mapping.html +++ b/gencode/docs/event_mapping.html @@ -426,6 +426,16 @@

    id="status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_status_category_oneOf_i34" role="tab" onclick="setAnchor('#status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -700,7 +710,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -740,7 +750,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -780,7 +790,7 @@

    /> item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -820,7 +830,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -860,7 +870,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -900,7 +910,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -940,7 +950,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -980,7 +990,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -1020,7 +1030,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -1060,7 +1070,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -1100,7 +1110,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -1140,7 +1150,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -1180,7 +1190,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -1220,7 +1230,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -1260,7 +1270,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -1300,7 +1310,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -1340,7 +1350,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -1380,7 +1390,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -1420,7 +1430,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -1460,7 +1470,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -1500,7 +1510,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -1540,7 +1550,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -1580,7 +1590,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -1620,7 +1630,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -1660,7 +1670,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -1700,7 +1710,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -1740,7 +1750,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -1780,7 +1790,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -1820,7 +1830,87 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + status + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + status + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ diff --git a/gencode/docs/event_system.html b/gencode/docs/event_system.html index a8a003083b..0318db3038 100644 --- a/gencode/docs/event_system.html +++ b/gencode/docs/event_system.html @@ -547,6 +547,16 @@

    id="logentries_items_category_oneOf_i34" data-toggle="tab" href="#tab-pane_logentries_items_category_oneOf_i34" role="tab" onclick="setAnchor('#logentries_items_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -870,7 +880,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -917,7 +927,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -964,7 +974,7 @@

    /> item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -1011,7 +1021,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -1058,7 +1068,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -1105,7 +1115,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -1152,7 +1162,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -1199,7 +1209,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -1246,7 +1256,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -1293,7 +1303,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -1340,7 +1350,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -1387,7 +1397,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -1434,7 +1444,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -1481,7 +1491,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -1528,7 +1538,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -1575,7 +1585,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -1622,7 +1632,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -1669,7 +1679,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -1716,7 +1726,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -1763,7 +1773,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -1810,7 +1820,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -1857,7 +1867,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -1904,7 +1914,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -1951,7 +1961,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -1998,7 +2008,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -2045,7 +2055,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -2092,7 +2102,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -2139,7 +2149,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -2186,7 +2196,101 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + logentries + + + + Entry + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + logentries + + + + Entry + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ diff --git a/gencode/docs/event_validation.html b/gencode/docs/event_validation.html index 43ba9cd45e..f53420e169 100644 --- a/gencode/docs/event_validation.html +++ b/gencode/docs/event_validation.html @@ -494,6 +494,16 @@

    id="status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_status_category_oneOf_i34" role="tab" onclick="setAnchor('#status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -768,7 +778,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -808,7 +818,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -848,7 +858,7 @@

    /> item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -888,7 +898,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -928,7 +938,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -968,7 +978,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -1008,7 +1018,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -1048,7 +1058,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -1088,7 +1098,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -1128,7 +1138,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -1168,7 +1178,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -1208,7 +1218,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -1248,7 +1258,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -1288,7 +1298,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -1328,7 +1338,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -1368,7 +1378,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -1408,7 +1418,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -1448,7 +1458,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -1488,7 +1498,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -1528,7 +1538,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -1568,7 +1578,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -1608,7 +1618,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -1648,7 +1658,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -1688,7 +1698,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -1728,7 +1738,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -1768,7 +1778,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -1808,7 +1818,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -1848,7 +1858,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -1888,7 +1898,87 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + status + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + status + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ @@ -2559,6 +2649,16 @@

    id="errors_items_category_oneOf_i34" data-toggle="tab" href="#tab-pane_errors_items_category_oneOf_i34" role="tab" onclick="setAnchor('#errors_items_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -2882,7 +2982,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -2929,7 +3029,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -2976,7 +3076,7 @@

    /> item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -3023,7 +3123,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -3070,7 +3170,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -3117,7 +3217,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -3164,7 +3264,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -3211,7 +3311,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -3258,7 +3358,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -3305,7 +3405,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -3352,7 +3452,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -3399,7 +3499,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -3446,7 +3546,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -3493,7 +3593,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -3540,7 +3640,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -3587,7 +3687,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -3634,7 +3734,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -3681,7 +3781,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -3728,7 +3828,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -3775,7 +3875,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -3822,7 +3922,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -3869,7 +3969,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -3916,7 +4016,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -3963,7 +4063,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -4010,7 +4110,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -4057,7 +4157,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -4104,7 +4204,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -4151,7 +4251,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -4198,7 +4298,101 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + errors + + + + Entry + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + errors + + + + Entry + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ diff --git a/gencode/docs/metadata.html b/gencode/docs/metadata.html index 9fa3df10b7..d23cc5c23d 100644 --- a/gencode/docs/metadata.html +++ b/gencode/docs/metadata.html @@ -1948,18 +1948,18 @@

    -
    +
    -
    +

    - +

    -
    +
    root @@ -1976,8 +1976,112 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - family

    Type: string
    -

    Protocol family used for connecting to the proxy device

    + target
    Type: object
    +

    The type of network

    +     + + No Additional Properties + + + + + +
    +
    Examples:
    +
    "bacnet"
+
    +
    "modbus"
+
    +
    +
    +
    +
    +

    + +

    +
    + +
    +
    + +
    root + + + + gateway + + + + target + + + + addr
    Type: string
    +

    The address of a device on the fieldbus/local network

    +     + + + + + +
    +
    Example:
    +
    "0x414889"
+
    +
    +
    +
    +
    +
    +
    +
    +
    +

    + +

    +
    + +
    +
    + +
    root + + + + gateway + + + + target + + + + family
    Type: string
    +

    Associated address family (not used when part of a map)

     @@ -1985,6 +2089,10 @@

    +

    +
    +
    +
    @@ -2335,7 +2443,7 @@

    + aria-expanded="" aria-controls="localnet_families_pattern1_addr" onclick="setAnchor('#localnet_families_pattern1_addr')">addr

    @@ -2373,7 +2481,7 @@

    /> addr

    Type: string
    -

    The address of a device on the local network

    +

    The address of a device on the fieldbus/local network

     @@ -2385,6 +2493,61 @@ 


    "0x414889"
    +

    +
    + + +
    +
    +
    +

    + +

    +
    + +
    +
    + +
    root + + + + localnet + + + + families + + + + Family Localnet Model + + + + family
    Type: string
    +

    Associated address family (not used when part of a map)

    +     + + + + + +
    diff --git a/gencode/docs/monitoring.html b/gencode/docs/monitoring.html index 0c73d7addb..31c2ea950f 100644 --- a/gencode/docs/monitoring.html +++ b/gencode/docs/monitoring.html @@ -744,6 +744,16 @@

    id="metric_event_system_logentries_items_category_oneOf_i34" data-toggle="tab" href="#tab-pane_metric_event_system_logentries_items_category_oneOf_i34" role="tab" onclick="setAnchor('#metric_event_system_logentries_items_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -1165,7 +1175,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -1226,7 +1236,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -1287,7 +1297,7 @@

    /> item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -1348,7 +1358,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -1409,7 +1419,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -1470,7 +1480,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -1531,7 +1541,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -1592,7 +1602,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -1653,7 +1663,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -1714,7 +1724,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -1775,7 +1785,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -1836,7 +1846,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -1897,7 +1907,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -1958,7 +1968,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -2019,7 +2029,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -2080,7 +2090,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -2141,7 +2151,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -2202,7 +2212,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -2263,7 +2273,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -2324,7 +2334,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -2385,7 +2395,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -2446,7 +2456,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -2507,7 +2517,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -2568,7 +2578,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -2629,7 +2639,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -2690,7 +2700,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -2751,7 +2761,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -2812,7 +2822,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -2873,7 +2883,129 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + metric + + + + event_system + + + + logentries + + + + Entry + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + metric + + + + event_system + + + + logentries + + + + Entry + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ diff --git a/gencode/docs/state.html b/gencode/docs/state.html index 051c8e1b80..ee0a3de87d 100644 --- a/gencode/docs/state.html +++ b/gencode/docs/state.html @@ -402,7 +402,7 @@

    Must be one of:

    -
    • "initial"
    • "active"
    • "restart"
    • "terminate"
    • "shutdown"
    +
    • "initial"
    • "active"
    • "updating"
    • "restart"
    • "terminate"
    • "shutdown"
    @@ -1272,6 +1272,16 @@

    id="system_status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_system_status_category_oneOf_i34" role="tab" onclick="setAnchor('#system_status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -1595,7 +1605,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -1642,7 +1652,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -1689,7 +1699,7 @@

    /> item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -1736,7 +1746,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -1783,7 +1793,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -1830,7 +1840,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -1877,7 +1887,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -1924,7 +1934,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -1971,7 +1981,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -2018,7 +2028,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -2065,7 +2075,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -2112,7 +2122,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -2159,7 +2169,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -2206,7 +2216,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -2253,7 +2263,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -2300,7 +2310,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -2347,7 +2357,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -2394,7 +2404,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -2441,7 +2451,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -2488,7 +2498,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -2535,7 +2545,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -2582,7 +2592,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -2629,7 +2639,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -2676,7 +2686,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -2723,7 +2733,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -2770,7 +2780,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -2817,7 +2827,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -2864,7 +2874,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -2911,7 +2921,101 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + system + + + + status + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + system + + + + status + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ @@ -3073,97 +3177,18 @@

    -
    -
    -
    -

    - -

    -
    - -
    -
    - -
    root - - - - gateway - - - - devices
    Type: object
    - - - - - - - -
    -
    -
    -

    - -

    -
    - -
    -

    Each additional property must conform to the following schema

    - -
    root - - - - gateway - - - - devices - - - - additionalProperties
    Type: object
    - No Additional Properties - - - - - - -
    +
    -
    +

    - +

    -
    +
    root @@ -3180,21 +3205,7 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties - - - - status

    Type: object
    + status
    Type: object
    No Additional Properties @@ -3204,18 +3215,18 @@

    -
    +
    -
    +

    - +

    -
    +
    root @@ -3232,28 +3243,14 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties - - - - status + status - message

    Type: string
    + message
    Type: string

    A human-readable one-line description of the entry

     @@ -3263,25 +3260,25 @@


    Example:
    -
    "Point is not writable"
+
    "Point is not writable"

    -
    +
    -
    +

    - +

    -
    +
    root @@ -3298,28 +3295,14 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties - - - - status + status - detail

    Type: string
    + detail
    Type: string

    An optional extensive entry which can include more detail, e.g. a complete program stack-trace

     @@ -3332,18 +3315,18 @@

    -
    +
    -
    +

    - +

    -
    +
    root @@ -3360,210 +3343,206 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties - - - - status + status - category

    Type: string
    + category
    Type: string
    -

    +

    -

    + id="tab-pane_gateway_status_category_oneOf_i0" role="tabpanel">
    root @@ -3580,43 +3559,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties - - - - status + status - category + category - oneOf + oneOf - item 0

    Type: object
    -Must match regular expression: ^system\.base\.start$ + item 0
    Type: object
    +Must match regular expression: ^system\.base\.start$ @@ -3624,7 +3589,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i1" role="tabpanel">
    root @@ -3641,43 +3606,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties - - - - status + status - category + category - oneOf + oneOf - item 1

    Type: object
    -Must match regular expression: ^system\.base\.shutdown$ + item 1
    Type: object
    +Must match regular expression: ^system\.base\.shutdown$ @@ -3685,7 +3636,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i2" role="tabpanel">
    root @@ -3702,43 +3653,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties - - - - status + status - category + category - oneOf + oneOf - item 2

    Type: object
    -Must match regular expression: ^system\.base\.ready$ + item 2
    Type: object
    +Must match regular expression: ^system\.base\.ready$ @@ -3746,7 +3683,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i3" role="tabpanel">
    root @@ -3763,43 +3700,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties - - - - status + status - category + category - oneOf + oneOf - item 3

    Type: object
    -Must match regular expression: ^system\.config\.receive$ + item 3
    Type: object
    +Must match regular expression: ^system\.config\.receive$ @@ -3807,7 +3730,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i4" role="tabpanel">
    root @@ -3824,43 +3747,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices + status - additionalProperties + category - status + oneOf - category - - - - oneOf - - - - item 4

    Type: object
    -Must match regular expression: ^system\.config\.parse$ + item 4
    Type: object
    +Must match regular expression: ^system\.config\.parse$ @@ -3868,7 +3777,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i5" role="tabpanel">
    root @@ -3885,43 +3794,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties - - - - status + status - category + category - oneOf + oneOf - item 5

    Type: object
    -Must match regular expression: ^system\.config\.apply$ + item 5
    Type: object
    +Must match regular expression: ^system\.config\.apply$ @@ -3929,7 +3824,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i6" role="tabpanel">
    root @@ -3946,43 +3841,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties + status - status + category - category + oneOf - oneOf - - - - item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ + item 6
    Type: object
    +Must match regular expression: ^system\.auth\.login$ @@ -3990,7 +3871,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i7" role="tabpanel">
    root @@ -4007,43 +3888,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices + status - additionalProperties + category - status + oneOf - category - - - - oneOf - - - - item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ + item 7
    Type: object
    +Must match regular expression: ^system\.auth\.logout$ @@ -4051,7 +3918,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i8" role="tabpanel">
    root @@ -4068,43 +3935,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties - - - - status + status - category + category - oneOf + oneOf - item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ + item 8
    Type: object
    +Must match regular expression: ^system\.auth\.fail$ @@ -4112,7 +3965,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i9" role="tabpanel">
    root @@ -4129,43 +3982,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices + status - additionalProperties + category - status + oneOf - category - - - - oneOf - - - - item 9

    Type: object
    -Must match regular expression: ^system\.auth\.logout$ + item 9
    Type: object
    +Must match regular expression: ^pointset\.point\.nominal$ @@ -4173,7 +4012,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i10" role="tabpanel">
    root @@ -4190,43 +4029,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties + status - status + category - category + oneOf - oneOf - - - - item 10

    Type: object
    -Must match regular expression: ^system\.auth\.fail$ + item 10
    Type: object
    +Must match regular expression: ^pointset\.point\.applied$ @@ -4234,7 +4059,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i11" role="tabpanel">
    root @@ -4251,43 +4076,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices + status - additionalProperties + category - status + oneOf - category - - - - oneOf - - - - item 11

    Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ + item 11
    Type: object
    +Must match regular expression: ^pointset\.point\.updating$ @@ -4295,7 +4106,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i12" role="tabpanel">
    root @@ -4312,43 +4123,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties + status - status + category - category + oneOf - oneOf - - - - item 12

    Type: object
    -Must match regular expression: ^pointset\.point\.applied$ + item 12
    Type: object
    +Must match regular expression: ^pointset\.point\.overridden$ @@ -4356,7 +4153,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i13" role="tabpanel">
    root @@ -4373,43 +4170,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices + status - additionalProperties + category - status + oneOf - category - - - - oneOf - - - - item 13

    Type: object
    -Must match regular expression: ^pointset\.point\.updating$ + item 13
    Type: object
    +Must match regular expression: ^pointset\.point\.failure$ @@ -4417,7 +4200,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i14" role="tabpanel">
    root @@ -4434,43 +4217,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties + status - status + category - category + oneOf - oneOf - - - - item 14

    Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ + item 14
    Type: object
    +Must match regular expression: ^pointset\.point\.invalid$ @@ -4478,7 +4247,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i15" role="tabpanel">
    root @@ -4495,43 +4264,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices + status - additionalProperties + category - status + oneOf - category - - - - oneOf - - - - item 15

    Type: object
    -Must match regular expression: ^pointset\.point\.failure$ + item 15
    Type: object
    +Must match regular expression: ^localnet\.network$ @@ -4539,7 +4294,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i16" role="tabpanel">
    root @@ -4556,43 +4311,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices + status - additionalProperties + category - status + oneOf - category - - - - oneOf - - - - item 16

    Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ + item 16
    Type: object
    +Must match regular expression: ^localnet\.network\.connect$ @@ -4600,7 +4341,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i17" role="tabpanel">
    root @@ -4617,43 +4358,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties + status - status + category - category + oneOf - oneOf - - - - item 17

    Type: object
    -Must match regular expression: ^localnet\.network$ + item 17
    Type: object
    +Must match regular expression: ^gateway\.setup\.attach$ @@ -4661,7 +4388,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i18" role="tabpanel">
    root @@ -4678,43 +4405,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties - - - - status + status - category + category - oneOf + oneOf - item 18

    Type: object
    -Must match regular expression: ^discovery\.family\.scan$ + item 18
    Type: object
    +Must match regular expression: ^gateway\.proxy\.target$ @@ -4722,7 +4435,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i19" role="tabpanel">
    root @@ -4739,43 +4452,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices + status - additionalProperties + category - status + oneOf - category - - - - oneOf - - - - item 19

    Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ + item 19
    Type: object
    +Must match regular expression: ^gateway\.proxy\.connect$ @@ -4783,7 +4482,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i20" role="tabpanel">
    root @@ -4800,43 +4499,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties + status - status + category - category + oneOf - oneOf - - - - item 20

    Type: object
    -Must match regular expression: ^discovery\.point\.describe$ + item 20
    Type: object
    +Must match regular expression: ^discovery\.family\.scan$ @@ -4844,7 +4529,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i21" role="tabpanel">
    root @@ -4861,43 +4546,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties + status - status + category - category + oneOf - oneOf - - - - item 21

    Type: object
    -Must match regular expression: ^mapping\.device\.apply$ + item 21
    Type: object
    +Must match regular expression: ^discovery\.device\.enumerate$ @@ -4905,7 +4576,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i22" role="tabpanel">
    root @@ -4922,43 +4593,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties - - - - status + status - category + category - oneOf + oneOf - item 22

    Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ + item 22
    Type: object
    +Must match regular expression: ^discovery\.point\.describe$ @@ -4966,7 +4623,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i23" role="tabpanel">
    root @@ -4983,104 +4640,123 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices + status - additionalProperties + category - status + oneOf - category + item 23

    Type: object
    +Must match regular expression: ^mapping\.device\.apply$ + + + + + + +
    + + +
    root - oneOf + gateway - item 23
    Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ - - - - - - -
    - - -
    root + status - gateway + category + + + + oneOf - devices + item 24
    Type: object
    +Must match regular expression: ^blobset\.blob\.receive$ + + + + + + +
    + + +
    root - additionalProperties + gateway - status + status - category + category - oneOf + oneOf - item 24
    Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ + item 25
    Type: object
    +Must match regular expression: ^blobset\.blob\.fetch$ @@ -5088,7 +4764,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i26" role="tabpanel">
    root @@ -5105,104 +4781,123 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices + status - additionalProperties + category - status + oneOf - category + item 26

    Type: object
    +Must match regular expression: ^blobset\.blob\.apply$ + + + + + + +
    + + +
    root - oneOf + gateway - item 25
    Type: object
    -Must match regular expression: ^validation\.device\.receive$ - - - - - - -
    - - -
    root + status - gateway + category + + + + oneOf - devices + item 27
    Type: object
    +Must match regular expression: ^validation\.device\.receive$ + + + + + + +
    + + +
    root - additionalProperties + gateway - status + status - category + category - oneOf + oneOf - item 26
    Type: object
    -Must match regular expression: ^validation\.device\.schema$ + item 28
    Type: object
    +Must match regular expression: ^validation\.device\.schema$ @@ -5210,7 +4905,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i29" role="tabpanel">
    root @@ -5227,43 +4922,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties - - - - status + status - category + category - oneOf + oneOf - item 27

    Type: object
    -Must match regular expression: ^validation\.device\.content$ + item 29
    Type: object
    +Must match regular expression: ^validation\.device\.content$ @@ -5271,7 +4952,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i30" role="tabpanel">
    root @@ -5288,43 +4969,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices + status - additionalProperties + category - status + oneOf - category - - - - oneOf - - - - item 28

    Type: object
    -Must match regular expression: ^validation\.device\.multiple$ + item 30
    Type: object
    +Must match regular expression: ^validation\.device\.multiple$ @@ -5332,7 +4999,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i31" role="tabpanel">
    root @@ -5349,43 +5016,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties - - - - status + status - category + category - oneOf + oneOf - item 29

    Type: object
    -Must match regular expression: ^validation\.device\.extra$ + item 31
    Type: object
    +Must match regular expression: ^validation\.device\.extra$ @@ -5393,7 +5046,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i32" role="tabpanel">
    root @@ -5410,43 +5063,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties - - - - status + status - category + category - oneOf + oneOf - item 30

    Type: object
    -Must match regular expression: ^validation\.summary\.report$ + item 32
    Type: object
    +Must match regular expression: ^validation\.summary\.report$ @@ -5454,7 +5093,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i33" role="tabpanel">
    root @@ -5471,43 +5110,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties - - - - status + status - category + category - oneOf + oneOf - item 31

    Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ + item 33
    Type: object
    +Must match regular expression: ^validation\.feature\.sequence$ @@ -5515,7 +5140,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i34" role="tabpanel">
    root @@ -5532,43 +5157,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices + status - additionalProperties + category - status + oneOf - category - - - - oneOf - - - - item 32

    Type: object
    -Must match regular expression: ^validation\.feature\.schema$ + item 34
    Type: object
    +Must match regular expression: ^validation\.feature\.schema$ @@ -5576,7 +5187,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i35" role="tabpanel">
    root @@ -5593,43 +5204,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties - - - - status + status - category + category - oneOf + oneOf - item 33

    Type: object
    -Must match regular expression: ^validation\.feature\.capability$ + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ @@ -5637,7 +5234,7 @@

    + id="tab-pane_gateway_status_category_oneOf_i36" role="tabpanel">
    root @@ -5654,43 +5251,29 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties - - - - status + status - category + category - oneOf + oneOf - item 34

    Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ @@ -5708,18 +5291,18 @@

    -
    +
    -
    +

    - +

    -
    +
    root @@ -5736,28 +5319,14 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices - - - - additionalProperties - - - - status + status - timestamp

    Type: string
    + timestamp
    Type: string

    FC 3339 UTC timestamp the condition was triggered, or most recently updated

     @@ -5767,25 +5336,25 @@


    Example:
    -
    "2018-08-26T21:39:28.364Z"
+
    "2018-08-26T21:39:28.364Z"

    -
    +
    -
    +

    - +

    -
    +
    root @@ -5802,38 +5371,24 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - devices + status - additionalProperties - - - - status - - - - level

    Type: integer
    + level
    Type: integer

    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


    Example:
    -
    600
+
    600
    @@ -5847,14 +5402,6 @@

    -
    -
    -
    -
    -
    -
    -
    -
    @@ -6537,6 +6084,16 @@

    id="discovery_families_pattern1_status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_discovery_families_pattern1_status_category_oneOf_i34" role="tab" onclick="setAnchor('#discovery_families_pattern1_status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -6958,7 +6515,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -7019,7 +6576,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -7080,7 +6637,7 @@

    /> item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -7141,7 +6698,7 @@

    /> item 9

    Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -7202,7 +6759,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -7263,7 +6820,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -7324,7 +6881,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -7385,7 +6942,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -7446,7 +7003,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -7507,7 +7064,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -7568,7 +7125,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -7629,7 +7186,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -7690,7 +7247,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -7751,7 +7308,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -7812,7 +7369,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -7873,7 +7430,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -7934,7 +7491,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -7995,7 +7552,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -8056,7 +7613,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -8117,7 +7674,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -8178,7 +7735,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -8239,7 +7796,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -8300,7 +7857,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -8361,7 +7918,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -8422,7 +7979,129 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ + + + + + + +
    + + +
    root + + + + discovery + + + + families + + + + Family Discovery State + + + + status + + + + category + + + + oneOf + + + + item 31
    Type: object
    +Must match regular expression: ^validation\.device\.extra$ + + + + + + +
    + + +
    root + + + + discovery + + + + families + + + + Family Discovery State + + + + status + + + + category + + + + oneOf + + + + item 32
    Type: object
    +Must match regular expression: ^validation\.summary\.report$ @@ -8430,7 +8109,7 @@

    + id="tab-pane_discovery_families_pattern1_status_category_oneOf_i33" role="tabpanel">
    root @@ -8482,8 +8161,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 31

    Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ + item 33
    Type: object
    +Must match regular expression: ^validation\.feature\.sequence$ @@ -8491,7 +8170,7 @@

    + id="tab-pane_discovery_families_pattern1_status_category_oneOf_i34" role="tabpanel">
    root @@ -8543,8 +8222,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 32

    Type: object
    -Must match regular expression: ^validation\.feature\.schema$ + item 34
    Type: object
    +Must match regular expression: ^validation\.feature\.schema$ @@ -8552,7 +8231,7 @@

    + id="tab-pane_discovery_families_pattern1_status_category_oneOf_i35" role="tabpanel">
    root @@ -8604,8 +8283,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 33

    Type: object
    -Must match regular expression: ^validation\.feature\.capability$ + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ @@ -8613,7 +8292,7 @@

    + id="tab-pane_discovery_families_pattern1_status_category_oneOf_i36" role="tabpanel">
    root @@ -8665,8 +8344,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 34

    Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ @@ -9412,6 +9091,16 @@

    id="localnet_families_pattern1_status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_localnet_families_pattern1_status_category_oneOf_i34" role="tab" onclick="setAnchor('#localnet_families_pattern1_status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -9833,7 +9522,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -9894,7 +9583,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -9955,7 +9644,7 @@

    /> item 8Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -10016,7 +9705,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -10077,7 +9766,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -10138,7 +9827,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -10199,7 +9888,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -10260,7 +9949,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -10321,7 +10010,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -10382,7 +10071,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -10443,7 +10132,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -10504,7 +10193,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -10565,7 +10254,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -10626,7 +10315,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -10687,7 +10376,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -10748,7 +10437,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -10809,7 +10498,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -10870,7 +10559,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -10931,7 +10620,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -10992,7 +10681,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -11053,7 +10742,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -11114,7 +10803,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -11175,7 +10864,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -11236,7 +10925,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -11297,7 +10986,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -11358,7 +11047,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -11419,7 +11108,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -11480,7 +11169,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -11541,7 +11230,129 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + localnet + + + + families + + + + Family Localnet State + + + + status + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + localnet + + + + families + + + + Family Localnet State + + + + status + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ @@ -12293,6 +12104,16 @@

    id="blobset_blobs_pattern1_status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_blobset_blobs_pattern1_status_category_oneOf_i34" role="tab" onclick="setAnchor('#blobset_blobs_pattern1_status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -12714,7 +12535,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -12775,7 +12596,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -12836,7 +12657,7 @@

    /> item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -12897,7 +12718,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -12958,7 +12779,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -13019,7 +12840,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -13080,7 +12901,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -13141,7 +12962,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -13202,7 +13023,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -13263,7 +13084,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -13324,7 +13145,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -13385,7 +13206,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -13446,7 +13267,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -13507,7 +13328,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -13568,7 +13389,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -13629,7 +13450,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -13690,7 +13511,129 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ + + + + + + +
    + + +
    root + + + + blobset + + + + blobs + + + + Blob Blobset State + + + + status + + + + category + + + + oneOf + + + + item 23
    Type: object
    +Must match regular expression: ^mapping\.device\.apply$ + + + + + + +
    + + +
    root + + + + blobset + + + + blobs + + + + Blob Blobset State + + + + status + + + + category + + + + oneOf + + + + item 24
    Type: object
    +Must match regular expression: ^blobset\.blob\.receive$ @@ -13698,7 +13641,7 @@

    + id="tab-pane_blobset_blobs_pattern1_status_category_oneOf_i25" role="tabpanel">
    root @@ -13750,8 +13693,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 23

    Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ + item 25
    Type: object
    +Must match regular expression: ^blobset\.blob\.fetch$ @@ -13759,7 +13702,7 @@

    + id="tab-pane_blobset_blobs_pattern1_status_category_oneOf_i26" role="tabpanel">
    root @@ -13811,8 +13754,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 24

    Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ + item 26
    Type: object
    +Must match regular expression: ^blobset\.blob\.apply$ @@ -13820,7 +13763,7 @@

    + id="tab-pane_blobset_blobs_pattern1_status_category_oneOf_i27" role="tabpanel">
    root @@ -13872,8 +13815,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 25

    Type: object
    -Must match regular expression: ^validation\.device\.receive$ + item 27
    Type: object
    +Must match regular expression: ^validation\.device\.receive$ @@ -13881,7 +13824,7 @@

    + id="tab-pane_blobset_blobs_pattern1_status_category_oneOf_i28" role="tabpanel">
    root @@ -13933,8 +13876,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 26

    Type: object
    -Must match regular expression: ^validation\.device\.schema$ + item 28
    Type: object
    +Must match regular expression: ^validation\.device\.schema$ @@ -13942,7 +13885,7 @@

    + id="tab-pane_blobset_blobs_pattern1_status_category_oneOf_i29" role="tabpanel">
    root @@ -13994,8 +13937,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 27

    Type: object
    -Must match regular expression: ^validation\.device\.content$ + item 29
    Type: object
    +Must match regular expression: ^validation\.device\.content$ @@ -14003,7 +13946,7 @@

    + id="tab-pane_blobset_blobs_pattern1_status_category_oneOf_i30" role="tabpanel">
    root @@ -14055,8 +13998,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 28

    Type: object
    -Must match regular expression: ^validation\.device\.multiple$ + item 30
    Type: object
    +Must match regular expression: ^validation\.device\.multiple$ @@ -14064,7 +14007,7 @@

    + id="tab-pane_blobset_blobs_pattern1_status_category_oneOf_i31" role="tabpanel">
    root @@ -14116,8 +14059,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 29

    Type: object
    -Must match regular expression: ^validation\.device\.extra$ + item 31
    Type: object
    +Must match regular expression: ^validation\.device\.extra$ @@ -14125,7 +14068,7 @@

    + id="tab-pane_blobset_blobs_pattern1_status_category_oneOf_i32" role="tabpanel">
    root @@ -14177,8 +14120,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 30

    Type: object
    -Must match regular expression: ^validation\.summary\.report$ + item 32
    Type: object
    +Must match regular expression: ^validation\.summary\.report$ @@ -14186,7 +14129,7 @@

    + id="tab-pane_blobset_blobs_pattern1_status_category_oneOf_i33" role="tabpanel">
    root @@ -14238,8 +14181,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 31

    Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ + item 33
    Type: object
    +Must match regular expression: ^validation\.feature\.sequence$ @@ -14247,7 +14190,7 @@

    + id="tab-pane_blobset_blobs_pattern1_status_category_oneOf_i34" role="tabpanel">
    root @@ -14299,8 +14242,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 32

    Type: object
    -Must match regular expression: ^validation\.feature\.schema$ + item 34
    Type: object
    +Must match regular expression: ^validation\.feature\.schema$ @@ -14308,7 +14251,7 @@

    + id="tab-pane_blobset_blobs_pattern1_status_category_oneOf_i35" role="tabpanel">
    root @@ -14360,8 +14303,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 33

    Type: object
    -Must match regular expression: ^validation\.feature\.capability$ + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ @@ -14369,7 +14312,7 @@

    + id="tab-pane_blobset_blobs_pattern1_status_category_oneOf_i36" role="tabpanel">
    root @@ -14421,8 +14364,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 34

    Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ @@ -15074,6 +15017,16 @@

    id="pointset_status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_pointset_status_category_oneOf_i34" role="tab" onclick="setAnchor('#pointset_status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -15397,7 +15350,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -15444,7 +15397,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -15491,7 +15444,7 @@

    /> item 8Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -15538,7 +15491,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -15585,7 +15538,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -15632,7 +15585,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -15679,7 +15632,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -15726,7 +15679,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -15773,7 +15726,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -15820,7 +15773,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -15867,7 +15820,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -15914,7 +15867,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -15961,7 +15914,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -16008,7 +15961,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -16055,7 +16008,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -16102,7 +16055,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -16149,7 +16102,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -16196,7 +16149,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -16243,7 +16196,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -16290,7 +16243,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -16337,7 +16290,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -16384,7 +16337,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -16431,7 +16384,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -16478,7 +16431,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -16525,7 +16478,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -16572,7 +16525,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -16619,7 +16572,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -16666,7 +16619,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -16713,7 +16666,101 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + pointset + + + + status + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + pointset + + + + status + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ @@ -17450,6 +17497,16 @@

    id="pointset_points_pattern1_status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_pointset_points_pattern1_status_category_oneOf_i34" role="tab" onclick="setAnchor('#pointset_points_pattern1_status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -17871,7 +17928,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -17932,7 +17989,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -17993,7 +18050,7 @@

    /> item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -18054,7 +18111,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -18115,7 +18172,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -18176,7 +18233,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -18237,7 +18294,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -18298,7 +18355,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -18359,7 +18416,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -18420,7 +18477,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -18481,7 +18538,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -18542,7 +18599,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -18603,7 +18660,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -18664,7 +18721,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -18725,7 +18782,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -18786,7 +18843,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -18847,7 +18904,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -18908,7 +18965,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -18969,7 +19026,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -19030,7 +19087,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -19091,7 +19148,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -19152,7 +19209,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -19213,7 +19270,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -19274,7 +19331,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -19335,7 +19392,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -19396,7 +19453,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -19457,7 +19514,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -19518,7 +19575,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -19579,7 +19636,129 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + pointset + + + + points + + + + Point Pointset State + + + + status + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + pointset + + + + points + + + + Point Pointset State + + + + status + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ diff --git a/gencode/docs/state_mapping.html b/gencode/docs/state_mapping.html index 94ee293338..3cd0ca331d 100644 --- a/gencode/docs/state_mapping.html +++ b/gencode/docs/state_mapping.html @@ -772,6 +772,16 @@

    id="devices_pattern1_status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_devices_pattern1_status_category_oneOf_i34" role="tab" onclick="setAnchor('#devices_pattern1_status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -1144,7 +1154,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -1198,7 +1208,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -1252,7 +1262,7 @@

    /> item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -1306,7 +1316,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -1360,7 +1370,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -1414,7 +1424,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -1468,7 +1478,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -1522,7 +1532,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -1576,7 +1586,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -1630,7 +1640,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -1684,7 +1694,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -1738,7 +1748,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -1792,7 +1802,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -1846,7 +1856,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -1900,7 +1910,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -1954,7 +1964,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -2008,7 +2018,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -2062,7 +2072,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -2116,7 +2126,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -2170,7 +2180,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -2224,7 +2234,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -2278,7 +2288,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -2332,7 +2342,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -2386,7 +2396,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -2440,7 +2450,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -2494,7 +2504,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -2548,7 +2558,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -2602,7 +2612,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -2656,7 +2666,115 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + devices + + + + Device Mapping State + + + + status + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + devices + + + + Device Mapping State + + + + status + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ diff --git a/gencode/docs/state_validation.html b/gencode/docs/state_validation.html index 8a2f4e9c5c..df0a71c646 100644 --- a/gencode/docs/state_validation.html +++ b/gencode/docs/state_validation.html @@ -967,6 +967,16 @@

    id="status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_status_category_oneOf_i34" role="tab" onclick="setAnchor('#status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -1241,7 +1251,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -1281,7 +1291,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -1321,7 +1331,7 @@

    /> item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -1361,7 +1371,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -1401,7 +1411,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -1441,7 +1451,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -1481,7 +1491,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -1521,7 +1531,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -1561,7 +1571,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -1601,7 +1611,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -1641,7 +1651,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -1681,7 +1691,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -1721,7 +1731,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -1761,7 +1771,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -1801,7 +1811,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -1841,7 +1851,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -1881,7 +1891,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -1921,7 +1931,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -1961,7 +1971,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -2001,7 +2011,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -2041,7 +2051,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -2081,7 +2091,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -2121,7 +2131,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -2161,7 +2171,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -2201,7 +2211,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -2241,7 +2251,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -2281,7 +2291,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -2321,7 +2331,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -2361,7 +2371,87 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + status + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + status + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ @@ -3631,6 +3721,16 @@

    id="features_pattern1_sequences_pattern1_capabilities_pattern1_status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_features_pattern1_sequences_pattern1_capabilities_pattern1_status_category_oneOf_i34" role="tab" onclick="setAnchor('#features_pattern1_sequences_pattern1_capabilities_pattern1_status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -4199,7 +4299,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -4281,7 +4381,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -4363,7 +4463,7 @@

    /> item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -4445,7 +4545,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -4527,7 +4627,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -4609,7 +4709,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -4691,7 +4791,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -4773,7 +4873,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -4855,7 +4955,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -4937,7 +5037,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -5019,7 +5119,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -5101,7 +5201,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -5183,7 +5283,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -5265,7 +5365,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -5347,7 +5447,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -5429,7 +5529,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -5511,7 +5611,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -5593,7 +5693,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -5675,7 +5775,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -5757,7 +5857,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -5839,7 +5939,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -5921,7 +6021,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -6003,7 +6103,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -6085,7 +6185,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -6167,7 +6267,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -6249,7 +6349,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -6331,7 +6431,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -6413,7 +6513,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -6495,7 +6595,171 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + features + + + + Feature Validation State + + + + sequences + + + + Sequence Validation State + + + + capabilities + + + + Capability Validation State + + + + status + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + features + + + + Feature Validation State + + + + sequences + + + + Sequence Validation State + + + + capabilities + + + + Capability Validation State + + + + status + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ @@ -7350,6 +7614,16 @@

    id="features_pattern1_sequences_pattern1_status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_features_pattern1_sequences_pattern1_status_category_oneOf_i34" role="tab" onclick="setAnchor('#features_pattern1_sequences_pattern1_status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -7820,7 +8094,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -7888,7 +8162,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -7956,7 +8230,7 @@

    /> item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -8024,7 +8298,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -8092,7 +8366,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -8160,7 +8434,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -8228,7 +8502,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -8296,7 +8570,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -8364,7 +8638,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -8432,7 +8706,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -8500,7 +8774,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -8568,7 +8842,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -8636,7 +8910,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -8704,7 +8978,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -8772,7 +9046,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -8840,7 +9114,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -8908,7 +9182,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -8976,7 +9250,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -9044,7 +9318,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -9112,7 +9386,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -9180,7 +9454,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -9248,7 +9522,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -9316,7 +9590,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -9384,7 +9658,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -9452,7 +9726,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -9520,7 +9794,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -9588,7 +9862,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -9656,7 +9930,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -9724,26 +9998,162 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ - - - - +
    - -
    - - - -
    -
    +
    root + + + + features + + + + Feature Validation State + + + + sequences + + + + Sequence Validation State + + + + status + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + features + + + + Feature Validation State + + + + sequences + + + + Sequence Validation State + + + + status + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ + + + + + + +
    + + + + + + + + + + +
    +

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -12108,7 +12528,7 @@

    /> item 9

    Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -12190,7 +12610,7 @@

    /> item 10

    Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -12272,7 +12692,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -12354,7 +12774,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -12436,7 +12856,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -12518,7 +12938,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -12600,7 +13020,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -12682,7 +13102,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -12764,7 +13184,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -12846,7 +13266,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -12928,7 +13348,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -13010,7 +13430,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -13092,7 +13512,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -13174,7 +13594,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -13256,7 +13676,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -13338,7 +13758,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -13420,7 +13840,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -13502,7 +13922,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -13584,7 +14004,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -13666,7 +14086,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -13748,7 +14168,171 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ + + + + + + +
    + + +
    root + + + + schemas + + + + Schema Validation State + + + + sequences + + + + Sequence Validation State + + + + capabilities + + + + Capability Validation State + + + + status + + + + category + + + + oneOf + + + + item 30
    Type: object
    +Must match regular expression: ^validation\.device\.multiple$ + + + + + + +
    + + +
    root + + + + schemas + + + + Schema Validation State + + + + sequences + + + + Sequence Validation State + + + + capabilities + + + + Capability Validation State + + + + status + + + + category + + + + oneOf + + + + item 31
    Type: object
    +Must match regular expression: ^validation\.device\.extra$ @@ -13756,7 +14340,7 @@

    + id="tab-pane_schemas_pattern1_sequences_pattern1_capabilities_pattern1_status_category_oneOf_i32" role="tabpanel">
    root @@ -13829,8 +14413,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 30

    Type: object
    -Must match regular expression: ^validation\.summary\.report$ + item 32
    Type: object
    +Must match regular expression: ^validation\.summary\.report$ @@ -13838,7 +14422,7 @@

    + id="tab-pane_schemas_pattern1_sequences_pattern1_capabilities_pattern1_status_category_oneOf_i33" role="tabpanel">
    root @@ -13911,8 +14495,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 31

    Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ + item 33
    Type: object
    +Must match regular expression: ^validation\.feature\.sequence$ @@ -13920,7 +14504,7 @@

    + id="tab-pane_schemas_pattern1_sequences_pattern1_capabilities_pattern1_status_category_oneOf_i34" role="tabpanel">
    root @@ -13993,8 +14577,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 32

    Type: object
    -Must match regular expression: ^validation\.feature\.schema$ + item 34
    Type: object
    +Must match regular expression: ^validation\.feature\.schema$ @@ -14002,7 +14586,7 @@

    + id="tab-pane_schemas_pattern1_sequences_pattern1_capabilities_pattern1_status_category_oneOf_i35" role="tabpanel">
    root @@ -14075,8 +14659,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 33

    Type: object
    -Must match regular expression: ^validation\.feature\.capability$ + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ @@ -14084,7 +14668,7 @@

    + id="tab-pane_schemas_pattern1_sequences_pattern1_capabilities_pattern1_status_category_oneOf_i36" role="tabpanel">
    root @@ -14157,8 +14741,8 @@

    d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z" /> - item 34

    Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ @@ -15013,6 +15597,16 @@

    id="schemas_pattern1_sequences_pattern1_status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_schemas_pattern1_sequences_pattern1_status_category_oneOf_i34" role="tab" onclick="setAnchor('#schemas_pattern1_sequences_pattern1_status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -15483,7 +16077,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -15551,7 +16145,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -15619,7 +16213,7 @@

    /> item 8Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -15687,7 +16281,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -15755,7 +16349,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -15823,7 +16417,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -15891,7 +16485,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -15959,7 +16553,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -16027,7 +16621,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -16095,7 +16689,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -16163,7 +16757,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -16231,7 +16825,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -16299,7 +16893,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -16367,7 +16961,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -16435,7 +17029,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -16503,7 +17097,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -16571,7 +17165,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -16639,7 +17233,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -16707,7 +17301,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -16775,7 +17369,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -16843,7 +17437,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -16911,7 +17505,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -16979,7 +17573,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -17047,7 +17641,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -17115,7 +17709,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -17183,7 +17777,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -17251,7 +17845,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -17319,7 +17913,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -17387,7 +17981,143 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + schemas + + + + Schema Validation State + + + + sequences + + + + Sequence Validation State + + + + status + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + schemas + + + + Schema Validation State + + + + sequences + + + + Sequence Validation State + + + + status + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ @@ -18576,6 +19306,16 @@

    id="devices_pattern1_status_category_oneOf_i34" data-toggle="tab" href="#tab-pane_devices_pattern1_status_category_oneOf_i34" role="tab" onclick="setAnchor('#devices_pattern1_status_category_oneOf_i34')" >Option 35 +
  • + Option 36 +
  • + Option 37
    • @@ -18948,7 +19688,7 @@

    /> item 6

    Type: object
    -Must match regular expression: ^system\.network\.connection$ +Must match regular expression: ^system\.auth\.login$ @@ -19002,7 +19742,7 @@

    /> item 7

    Type: object
    -Must match regular expression: ^system\.network\.disconnect$ +Must match regular expression: ^system\.auth\.logout$ @@ -19056,7 +19796,7 @@

    /> item 8

    Type: object
    -Must match regular expression: ^system\.auth\.login$ +Must match regular expression: ^system\.auth\.fail$ @@ -19110,7 +19850,7 @@

    /> item 9Type: object
    -Must match regular expression: ^system\.auth\.logout$ +Must match regular expression: ^pointset\.point\.nominal$ @@ -19164,7 +19904,7 @@

    /> item 10Type: object
    -Must match regular expression: ^system\.auth\.fail$ +Must match regular expression: ^pointset\.point\.applied$ @@ -19218,7 +19958,7 @@

    /> item 11Type: object
    -Must match regular expression: ^pointset\.point\.nominal$ +Must match regular expression: ^pointset\.point\.updating$ @@ -19272,7 +20012,7 @@

    /> item 12Type: object
    -Must match regular expression: ^pointset\.point\.applied$ +Must match regular expression: ^pointset\.point\.overridden$ @@ -19326,7 +20066,7 @@

    /> item 13Type: object
    -Must match regular expression: ^pointset\.point\.updating$ +Must match regular expression: ^pointset\.point\.failure$ @@ -19380,7 +20120,7 @@

    /> item 14Type: object
    -Must match regular expression: ^pointset\.point\.overridden$ +Must match regular expression: ^pointset\.point\.invalid$ @@ -19434,7 +20174,7 @@

    /> item 15Type: object
    -Must match regular expression: ^pointset\.point\.failure$ +Must match regular expression: ^localnet\.network$ @@ -19488,7 +20228,7 @@

    /> item 16Type: object
    -Must match regular expression: ^pointset\.point\.invalid$ +Must match regular expression: ^localnet\.network\.connect$ @@ -19542,7 +20282,7 @@

    /> item 17Type: object
    -Must match regular expression: ^localnet\.network$ +Must match regular expression: ^gateway\.setup\.attach$ @@ -19596,7 +20336,7 @@

    /> item 18Type: object
    -Must match regular expression: ^discovery\.family\.scan$ +Must match regular expression: ^gateway\.proxy\.target$ @@ -19650,7 +20390,7 @@

    /> item 19Type: object
    -Must match regular expression: ^discovery\.device\.enumerate$ +Must match regular expression: ^gateway\.proxy\.connect$ @@ -19704,7 +20444,7 @@

    /> item 20Type: object
    -Must match regular expression: ^discovery\.point\.describe$ +Must match regular expression: ^discovery\.family\.scan$ @@ -19758,7 +20498,7 @@

    /> item 21Type: object
    -Must match regular expression: ^mapping\.device\.apply$ +Must match regular expression: ^discovery\.device\.enumerate$ @@ -19812,7 +20552,7 @@

    /> item 22Type: object
    -Must match regular expression: ^blobset\.blob\.receive$ +Must match regular expression: ^discovery\.point\.describe$ @@ -19866,7 +20606,7 @@

    /> item 23Type: object
    -Must match regular expression: ^blobset\.blob\.fetch$ +Must match regular expression: ^mapping\.device\.apply$ @@ -19920,7 +20660,7 @@

    /> item 24Type: object
    -Must match regular expression: ^blobset\.blob\.apply$ +Must match regular expression: ^blobset\.blob\.receive$ @@ -19974,7 +20714,7 @@

    /> item 25Type: object
    -Must match regular expression: ^validation\.device\.receive$ +Must match regular expression: ^blobset\.blob\.fetch$ @@ -20028,7 +20768,7 @@

    /> item 26Type: object
    -Must match regular expression: ^validation\.device\.schema$ +Must match regular expression: ^blobset\.blob\.apply$ @@ -20082,7 +20822,7 @@

    /> item 27Type: object
    -Must match regular expression: ^validation\.device\.content$ +Must match regular expression: ^validation\.device\.receive$ @@ -20136,7 +20876,7 @@

    /> item 28Type: object
    -Must match regular expression: ^validation\.device\.multiple$ +Must match regular expression: ^validation\.device\.schema$ @@ -20190,7 +20930,7 @@

    /> item 29Type: object
    -Must match regular expression: ^validation\.device\.extra$ +Must match regular expression: ^validation\.device\.content$ @@ -20244,7 +20984,7 @@

    /> item 30Type: object
    -Must match regular expression: ^validation\.summary\.report$ +Must match regular expression: ^validation\.device\.multiple$ @@ -20298,7 +21038,7 @@

    /> item 31Type: object
    -Must match regular expression: ^validation\.feature\.sequence$ +Must match regular expression: ^validation\.device\.extra$ @@ -20352,7 +21092,7 @@

    /> item 32Type: object
    -Must match regular expression: ^validation\.feature\.schema$ +Must match regular expression: ^validation\.summary\.report$ @@ -20406,7 +21146,7 @@

    /> item 33Type: object
    -Must match regular expression: ^validation\.feature\.capability$ +Must match regular expression: ^validation\.feature\.sequence$ @@ -20460,7 +21200,115 @@

    /> item 34Type: object
    -Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ +Must match regular expression: ^validation\.feature\.schema$ + + + + + + +
    + + +
    root + + + + devices + + + + Device Validation Event + + + + status + + + + category + + + + oneOf + + + + item 35
    Type: object
    +Must match regular expression: ^validation\.feature\.capability$ + + + + + + +
    + + +
    root + + + + devices + + + + Device Validation Event + + + + status + + + + category + + + + oneOf + + + + item 36
    Type: object
    +Must match regular expression: ^device(\.[a-z]+((_[a-z]+))*)+$ diff --git a/gencode/java/udmi/schema/Category.java b/gencode/java/udmi/schema/Category.java index 8cf1626334..ee349f6394 100644 --- a/gencode/java/udmi/schema/Category.java +++ b/gencode/java/udmi/schema/Category.java @@ -51,18 +51,6 @@ public class Category { public static final int SYSTEM_CONFIG_APPLY_VALUE = NOTICE.value(); static { LEVEL.put(SYSTEM_CONFIG_APPLY, NOTICE); } - // Connected to the network - public static final String SYSTEM_NETWORK_CONNECTION = "system.network.connection"; - public static final Level SYSTEM_NETWORK_CONNECTION_LEVEL = NOTICE; - public static final int SYSTEM_NETWORK_CONNECTION_VALUE = NOTICE.value(); - static { LEVEL.put(SYSTEM_NETWORK_CONNECTION, NOTICE); } - - // Disconnected from a network - public static final String SYSTEM_NETWORK_DISCONNECT = "system.network.disconnect"; - public static final Level SYSTEM_NETWORK_DISCONNECT_LEVEL = NOTICE; - public static final int SYSTEM_NETWORK_DISCONNECT_VALUE = NOTICE.value(); - static { LEVEL.put(SYSTEM_NETWORK_DISCONNECT, NOTICE); } - // Successful login. The entry message should include the username and application public static final String SYSTEM_AUTH_LOGIN = "system.auth.login"; public static final Level SYSTEM_AUTH_LOGIN_LEVEL = NOTICE; @@ -123,6 +111,30 @@ public class Category { public static final int LOCALNET_NETWORK_VALUE = INFO.value(); static { LEVEL.put(LOCALNET_NETWORK, INFO); } + // Connected status of the device on + public static final String LOCALNET_NETWORK_CONNECT = "localnet.network.connect"; + public static final Level LOCALNET_NETWORK_CONNECT_LEVEL = NOTICE; + public static final int LOCALNET_NETWORK_CONNECT_VALUE = NOTICE.value(); + static { LEVEL.put(LOCALNET_NETWORK_CONNECT, NOTICE); } + + // Expected status for attachment failures between gateway and cloud + public static final String GATEWAY_SETUP_ATTACH = "gateway.setup.attach"; + public static final Level GATEWAY_SETUP_ATTACH_LEVEL = ERROR; + public static final int GATEWAY_SETUP_ATTACH_VALUE = ERROR.value(); + static { LEVEL.put(GATEWAY_SETUP_ATTACH, ERROR); } + + // Basic target block specification, missing (warning) or unprocessable (error) + public static final String GATEWAY_PROXY_TARGET = "gateway.proxy.target"; + public static final Level GATEWAY_PROXY_TARGET_LEVEL = WARNING; + public static final int GATEWAY_PROXY_TARGET_VALUE = WARNING.value(); + static { LEVEL.put(GATEWAY_PROXY_TARGET, WARNING); } + + // Fieldbus connection between gateway and proxied device (error on failure) + public static final String GATEWAY_PROXY_CONNECT = "gateway.proxy.connect"; + public static final Level GATEWAY_PROXY_CONNECT_LEVEL = ERROR; + public static final int GATEWAY_PROXY_CONNECT_VALUE = ERROR.value(); + static { LEVEL.put(GATEWAY_PROXY_CONNECT, ERROR); } + // Relating to scanning a particular address family public static final String DISCOVERY_FAMILY_SCAN = "discovery.family.scan"; public static final Level DISCOVERY_FAMILY_SCAN_LEVEL = INFO; diff --git a/gencode/java/udmi/schema/Config.java b/gencode/java/udmi/schema/Config.java index 9d52392707..add40b272f 100644 --- a/gencode/java/udmi/schema/Config.java +++ b/gencode/java/udmi/schema/Config.java @@ -83,11 +83,11 @@ public class Config { /** * Localnet Config *

    - * Used to describe device local network parameters + * Currently unused: request local network configuration * */ @JsonProperty("localnet") - @JsonPropertyDescription("Used to describe device local network parameters") + @JsonPropertyDescription("Currently unused: request local network configuration") public LocalnetConfig localnet; /** * Blobset Config diff --git a/gencode/java/udmi/schema/FamilyLocalnetModel.java b/gencode/java/udmi/schema/FamilyLocalnetModel.java index 1f01563fcd..7d93eb37ad 100644 --- a/gencode/java/udmi/schema/FamilyLocalnetModel.java +++ b/gencode/java/udmi/schema/FamilyLocalnetModel.java @@ -16,24 +16,32 @@ */ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "addr" + "addr", + "family" }) @Generated("jsonschema2pojo") public class FamilyLocalnetModel { /** - * The address of a device on the local network - * (Required) + * The address of a device on the fieldbus/local network * */ @JsonProperty("addr") - @JsonPropertyDescription("The address of a device on the local network") + @JsonPropertyDescription("The address of a device on the fieldbus/local network") public String addr; + /** + * Associated address family (not used when part of a map) + * + */ + @JsonProperty("family") + @JsonPropertyDescription("Associated address family (not used when part of a map)") + public String family; @Override public int hashCode() { int result = 1; result = ((result* 31)+((this.addr == null)? 0 :this.addr.hashCode())); + result = ((result* 31)+((this.family == null)? 0 :this.family.hashCode())); return result; } @@ -46,7 +54,7 @@ public boolean equals(Object other) { return false; } FamilyLocalnetModel rhs = ((FamilyLocalnetModel) other); - return ((this.addr == rhs.addr)||((this.addr!= null)&&this.addr.equals(rhs.addr))); + return (((this.addr == rhs.addr)||((this.addr!= null)&&this.addr.equals(rhs.addr)))&&((this.family == rhs.family)||((this.family!= null)&&this.family.equals(rhs.family)))); } } diff --git a/gencode/java/udmi/schema/GatewayConfig.java b/gencode/java/udmi/schema/GatewayConfig.java index 3a5c2c2634..61fa117fe9 100644 --- a/gencode/java/udmi/schema/GatewayConfig.java +++ b/gencode/java/udmi/schema/GatewayConfig.java @@ -18,7 +18,8 @@ */ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "proxy_ids" + "proxy_ids", + "target" }) @Generated("jsonschema2pojo") public class GatewayConfig { @@ -30,11 +31,21 @@ public class GatewayConfig { @JsonProperty("proxy_ids") @JsonPropertyDescription("An array of all the device IDs which are bound to the device") public List proxy_ids = new ArrayList(); + /** + * Family Localnet Model + *

    + * The type of network + * + */ + @JsonProperty("target") + @JsonPropertyDescription("The type of network") + public FamilyLocalnetModel target; @Override public int hashCode() { int result = 1; result = ((result* 31)+((this.proxy_ids == null)? 0 :this.proxy_ids.hashCode())); + result = ((result* 31)+((this.target == null)? 0 :this.target.hashCode())); return result; } @@ -47,7 +58,7 @@ public boolean equals(Object other) { return false; } GatewayConfig rhs = ((GatewayConfig) other); - return ((this.proxy_ids == rhs.proxy_ids)||((this.proxy_ids!= null)&&this.proxy_ids.equals(rhs.proxy_ids))); + return (((this.proxy_ids == rhs.proxy_ids)||((this.proxy_ids!= null)&&this.proxy_ids.equals(rhs.proxy_ids)))&&((this.target == rhs.target)||((this.target!= null)&&this.target.equals(rhs.target)))); } } diff --git a/gencode/java/udmi/schema/GatewayModel.java b/gencode/java/udmi/schema/GatewayModel.java index dd8d54748b..bbbc37e32a 100644 --- a/gencode/java/udmi/schema/GatewayModel.java +++ b/gencode/java/udmi/schema/GatewayModel.java @@ -19,7 +19,7 @@ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ "gateway_id", - "family", + "target", "proxy_ids" }) @Generated("jsonschema2pojo") @@ -33,12 +33,14 @@ public class GatewayModel { @JsonPropertyDescription("The device ID of the gateway the device is bound to") public String gateway_id; /** - * Protocol family used for connecting to the proxy device + * Family Localnet Model + *

    + * The type of network * */ - @JsonProperty("family") - @JsonPropertyDescription("Protocol family used for connecting to the proxy device") - public String family; + @JsonProperty("target") + @JsonPropertyDescription("The type of network") + public FamilyLocalnetModel target; /** * An array of all the device IDs which are bound to the device * @@ -51,8 +53,8 @@ public class GatewayModel { public int hashCode() { int result = 1; result = ((result* 31)+((this.proxy_ids == null)? 0 :this.proxy_ids.hashCode())); - result = ((result* 31)+((this.family == null)? 0 :this.family.hashCode())); result = ((result* 31)+((this.gateway_id == null)? 0 :this.gateway_id.hashCode())); + result = ((result* 31)+((this.target == null)? 0 :this.target.hashCode())); return result; } @@ -65,7 +67,7 @@ public boolean equals(Object other) { return false; } GatewayModel rhs = ((GatewayModel) other); - return ((((this.proxy_ids == rhs.proxy_ids)||((this.proxy_ids!= null)&&this.proxy_ids.equals(rhs.proxy_ids)))&&((this.family == rhs.family)||((this.family!= null)&&this.family.equals(rhs.family))))&&((this.gateway_id == rhs.gateway_id)||((this.gateway_id!= null)&&this.gateway_id.equals(rhs.gateway_id)))); + return ((((this.proxy_ids == rhs.proxy_ids)||((this.proxy_ids!= null)&&this.proxy_ids.equals(rhs.proxy_ids)))&&((this.gateway_id == rhs.gateway_id)||((this.gateway_id!= null)&&this.gateway_id.equals(rhs.gateway_id))))&&((this.target == rhs.target)||((this.target!= null)&&this.target.equals(rhs.target)))); } } diff --git a/gencode/java/udmi/schema/GatewayState.java b/gencode/java/udmi/schema/GatewayState.java index 55b75764ba..422b01e114 100644 --- a/gencode/java/udmi/schema/GatewayState.java +++ b/gencode/java/udmi/schema/GatewayState.java @@ -19,7 +19,7 @@ @JsonPropertyOrder({ "timestamp", "version", - "devices" + "status" }) @Generated("jsonschema2pojo") public class GatewayState { @@ -38,15 +38,21 @@ public class GatewayState { @JsonProperty("version") @JsonPropertyDescription("Version of the UDMI schema") public String version; - @JsonProperty("devices") - public Object devices; + /** + * Entry + *

    + * + * + */ + @JsonProperty("status") + public Entry status; @Override public int hashCode() { int result = 1; result = ((result* 31)+((this.version == null)? 0 :this.version.hashCode())); - result = ((result* 31)+((this.devices == null)? 0 :this.devices.hashCode())); result = ((result* 31)+((this.timestamp == null)? 0 :this.timestamp.hashCode())); + result = ((result* 31)+((this.status == null)? 0 :this.status.hashCode())); return result; } @@ -59,7 +65,7 @@ public boolean equals(Object other) { return false; } GatewayState rhs = ((GatewayState) other); - return ((((this.version == rhs.version)||((this.version!= null)&&this.version.equals(rhs.version)))&&((this.devices == rhs.devices)||((this.devices!= null)&&this.devices.equals(rhs.devices))))&&((this.timestamp == rhs.timestamp)||((this.timestamp!= null)&&this.timestamp.equals(rhs.timestamp)))); + return ((((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)))); } } diff --git a/gencode/java/udmi/schema/LocalnetConfig.java b/gencode/java/udmi/schema/LocalnetConfig.java index 68aca4838e..e9ed086849 100644 --- a/gencode/java/udmi/schema/LocalnetConfig.java +++ b/gencode/java/udmi/schema/LocalnetConfig.java @@ -3,37 +3,26 @@ import javax.annotation.processing.Generated; import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonPropertyOrder; /** * Localnet Config *

    - * Used to describe device local network parameters + * Currently unused: request local network configuration * */ @JsonInclude(JsonInclude.Include.NON_NULL) @JsonPropertyOrder({ - "families" + }) @Generated("jsonschema2pojo") public class LocalnetConfig { - /** - * Family Reference - *

    - * - * (Required) - * - */ - @JsonProperty("families") - public Object families; @Override public int hashCode() { int result = 1; - result = ((result* 31)+((this.families == null)? 0 :this.families.hashCode())); return result; } @@ -46,7 +35,7 @@ public boolean equals(Object other) { return false; } LocalnetConfig rhs = ((LocalnetConfig) other); - return ((this.families == rhs.families)||((this.families!= null)&&this.families.equals(rhs.families))); + return true; } } diff --git a/gencode/java/udmi/schema/Operation.java b/gencode/java/udmi/schema/Operation.java index c20a3eb249..c2b1b42f25 100644 --- a/gencode/java/udmi/schema/Operation.java +++ b/gencode/java/udmi/schema/Operation.java @@ -69,6 +69,7 @@ public enum SystemMode { INITIAL("initial"), ACTIVE("active"), + UPDATING("updating"), RESTART("restart"), TERMINATE("terminate"), SHUTDOWN("shutdown"); diff --git a/gencode/java/udmi/schema/PubberOptions.java b/gencode/java/udmi/schema/PubberOptions.java index 2c8edea97a..a908a45fc2 100644 --- a/gencode/java/udmi/schema/PubberOptions.java +++ b/gencode/java/udmi/schema/PubberOptions.java @@ -24,6 +24,7 @@ "noLastConfig", "badCategory", "badVersion", + "badAddr", "noProxy", "extraDevice", "barfConfig", @@ -68,6 +69,8 @@ public class PubberOptions { public Boolean badCategory; @JsonProperty("badVersion") public Boolean badVersion; + @JsonProperty("badAddr") + public Boolean badAddr; @JsonProperty("noProxy") public Boolean noProxy; @JsonProperty("extraDevice") @@ -147,6 +150,7 @@ public int hashCode() { result = ((result* 31)+((this.missingPoint == null)? 0 :this.missingPoint.hashCode())); result = ((result* 31)+((this.badCategory == null)? 0 :this.badCategory.hashCode())); result = ((result* 31)+((this.extraPoint == null)? 0 :this.extraPoint.hashCode())); + result = ((result* 31)+((this.badAddr == null)? 0 :this.badAddr.hashCode())); result = ((result* 31)+((this.smokeCheck == null)? 0 :this.smokeCheck.hashCode())); result = ((result* 31)+((this.redirectRegistry == null)? 0 :this.redirectRegistry.hashCode())); result = ((result* 31)+((this.noPointState == null)? 0 :this.noPointState.hashCode())); @@ -174,7 +178,7 @@ public boolean equals(Object other) { return false; } PubberOptions rhs = ((PubberOptions) other); - return (((((((((((((((((((((((((((((((((this.skewClock == rhs.skewClock)||((this.skewClock!= null)&&this.skewClock.equals(rhs.skewClock)))&&((this.noPersist == rhs.noPersist)||((this.noPersist!= null)&&this.noPersist.equals(rhs.noPersist))))&&((this.noLastConfig == rhs.noLastConfig)||((this.noLastConfig!= null)&&this.noLastConfig.equals(rhs.noLastConfig))))&&((this.noLog == rhs.noLog)||((this.noLog!= null)&&this.noLog.equals(rhs.noLog))))&&((this.noHardware == rhs.noHardware)||((this.noHardware!= null)&&this.noHardware.equals(rhs.noHardware))))&&((this.messageTrace == rhs.messageTrace)||((this.messageTrace!= null)&&this.messageTrace.equals(rhs.messageTrace))))&&((this.softwareFirmwareValue == rhs.softwareFirmwareValue)||((this.softwareFirmwareValue!= null)&&this.softwareFirmwareValue.equals(rhs.softwareFirmwareValue))))&&((this.noWriteback == rhs.noWriteback)||((this.noWriteback!= null)&&this.noWriteback.equals(rhs.noWriteback))))&&((this.noLastStart == rhs.noLastStart)||((this.noLastStart!= null)&&this.noLastStart.equals(rhs.noLastStart))))&&((this.tweakState == rhs.tweakState)||((this.tweakState!= null)&&this.tweakState.equals(rhs.tweakState))))&&((this.spamState == rhs.spamState)||((this.spamState!= null)&&this.spamState.equals(rhs.spamState))))&&((this.noState == rhs.noState)||((this.noState!= null)&&this.noState.equals(rhs.noState))))&&((this.badState == rhs.badState)||((this.badState!= null)&&this.badState.equals(rhs.badState))))&&((this.noProxy == rhs.noProxy)||((this.noProxy!= null)&&this.noProxy.equals(rhs.noProxy))))&&((this.missingPoint == rhs.missingPoint)||((this.missingPoint!= null)&&this.missingPoint.equals(rhs.missingPoint))))&&((this.badCategory == rhs.badCategory)||((this.badCategory!= null)&&this.badCategory.equals(rhs.badCategory))))&&((this.extraPoint == rhs.extraPoint)||((this.extraPoint!= null)&&this.extraPoint.equals(rhs.extraPoint))))&&((this.smokeCheck == rhs.smokeCheck)||((this.smokeCheck!= null)&&this.smokeCheck.equals(rhs.smokeCheck))))&&((this.redirectRegistry == rhs.redirectRegistry)||((this.redirectRegistry!= null)&&this.redirectRegistry.equals(rhs.redirectRegistry))))&&((this.noPointState == rhs.noPointState)||((this.noPointState!= null)&&this.noPointState.equals(rhs.noPointState))))&&((this.disableWriteback == rhs.disableWriteback)||((this.disableWriteback!= null)&&this.disableWriteback.equals(rhs.disableWriteback))))&&((this.barfConfig == rhs.barfConfig)||((this.barfConfig!= null)&&this.barfConfig.equals(rhs.barfConfig))))&&((this.extraField == rhs.extraField)||((this.extraField!= null)&&this.extraField.equals(rhs.extraField))))&&((this.emptyMissing == rhs.emptyMissing)||((this.emptyMissing!= null)&&this.emptyMissing.equals(rhs.emptyMissing))))&&((this.fixedSampleRate == rhs.fixedSampleRate)||((this.fixedSampleRate!= null)&&this.fixedSampleRate.equals(rhs.fixedSampleRate))))&&((this.dupeState == rhs.dupeState)||((this.dupeState!= null)&&this.dupeState.equals(rhs.dupeState))))&&((this.featureEnableSwap == rhs.featureEnableSwap)||((this.featureEnableSwap!= null)&&this.featureEnableSwap.equals(rhs.featureEnableSwap))))&&((this.extraDevice == rhs.extraDevice)||((this.extraDevice!= null)&&this.extraDevice.equals(rhs.extraDevice))))&&((this.noConfigAck == rhs.noConfigAck)||((this.noConfigAck!= null)&&this.noConfigAck.equals(rhs.noConfigAck))))&&((this.badVersion == rhs.badVersion)||((this.badVersion!= null)&&this.badVersion.equals(rhs.badVersion))))&&((this.fixedLogLevel == rhs.fixedLogLevel)||((this.fixedLogLevel!= null)&&this.fixedLogLevel.equals(rhs.fixedLogLevel))))&&((this.configStateDelay == rhs.configStateDelay)||((this.configStateDelay!= null)&&this.configStateDelay.equals(rhs.configStateDelay)))); + return ((((((((((((((((((((((((((((((((((this.skewClock == rhs.skewClock)||((this.skewClock!= null)&&this.skewClock.equals(rhs.skewClock)))&&((this.noPersist == rhs.noPersist)||((this.noPersist!= null)&&this.noPersist.equals(rhs.noPersist))))&&((this.noLastConfig == rhs.noLastConfig)||((this.noLastConfig!= null)&&this.noLastConfig.equals(rhs.noLastConfig))))&&((this.noLog == rhs.noLog)||((this.noLog!= null)&&this.noLog.equals(rhs.noLog))))&&((this.noHardware == rhs.noHardware)||((this.noHardware!= null)&&this.noHardware.equals(rhs.noHardware))))&&((this.messageTrace == rhs.messageTrace)||((this.messageTrace!= null)&&this.messageTrace.equals(rhs.messageTrace))))&&((this.softwareFirmwareValue == rhs.softwareFirmwareValue)||((this.softwareFirmwareValue!= null)&&this.softwareFirmwareValue.equals(rhs.softwareFirmwareValue))))&&((this.noWriteback == rhs.noWriteback)||((this.noWriteback!= null)&&this.noWriteback.equals(rhs.noWriteback))))&&((this.noLastStart == rhs.noLastStart)||((this.noLastStart!= null)&&this.noLastStart.equals(rhs.noLastStart))))&&((this.tweakState == rhs.tweakState)||((this.tweakState!= null)&&this.tweakState.equals(rhs.tweakState))))&&((this.spamState == rhs.spamState)||((this.spamState!= null)&&this.spamState.equals(rhs.spamState))))&&((this.noState == rhs.noState)||((this.noState!= null)&&this.noState.equals(rhs.noState))))&&((this.badState == rhs.badState)||((this.badState!= null)&&this.badState.equals(rhs.badState))))&&((this.noProxy == rhs.noProxy)||((this.noProxy!= null)&&this.noProxy.equals(rhs.noProxy))))&&((this.missingPoint == rhs.missingPoint)||((this.missingPoint!= null)&&this.missingPoint.equals(rhs.missingPoint))))&&((this.badCategory == rhs.badCategory)||((this.badCategory!= null)&&this.badCategory.equals(rhs.badCategory))))&&((this.extraPoint == rhs.extraPoint)||((this.extraPoint!= null)&&this.extraPoint.equals(rhs.extraPoint))))&&((this.badAddr == rhs.badAddr)||((this.badAddr!= null)&&this.badAddr.equals(rhs.badAddr))))&&((this.smokeCheck == rhs.smokeCheck)||((this.smokeCheck!= null)&&this.smokeCheck.equals(rhs.smokeCheck))))&&((this.redirectRegistry == rhs.redirectRegistry)||((this.redirectRegistry!= null)&&this.redirectRegistry.equals(rhs.redirectRegistry))))&&((this.noPointState == rhs.noPointState)||((this.noPointState!= null)&&this.noPointState.equals(rhs.noPointState))))&&((this.disableWriteback == rhs.disableWriteback)||((this.disableWriteback!= null)&&this.disableWriteback.equals(rhs.disableWriteback))))&&((this.barfConfig == rhs.barfConfig)||((this.barfConfig!= null)&&this.barfConfig.equals(rhs.barfConfig))))&&((this.extraField == rhs.extraField)||((this.extraField!= null)&&this.extraField.equals(rhs.extraField))))&&((this.emptyMissing == rhs.emptyMissing)||((this.emptyMissing!= null)&&this.emptyMissing.equals(rhs.emptyMissing))))&&((this.fixedSampleRate == rhs.fixedSampleRate)||((this.fixedSampleRate!= null)&&this.fixedSampleRate.equals(rhs.fixedSampleRate))))&&((this.dupeState == rhs.dupeState)||((this.dupeState!= null)&&this.dupeState.equals(rhs.dupeState))))&&((this.featureEnableSwap == rhs.featureEnableSwap)||((this.featureEnableSwap!= null)&&this.featureEnableSwap.equals(rhs.featureEnableSwap))))&&((this.extraDevice == rhs.extraDevice)||((this.extraDevice!= null)&&this.extraDevice.equals(rhs.extraDevice))))&&((this.noConfigAck == rhs.noConfigAck)||((this.noConfigAck!= null)&&this.noConfigAck.equals(rhs.noConfigAck))))&&((this.badVersion == rhs.badVersion)||((this.badVersion!= null)&&this.badVersion.equals(rhs.badVersion))))&&((this.fixedLogLevel == rhs.fixedLogLevel)||((this.fixedLogLevel!= null)&&this.fixedLogLevel.equals(rhs.fixedLogLevel))))&&((this.configStateDelay == rhs.configStateDelay)||((this.configStateDelay!= null)&&this.configStateDelay.equals(rhs.configStateDelay)))); } } diff --git a/gencode/python/udmi/schema/config_gateway.py b/gencode/python/udmi/schema/config_gateway.py index f8490c334a..876ba3bf8d 100644 --- a/gencode/python/udmi/schema/config_gateway.py +++ b/gencode/python/udmi/schema/config_gateway.py @@ -1,4 +1,5 @@ """Generated class for config_gateway.json""" +from .model_localnet_family import FamilyLocalnetModel class GatewayConfig: @@ -6,6 +7,7 @@ class GatewayConfig: def __init__(self): self.proxy_ids = None + self.target = None @staticmethod def from_dict(source): @@ -13,6 +15,7 @@ def from_dict(source): return None result = GatewayConfig() result.proxy_ids = source.get('proxy_ids') + result.target = FamilyLocalnetModel.from_dict(source.get('target')) return result @staticmethod @@ -35,4 +38,6 @@ def to_dict(self): result = {} if self.proxy_ids: result['proxy_ids'] = self.proxy_ids # 1 + if self.target: + result['target'] = self.target.to_dict() # 4 return result diff --git a/gencode/python/udmi/schema/config_localnet.py b/gencode/python/udmi/schema/config_localnet.py index dcba3d31cf..d0e525f429 100644 --- a/gencode/python/udmi/schema/config_localnet.py +++ b/gencode/python/udmi/schema/config_localnet.py @@ -1,55 +1,17 @@ """Generated class for config_localnet.json""" -class ObjectABD2578D: - """Generated schema class""" - - def __init__(self): - self.addr = None - - @staticmethod - def from_dict(source): - if not source: - return None - result = ObjectABD2578D() - result.addr = source.get('addr') - return result - - @staticmethod - def map_from(source): - if not source: - return None - result = {} - for key in source: - result[key] = ObjectABD2578D.from_dict(source[key]) - return result - - @staticmethod - def expand_dict(input): - result = {} - for property in input: - result[property] = input[property].to_dict() if input[property] else {} - return result - - def to_dict(self): - result = {} - if self.addr: - result['addr'] = self.addr # 5 - return result - - class LocalnetConfig: """Generated schema class""" def __init__(self): - self.families = None + pass @staticmethod def from_dict(source): if not source: return None result = LocalnetConfig() - result.families = ObjectABD2578D.map_from(source.get('families')) return result @staticmethod @@ -70,6 +32,4 @@ def expand_dict(input): def to_dict(self): result = {} - if self.families: - result['families'] = ObjectABD2578D.expand_dict(self.families) # 2 return result diff --git a/gencode/python/udmi/schema/model_gateway.py b/gencode/python/udmi/schema/model_gateway.py index 9106dd4e56..30f94a5b1b 100644 --- a/gencode/python/udmi/schema/model_gateway.py +++ b/gencode/python/udmi/schema/model_gateway.py @@ -1,4 +1,5 @@ """Generated class for model_gateway.json""" +from .model_localnet_family import FamilyLocalnetModel class GatewayModel: @@ -6,7 +7,7 @@ class GatewayModel: def __init__(self): self.gateway_id = None - self.family = None + self.target = None self.proxy_ids = None @staticmethod @@ -15,7 +16,7 @@ def from_dict(source): return None result = GatewayModel() result.gateway_id = source.get('gateway_id') - result.family = source.get('family') + result.target = FamilyLocalnetModel.from_dict(source.get('target')) result.proxy_ids = source.get('proxy_ids') return result @@ -39,8 +40,8 @@ def to_dict(self): result = {} if self.gateway_id: result['gateway_id'] = self.gateway_id # 5 - if self.family: - result['family'] = self.family # 5 + if self.target: + result['target'] = self.target.to_dict() # 4 if self.proxy_ids: result['proxy_ids'] = self.proxy_ids # 1 return result diff --git a/gencode/python/udmi/schema/model_localnet_family.py b/gencode/python/udmi/schema/model_localnet_family.py index 1b894c5305..d3020ef42a 100644 --- a/gencode/python/udmi/schema/model_localnet_family.py +++ b/gencode/python/udmi/schema/model_localnet_family.py @@ -6,6 +6,7 @@ class FamilyLocalnetModel: def __init__(self): self.addr = None + self.family = None @staticmethod def from_dict(source): @@ -13,6 +14,7 @@ def from_dict(source): return None result = FamilyLocalnetModel() result.addr = source.get('addr') + result.family = source.get('family') return result @staticmethod @@ -35,4 +37,6 @@ def to_dict(self): result = {} if self.addr: result['addr'] = self.addr # 5 + if self.family: + result['family'] = self.family # 5 return result diff --git a/gencode/python/udmi/schema/options_pubber.py b/gencode/python/udmi/schema/options_pubber.py index 89f74f9def..73adce1272 100644 --- a/gencode/python/udmi/schema/options_pubber.py +++ b/gencode/python/udmi/schema/options_pubber.py @@ -13,6 +13,7 @@ def __init__(self): self.noLastConfig = None self.badCategory = None self.badVersion = None + self.badAddr = None self.noProxy = None self.extraDevice = None self.barfConfig = None @@ -51,6 +52,7 @@ def from_dict(source): result.noLastConfig = source.get('noLastConfig') result.badCategory = source.get('badCategory') result.badVersion = source.get('badVersion') + result.badAddr = source.get('badAddr') result.noProxy = source.get('noProxy') result.extraDevice = source.get('extraDevice') result.barfConfig = source.get('barfConfig') @@ -111,6 +113,8 @@ def to_dict(self): result['badCategory'] = self.badCategory # 5 if self.badVersion: result['badVersion'] = self.badVersion # 5 + if self.badAddr: + result['badAddr'] = self.badAddr # 5 if self.noProxy: result['noProxy'] = self.noProxy # 5 if self.extraDevice: diff --git a/gencode/python/udmi/schema/state_gateway.py b/gencode/python/udmi/schema/state_gateway.py index edb3907d10..73811ee70e 100644 --- a/gencode/python/udmi/schema/state_gateway.py +++ b/gencode/python/udmi/schema/state_gateway.py @@ -1,4 +1,5 @@ """Generated class for state_gateway.json""" +from .entry import Entry class GatewayState: @@ -7,7 +8,7 @@ class GatewayState: def __init__(self): self.timestamp = None self.version = None - self.devices = None + self.status = None @staticmethod def from_dict(source): @@ -16,7 +17,7 @@ def from_dict(source): result = GatewayState() result.timestamp = source.get('timestamp') result.version = source.get('version') - result.devices = source.get('devices') + result.status = Entry.from_dict(source.get('status')) return result @staticmethod @@ -41,6 +42,6 @@ def to_dict(self): result['timestamp'] = self.timestamp # 5 if self.version: result['version'] = self.version # 5 - if self.devices: - result['devices'] = self.devices # 5 + if self.status: + result['status'] = self.status.to_dict() # 4 return result diff --git a/pubber/src/main/java/daq/pubber/DeviceManager.java b/pubber/src/main/java/daq/pubber/DeviceManager.java index da4ec5e7ca..b374a4c383 100644 --- a/pubber/src/main/java/daq/pubber/DeviceManager.java +++ b/pubber/src/main/java/daq/pubber/DeviceManager.java @@ -45,7 +45,7 @@ public void setPersistentData(DevicePersistent persistentData) { public void setMetadata(Metadata metadata) { pointsetManager.setPointsetModel(metadata.pointset); systemManager.setMetadata(metadata); - gatewayManager.setMetadata(metadata.gateway); + gatewayManager.setMetadata(metadata); } public void activate() { diff --git a/pubber/src/main/java/daq/pubber/GatewayManager.java b/pubber/src/main/java/daq/pubber/GatewayManager.java index 622b64d1e3..71a0f0e45d 100644 --- a/pubber/src/main/java/daq/pubber/GatewayManager.java +++ b/pubber/src/main/java/daq/pubber/GatewayManager.java @@ -1,23 +1,26 @@ package daq.pubber; +import static com.google.udmi.util.GeneralUtils.catchToNull; import static com.google.udmi.util.GeneralUtils.ifNotNullGet; import static com.google.udmi.util.GeneralUtils.ifNotNullThen; +import static com.google.udmi.util.GeneralUtils.ifNullThen; import static com.google.udmi.util.GeneralUtils.ifTrueGet; import static com.google.udmi.util.GeneralUtils.ifTrueThen; import static com.google.udmi.util.GeneralUtils.isTrue; import static java.lang.String.format; import static java.util.Optional.ofNullable; -import static java.util.function.Predicate.not; +import static udmi.schema.Category.GATEWAY_PROXY_TARGET; -import com.google.common.collect.ImmutableMap; import com.google.udmi.util.SiteModel; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import udmi.schema.Config; import udmi.schema.Entry; import udmi.schema.GatewayConfig; -import udmi.schema.GatewayModel; +import udmi.schema.GatewayState; +import udmi.schema.Level; import udmi.schema.Metadata; import udmi.schema.PointPointsetConfig; import udmi.schema.PointsetConfig; @@ -32,6 +35,8 @@ public class GatewayManager extends ManagerBase { private static final String EXTRA_PROXY_POINT = "xxx_conflagration"; private Map proxyDevices; private SiteModel siteModel; + private Metadata metadata; + private GatewayState gatewayState; public GatewayManager(ManagerHost host, PubberConfiguration configuration) { super(host, configuration); @@ -70,8 +75,9 @@ public void publishLogMessage(Entry logEntry, String targetId) { })); } - public void setMetadata(GatewayModel gateway) { - proxyDevices = ifNotNullGet(gateway, g -> createProxyDevices(g.proxy_ids)); + public void setMetadata(Metadata metadata) { + this.metadata = metadata; + proxyDevices = ifNotNullGet(metadata.gateway, g -> createProxyDevices(g.proxy_ids)); } public void activate() { @@ -82,9 +88,51 @@ ProxyDevice makeExtraDevice() { return new ProxyDevice(host, EXTRA_PROXY_DEVICE); } + /** + * Update gateway operation based off of a gateway configuration block. + */ public void updateConfig(GatewayConfig gateway) { + if (gateway == null) { + gatewayState = null; + updateState(); + return; + } + ifNullThen(gatewayState, () -> gatewayState = new GatewayState()); + ifNotNullThen(proxyDevices, p -> ifTrueThen(p.containsKey(EXTRA_PROXY_DEVICE), this::configExtraDevice)); + + if (gateway.proxy_ids == null || gateway.target != null) { + try { + String family = validateGatewayFamily(catchToNull(() -> gateway.target.family)); + setGatewayStatus(GATEWAY_PROXY_TARGET, Level.DEBUG, "gateway target family " + family); + } catch (Exception e) { + setGatewayStatus(GATEWAY_PROXY_TARGET, Level.ERROR, e.getMessage()); + } + } + updateState(); + } + + private void setGatewayStatus(String category, Level level, String message) { + // TODO: Implement a map or tree or something to properly handle different error sources. + gatewayState.status = new Entry(); + gatewayState.status.category = category; + gatewayState.status.level = level.value(); + gatewayState.status.message = message; + } + + private void updateState() { + updateState(ofNullable((Object) gatewayState).orElse(GatewayState.class)); + } + + private String validateGatewayFamily(String family) { + if (family == null) { + return null; + } + debug("Validating gateway family " + family); + Objects.requireNonNull(catchToNull(() -> metadata.localnet.families.get(family).addr), + format("Address family %s addr is null or undefined", family)); + return family; } private void configExtraDevice() { diff --git a/pubber/src/main/java/daq/pubber/MqttPublisher.java b/pubber/src/main/java/daq/pubber/MqttPublisher.java index f47514878a..d8387d6bf1 100644 --- a/pubber/src/main/java/daq/pubber/MqttPublisher.java +++ b/pubber/src/main/java/daq/pubber/MqttPublisher.java @@ -1,7 +1,7 @@ package daq.pubber; import static com.google.common.base.Preconditions.checkNotNull; -import static com.google.udmi.util.GeneralUtils.ifTrueGet; +import static com.google.udmi.util.GeneralUtils.ifNotNullGet; import static com.google.udmi.util.GeneralUtils.ifTrueThen; import static com.google.udmi.util.GeneralUtils.isTrue; import static java.lang.String.format; @@ -10,6 +10,7 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.util.ISO8601DateFormat; @@ -31,7 +32,6 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Objects; -import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; @@ -40,7 +40,6 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; -import java.util.stream.Collectors; import org.apache.http.ConnectionClosedException; import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken; import org.eclipse.paho.client.mqttv3.MqttCallback; @@ -53,6 +52,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import udmi.schema.Basic; +import udmi.schema.Config; import udmi.schema.EndpointConfiguration.Transport; import udmi.schema.Jwt; import udmi.schema.PubberConfiguration; @@ -676,6 +676,7 @@ public void messageArrived(String topic, MqttMessage message) { payload = null; } else { payload = OBJECT_MAPPER.readValue(message.toString(), type); + nukeProxyIdsIfNull(message.toString(), payload); } } catch (Exception e) { error("Processing message", deviceId, messageType, "parse", e); @@ -686,6 +687,24 @@ public void messageArrived(String topic, MqttMessage message) { } } + /** + * Hack of a function to clean up annoying Jackson POJO implicit empty collection creation. + */ + private void nukeProxyIdsIfNull(String message, Object payload) { + try { + if (payload instanceof Config configPayload) { + JsonNode jsonNode = OBJECT_MAPPER.readTree(message); + JsonNode gateway = jsonNode.get("gateway"); + JsonNode proxyIds = ifNotNullGet(gateway, g -> g.get("proxy_ids")); + if (gateway != null && proxyIds == null) { + configPayload.gateway.proxy_ids = null; + } + } + } catch (Exception e) { + throw new RuntimeException("Error nuking null gateway proxy_id", e); + } + } + private void ignoringHandler(Object message) { // Do nothing, just ignore everything. } diff --git a/schema/category.json b/schema/category.json index cb4670eccc..77d3a1ccec 100644 --- a/schema/category.json +++ b/schema/category.json @@ -10,8 +10,6 @@ { "pattern": "^system\\.config\\.receive$" }, { "pattern": "^system\\.config\\.parse$" }, { "pattern": "^system\\.config\\.apply$" }, - { "pattern": "^system\\.network\\.connection$" }, - { "pattern": "^system\\.network\\.disconnect$" }, { "pattern": "^system\\.auth\\.login$" }, { "pattern": "^system\\.auth\\.logout$" }, { "pattern": "^system\\.auth\\.fail$" }, @@ -22,6 +20,10 @@ { "pattern": "^pointset\\.point\\.failure$" }, { "pattern": "^pointset\\.point\\.invalid$" }, { "pattern": "^localnet\\.network$" }, + { "pattern": "^localnet\\.network\\.connect$" }, + { "pattern": "^gateway\\.setup\\.attach$" }, + { "pattern": "^gateway\\.proxy\\.target$" }, + { "pattern": "^gateway\\.proxy\\.connect$" }, { "pattern": "^discovery\\.family\\.scan$" }, { "pattern": "^discovery\\.device\\.enumerate$" }, { "pattern": "^discovery\\.point\\.describe$" }, diff --git a/schema/common.json b/schema/common.json index 40e5c668d4..538401a5c2 100644 --- a/schema/common.json +++ b/schema/common.json @@ -9,6 +9,7 @@ "enum": [ "initial", "active", + "updating", "restart", "terminate", "shutdown" diff --git a/schema/config_gateway.json b/schema/config_gateway.json index 9b03c6a31e..35f757e3d1 100644 --- a/schema/config_gateway.json +++ b/schema/config_gateway.json @@ -14,6 +14,10 @@ "pattern": "^[A-Z]{2,6}-[1-9][0-9]*$" }, "examples": [["AHU-22"]] + }, + "target": { + "description": "For proxied devices, this represents the target proxy device address for use by its gateway", + "$ref": "file:model_localnet_family.json" } } } diff --git a/schema/config_localnet.json b/schema/config_localnet.json index a0f26ea38b..f574d32971 100644 --- a/schema/config_localnet.json +++ b/schema/config_localnet.json @@ -1,34 +1,8 @@ { "$udmi_version": "1.5.0", "title": "Localnet Config", - "description": "Used to describe device local network parameters", + "description": "Currently unused: request local network configuration", "type": "object", "$schema": "http://json-schema.org/draft-07/schema#", - "additionalProperties": false, - "properties": { - "families": { - "title": "Family Reference", - "patternProperties": { - "^[a-z0-9-]+$": { - "additionalProperties": false, - "type": "object", - "description": "The network family", - "examples": ["bacnet", "ipv4"], - "properties": { - "addr": { - "description": "The address of the device on the local network", - "examples": ["4148893"], - "type": "string" - } - }, - "required": [ - "addr" - ] - } - } - } - }, - "required": [ - "families" - ] + "additionalProperties": false } diff --git a/schema/model_gateway.json b/schema/model_gateway.json index e0dc0076b3..1d20deaed2 100644 --- a/schema/model_gateway.json +++ b/schema/model_gateway.json @@ -12,9 +12,8 @@ "pattern": "^[A-Z]{2,6}-[1-9][0-9]*$", "examples": ["GAT-100"] }, - "family": { - "description": "Protocol family used for connecting to the proxy device", - "type": "string" + "target": { + "$ref": "file:model_localnet_family.json" }, "proxy_ids": { "description": "An array of all the device IDs which are bound to the device", diff --git a/schema/model_localnet_family.json b/schema/model_localnet_family.json index 969705b9e3..4880b68e92 100644 --- a/schema/model_localnet_family.json +++ b/schema/model_localnet_family.json @@ -9,11 +9,12 @@ "properties": { "addr": { "type": "string", - "description": "The address of a device on the local network", + "description": "The address of a device on the fieldbus/local network", "examples": ["0x414889"] + }, + "family": { + "description": "Associated address family (not used when part of a map)", + "type": "string" } - }, - "required": [ - "addr" - ] + } } diff --git a/schema/options_pubber.json b/schema/options_pubber.json index aab6b4147c..aa7dffc787 100644 --- a/schema/options_pubber.json +++ b/schema/options_pubber.json @@ -28,6 +28,9 @@ "badVersion": { "type": "boolean" }, + "badAddr": { + "type": "boolean" + }, "noProxy": { "type": "boolean" }, diff --git a/schema/state_gateway.json b/schema/state_gateway.json index cbc3ba11c9..6c2eacaa20 100644 --- a/schema/state_gateway.json +++ b/schema/state_gateway.json @@ -16,16 +16,8 @@ "description": "Version of the UDMI schema", "type": "string" }, - "devices": { - "additionalProperties": { - "type": "object", - "additionalProperties": false, - "properties": { - "status": { - "$ref": "file:entry.json" - } - } - } + "status": { + "$ref": "file:entry.json" } } } diff --git a/tests/schemas/config/delta_x1_gateway.out b/tests/schemas/config/delta_x1_gateway.out index 0696c059ae..ac8fda8b39 100644 --- a/tests/schemas/config/delta_x1_gateway.out +++ b/tests/schemas/config/delta_x1_gateway.out @@ -1,4 +1,3 @@ -3 schema violations found - /localnet: object has missing required properties (["families"]) +2 schema violations found /localnet: object instance has properties which are not allowed by the schema: ["subsystem"] object has missing required properties (["version"]) diff --git a/tests/schemas/config/delta_x1_target.out b/tests/schemas/config/delta_x1_target.out index 0696c059ae..ac8fda8b39 100644 --- a/tests/schemas/config/delta_x1_target.out +++ b/tests/schemas/config/delta_x1_target.out @@ -1,4 +1,3 @@ -3 schema violations found - /localnet: object has missing required properties (["families"]) +2 schema violations found /localnet: object instance has properties which are not allowed by the schema: ["subsystem"] object has missing required properties (["version"]) diff --git a/tests/schemas/config/direct.json b/tests/schemas/config/direct.json new file mode 100644 index 0000000000..917f029ee2 --- /dev/null +++ b/tests/schemas/config/direct.json @@ -0,0 +1,16 @@ +// Generic config block for a direct connect device. In this case, the config is +// indicating which points the device should be publishing. Since there's no +// ref field for these points, the names themselves must be meaningful to the device +// (e.g. match an internal database). There is no gateway block. +{ + "version": "1.5.0", + "timestamp": "2018-08-26T21:39:29.364Z", + "pointset": { + "points": { + "return_air_temperature_sensor": { + }, + "nexus_sensor": { + } + } + } +} diff --git a/tests/schemas/state/gateway_test.out b/tests/schemas/config/direct.out similarity index 100% rename from tests/schemas/state/gateway_test.out rename to tests/schemas/config/direct.out diff --git a/tests/schemas/config/proxy.json b/tests/schemas/config/proxy.json index 13d044b613..542d91cbba 100644 --- a/tests/schemas/config/proxy.json +++ b/tests/schemas/config/proxy.json @@ -4,16 +4,13 @@ "system": { "min_loglevel": 500 }, - "localnet": { - "families": { - "bacnet": { - "addr": "78ce19" - } + "gateway": { + "target": { + "family": "bacnet", + "addr": "78ce19" } }, "pointset": { - "sample_limit_sec": 2, - "sample_rate_sec": 500, "points": { "return_air_temperature_sensor": { "ref": "BV23.present_value" diff --git a/tests/schemas/event_system/categories.out b/tests/schemas/event_system/categories.out index 8986956659..182878a8e6 100644 --- a/tests/schemas/event_system/categories.out +++ b/tests/schemas/event_system/categories.out @@ -1,7 +1,7 @@ 6 schema violations found - /logentries/3/category: instance failed to match exactly one schema (matched 0 out of 35) - /logentries/4/category: instance failed to match exactly one schema (matched 0 out of 35) - /logentries/5/category: instance failed to match exactly one schema (matched 0 out of 35) - /logentries/6/category: instance failed to match exactly one schema (matched 0 out of 35) - /logentries/7/category: instance failed to match exactly one schema (matched 0 out of 35) - /logentries/9/category: instance failed to match exactly one schema (matched 0 out of 35) + /logentries/3/category: instance failed to match exactly one schema (matched 0 out of 37) + /logentries/4/category: instance failed to match exactly one schema (matched 0 out of 37) + /logentries/5/category: instance failed to match exactly one schema (matched 0 out of 37) + /logentries/6/category: instance failed to match exactly one schema (matched 0 out of 37) + /logentries/7/category: instance failed to match exactly one schema (matched 0 out of 37) + /logentries/9/category: instance failed to match exactly one schema (matched 0 out of 37) diff --git a/tests/schemas/event_system/errors.out b/tests/schemas/event_system/errors.out index 84e09d8895..96ea55c516 100644 --- a/tests/schemas/event_system/errors.out +++ b/tests/schemas/event_system/errors.out @@ -1,5 +1,5 @@ 4 schema violations found - /logentries/0/category: instance failed to match exactly one schema (matched 0 out of 35) + /logentries/0/category: instance failed to match exactly one schema (matched 0 out of 37) /logentries/0/level: numeric instance is lower than the required minimum (minimum: 100, found: 60) /logentries/0: object has missing required properties (["message","timestamp"]) /logentries/1: instance type (string) does not match any allowed primitive type (allowed: ["object"]) diff --git a/tests/schemas/metadata/direct.json b/tests/schemas/metadata/direct.json new file mode 100644 index 0000000000..a4aa5ef101 --- /dev/null +++ b/tests/schemas/metadata/direct.json @@ -0,0 +1,28 @@ +// Simple metadata entry for a directly connected device. Note there's no gateway block. +// The cloud field indicates that this device has a direct MQTT connection of the indicated +// auth_type. +{ + "version": "1.5.0", + "timestamp": "2018-08-26T21:39:29.364Z", + "description": "Generic direct device metadata file", + "system": { + }, + "cloud": { + "auth_type": "ES256" + }, + "pointset": { + "points": { + "return_air_temperature_sensor": { + "units": "Degrees-Celsius", + "baseline_value": 20, + "baseline_tolerance": 2 + }, + "room_setpoint": { + "writable": true, + "units": "Degrees-Celsius", + "baseline_value": 20, + "baseline_state": "applied" + } + } + } +} diff --git a/tests/schemas/metadata/direct.out b/tests/schemas/metadata/direct.out new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/schemas/metadata/proxy.json b/tests/schemas/metadata/proxy.json index ae59a1fa7e..871b0d308b 100644 --- a/tests/schemas/metadata/proxy.json +++ b/tests/schemas/metadata/proxy.json @@ -21,13 +21,6 @@ "suffix": "extention11-optional" } }, - "localnet": { - "families": { - "bacnet": { - "addr": "82eecd" - } - } - }, "pointset": { "points": { "return_air_temperature_sensor": { @@ -37,7 +30,9 @@ } }, "gateway": { - "family": "bacnet", + "target": { + "family": "bacnet" + }, "gateway_id": "LTGW-123" } } diff --git a/tests/schemas/state/direct.json b/tests/schemas/state/direct.json new file mode 100644 index 0000000000..9b79842a2e --- /dev/null +++ b/tests/schemas/state/direct.json @@ -0,0 +1,53 @@ +// Minimal example showing what a direct device state message might look like. In +// this case, there is no gateway block, and the localnet block only shows its +// address on the local ipv4 network (i.e. it doesn't have a fieldbus address). +{ + "version": "1.5.0", + "timestamp": "2018-08-26T21:39:29.364Z", + "system": { + "hardware": { + "make": "ACME", + "model": "Direct device", + "sku": "A9BB-F", + "rev": "2183147c" + }, + "software": { + "firmware": "3.2a", + "baseband": "1287ab787e98df01", + "application": "4.13.0.347 (4130-001) D", + "python": "3.8", + "monkey_rabbits": "These are all arbitrary key/value pairs" + }, + "params": { + "wpa_key_hash": "ab7879e2873c871e", + "iot_config_hash": "cc8d93e8f87a7ec9", + "user_login": "hacker012" + }, + "serial_no": "182732142", + "last_config": "2018-08-26T21:49:29.364Z", + "operation": { + "operational": true + }, + "status": { + "message": "Tickity Boo", + "category": "system.config.apply", + "timestamp": "2018-08-26T21:39:30.364Z", + "level": 600 + } + }, + "localnet": { + "families": { + "ipv4": { + "addr": "192.168.8.3" + } + } + }, + "pointset": { + "points": { + "return_air_temperature_sensor": { + }, + "nexus_sensor": { + } + } + } +} diff --git a/tests/schemas/state/direct.out b/tests/schemas/state/direct.out new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/schemas/state/gateway.json b/tests/schemas/state/gateway.json index 5a86a49378..f1d5d44c65 100644 --- a/tests/schemas/state/gateway.json +++ b/tests/schemas/state/gateway.json @@ -33,23 +33,11 @@ } }, "gateway": { - "devices": { - "991": { - "status": { - "message": "Error attaching device", - "category": "system.config.apply", - "timestamp": "2018-08-26T21:39:30.364Z", - "level": 600 - } - }, - "SMS-91": { - "status": { - "message": "Error attaching device", - "category": "system.config.apply", - "timestamp": "2018-08-26T21:39:30.364Z", - "level": 600 - } - } + "status": { + "message": "Error attaching devices: AHU-1", + "category": "gateway.setup.attach", + "timestamp": "2018-08-26T21:39:30.364Z", + "level": 600 } } } diff --git a/tests/schemas/state/gateway_test.json b/tests/schemas/state/gateway_test.json deleted file mode 100644 index 2238b39907..0000000000 --- a/tests/schemas/state/gateway_test.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "system": { - "operation": { - "operational": true, - "last_start": "2022-11-09T15:14:29.181Z" - }, - "software": { - "firmware": "4.12.0.156" - }, - "serial_no": "3637357", - "last_config": "2022-11-06T21:30:39.000Z", - "hardware": { - "model": "Jace", - "make": "Tridium" - } - }, - "pointset": { - "state_etag": "74f298bcf04fae2a37dbcae7b382fd92", - "points": { - "output_voltage_sensor": { - "units": "Volts" - }, - "power_sensor": { - "units": "Megawatts" - } - } - }, - "version": "1.5.0", - "gateway": { - "devices": { - "AHU-18003": {}, - "AHU-18002": {}, - "AHU-18001": {}, - "EM-13048": {}, - "EM-13047": {}, - "EM-13049": {} - } - }, - "timestamp": "2022-11-09T15:19:16.130Z" -} diff --git a/tests/schemas/state/proxy.json b/tests/schemas/state/proxy.json new file mode 100644 index 0000000000..66af1f3b7c --- /dev/null +++ b/tests/schemas/state/proxy.json @@ -0,0 +1,41 @@ +{ + "version": "1.5.0", + "timestamp": "2018-08-26T21:39:29.364Z", + "system": { + "hardware": { + "make": "ACME", + "model": "Bird Trap" + }, + "software": { + "firmware": "3.2a" + }, + "serial_no": "182732142", + "last_config": "2018-08-26T21:49:29.364Z", + "operation": { + "operational": true, + "last_start": "2018-08-25T21:49:29.364Z", + "mode": "active", + "restart_count": 121 + }, + "status": { + "message": "Tickity Boo", + "category": "system.config.apply", + "timestamp": "2018-08-26T21:39:30.364Z", + "level": 600 + } + }, + "gateway": { + "status": { + "message": "Connection complete", + "category": "gateway.proxy.connect", + "timestamp": "2018-08-26T21:39:30.364Z", + "level": 200 + } + }, + "pointset": { + "points": { + "return_air_temperature_sensor": { + } + } + } +} diff --git a/tests/schemas/state/proxy.out b/tests/schemas/state/proxy.out new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tests/sites/downgrade/devices/DWN-1/expected/generated_config.json b/tests/sites/downgrade/devices/DWN-1/expected/generated_config.json index 7ee5d50471..b66119ad41 100644 --- a/tests/sites/downgrade/devices/DWN-1/expected/generated_config.json +++ b/tests/sites/downgrade/devices/DWN-1/expected/generated_config.json @@ -5,13 +5,6 @@ "min_loglevel": 300, "metrics_rate_sec": 10 }, - "localnet": { - "subsystem": { - "virtual": { - "id": "0x65" - } - } - }, "pointset": { "points": { "filter_alarm_pressure_status": { diff --git a/tests/sites/missing/devices/AHU-1/expected/generated_config.json b/tests/sites/missing/devices/AHU-1/expected/generated_config.json index 9396b42570..c32cb5de97 100644 --- a/tests/sites/missing/devices/AHU-1/expected/generated_config.json +++ b/tests/sites/missing/devices/AHU-1/expected/generated_config.json @@ -6,16 +6,6 @@ "metrics_rate_sec": 10, "operation": { } }, - "localnet": { - "families": { - "ether": { - "addr": "00:50:b6:ed:5f:77" - }, - "ipv4": { - "addr": "192.168.2.1" - } - } - }, "pointset": { "points": { "filter_alarm_pressure_status": { @@ -23,7 +13,7 @@ "units": "No-units" }, "filter_differential_pressure_sensor": { - "ref": "AV12.present_value", + "ref": "FAXLE12.present_value", "units": "Degrees-Celsius" }, "filter_differential_pressure_setpoint": { diff --git a/tests/sites/missing/devices/AHU-1/expected/metadata_norm.json b/tests/sites/missing/devices/AHU-1/expected/metadata_norm.json index 6efb79bf98..3566274f59 100644 --- a/tests/sites/missing/devices/AHU-1/expected/metadata_norm.json +++ b/tests/sites/missing/devices/AHU-1/expected/metadata_norm.json @@ -1,7 +1,7 @@ { "timestamp": "2020-05-01T13:39:07Z", "version": "1.4.1", - "hash": "07087fc0", + "hash": "2d09c587", "cloud": { "auth_type": "RS256" }, @@ -64,7 +64,7 @@ "units": "Degrees-Celsius", "baseline_value": 10, "baseline_tolerance": 2.0, - "ref": "AV12.present_value" + "ref": "FAXLE12.present_value" }, "filter_differential_pressure_setpoint": { "units": "Bars", diff --git a/tests/sites/missing/devices/AHU-1/metadata.json b/tests/sites/missing/devices/AHU-1/metadata.json index 8fde44ea55..228b64362e 100644 --- a/tests/sites/missing/devices/AHU-1/metadata.json +++ b/tests/sites/missing/devices/AHU-1/metadata.json @@ -7,7 +7,7 @@ }, "filter_differential_pressure_sensor": { "units": "Degrees-Celsius", - "ref": "AV12.present_value", + "ref": "FAXLE12.present_value", "baseline_value": 10, "baseline_tolerance": 2 }, diff --git a/tests/sites/missing/devices/AHU-22/expected/errors.map b/tests/sites/missing/devices/AHU-22/expected/errors.map new file mode 100644 index 0000000000..f91abd5091 --- /dev/null +++ b/tests/sites/missing/devices/AHU-22/expected/errors.map @@ -0,0 +1,4 @@ +Exceptions for AHU-22 + While converting device config + While converting point filter_differential_pressure_sensor + point ref FAXLE12.present_value does not match expression ([A-Z]{2,4})([0-9]+)\.([a-z_]+) diff --git a/tests/sites/missing/devices/AHU-22/expected/exceptions.txt b/tests/sites/missing/devices/AHU-22/expected/exceptions.txt new file mode 100644 index 0000000000..4926bdbb62 --- /dev/null +++ b/tests/sites/missing/devices/AHU-22/expected/exceptions.txt @@ -0,0 +1,5 @@ +Initializing +java.lang.RuntimeException: While converting device config + REDACTED +Caused by: java.lang.RuntimeException: While converting point filter_differential_pressure_sensor +Caused by: java.lang.RuntimeException: point ref FAXLE12.present_value does not match expression ([A-Z]{2,4})([0-9]+)\.([a-z_]+) diff --git a/tests/sites/missing/devices/AHU-22/expected/generated_config.json b/tests/sites/missing/devices/AHU-22/expected/generated_config.json deleted file mode 100644 index 28a3845dcd..0000000000 --- a/tests/sites/missing/devices/AHU-22/expected/generated_config.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "timestamp": "2020-05-01T13:39:07Z", - "version": "1.4.1", - "system": { - "min_loglevel": 300, - "metrics_rate_sec": 10, - "operation": { } - }, - "localnet": { - "families": { - "virtual": { - "addr": "0x65" - } - } - }, - "pointset": { - "points": { - "filter_alarm_pressure_status": { - "ref": "BV11.present_value", - "units": "No-units" - }, - "filter_differential_pressure": { - "units": "Bars" - }, - "filter_differential_pressure_sensor": { - "ref": "AV12.present_value", - "units": "Degrees-Celsius" - } - } - } -} \ No newline at end of file diff --git a/tests/sites/missing/devices/AHU-22/expected/metadata_norm.json b/tests/sites/missing/devices/AHU-22/expected/metadata_norm.json index 3a52b9bd92..11127b87d4 100644 --- a/tests/sites/missing/devices/AHU-22/expected/metadata_norm.json +++ b/tests/sites/missing/devices/AHU-22/expected/metadata_norm.json @@ -1,7 +1,7 @@ { "timestamp": "2020-05-01T13:39:07Z", "version": "1.4.1", - "hash": "2a72b8e7", + "hash": "fc0a1987", "system": { "location": { "site": "ZZ-TRI-FECTA", @@ -22,11 +22,13 @@ }, "gateway": { "gateway_id": "GAT-123", - "proxy_ids": [ ] + "target": { + "family": "bacnet" + } }, "localnet": { "families": { - "virtual": { + "bacnet": { "addr": "0x65" } } @@ -35,14 +37,15 @@ "points": { "filter_alarm_pressure_status": { "units": "No-units", - "ref": "BV11.present_value" + "ref": "MCN8.present_value" }, "filter_differential_pressure": { - "units": "Bars" + "units": "Bars", + "ref": "AI2.differential" }, "filter_differential_pressure_sensor": { "units": "Degrees-Celsius", - "ref": "AV12.present_value" + "ref": "FAXLE12.present_value" } } } diff --git a/tests/sites/missing/devices/AHU-22/metadata.json b/tests/sites/missing/devices/AHU-22/metadata.json index e59b2acf12..692c3c3c8e 100644 --- a/tests/sites/missing/devices/AHU-22/metadata.json +++ b/tests/sites/missing/devices/AHU-22/metadata.json @@ -3,13 +3,14 @@ "points": { "filter_alarm_pressure_status": { "units": "No-units", - "ref": "BV11.present_value" + "ref": "MCN8.present_value" }, "filter_differential_pressure_sensor": { "units": "Degrees-Celsius", - "ref": "AV12.present_value" + "ref": "FAXLE12.present_value" }, "filter_differential_pressure": { + "ref": "AI2.differential", "units": "Bars" } } @@ -31,11 +32,14 @@ } }, "gateway": { - "gateway_id": "GAT-123" + "gateway_id": "GAT-123", + "target": { + "family": "bacnet" + } }, "localnet": { "families": { - "virtual": { + "bacnet": { "addr": "0x65" } } diff --git a/tests/sites/missing/devices/SNS-4/expected/generated_config.json b/tests/sites/missing/devices/SNS-4/expected/generated_config.json index 184b6d9f4f..6336f2a295 100644 --- a/tests/sites/missing/devices/SNS-4/expected/generated_config.json +++ b/tests/sites/missing/devices/SNS-4/expected/generated_config.json @@ -5,12 +5,20 @@ "min_loglevel": 300, "metrics_rate_sec": 10 }, + "gateway": { + "target": { + "addr": "whatEVERyouWANT!!!#!#!", + "family": "vendor" + } + }, "pointset": { "points": { "split_threshold": { + "ref": "vendor-ref can be anything", "units": "Imperial-gallons-per-minute" }, "triangulating_axis": { + "ref": "anything-goes!", "units": "Degrees-phase" } } diff --git a/tests/sites/missing/devices/SNS-4/expected/metadata_norm.json b/tests/sites/missing/devices/SNS-4/expected/metadata_norm.json index 5674a877e2..02a821706a 100644 --- a/tests/sites/missing/devices/SNS-4/expected/metadata_norm.json +++ b/tests/sites/missing/devices/SNS-4/expected/metadata_norm.json @@ -2,7 +2,7 @@ "timestamp": "2020-05-01T13:39:07Z", "version": "1.4.1", "upgraded_from": "1", - "hash": "302d594c", + "hash": "eb5169e8", "system": { "location": { "site": "ZZ-TRI-FECTA", @@ -19,15 +19,26 @@ }, "gateway": { "gateway_id": "GAT-123", - "proxy_ids": [ ] + "target": { + "family": "vendor" + } + }, + "localnet": { + "families": { + "vendor": { + "addr": "whatEVERyouWANT!!!#!#!" + } + } }, "pointset": { "points": { "split_threshold": { - "units": "Imperial-gallons-per-minute" + "units": "Imperial-gallons-per-minute", + "ref": "vendor-ref can be anything" }, "triangulating_axis": { - "units": "Degrees-phase" + "units": "Degrees-phase", + "ref": "anything-goes!" } } } diff --git a/tests/sites/missing/devices/SNS-4/metadata.json b/tests/sites/missing/devices/SNS-4/metadata.json index d056a6b1fe..5b6a416849 100644 --- a/tests/sites/missing/devices/SNS-4/metadata.json +++ b/tests/sites/missing/devices/SNS-4/metadata.json @@ -2,9 +2,11 @@ "pointset": { "points": { "triangulating_axis": { + "ref": "anything-goes!", "units": "Degrees-phase" }, "split_threshold": { + "ref": "vendor-ref can be anything", "units": "Imperial-gallons-per-minute" } } @@ -22,7 +24,17 @@ } }, "gateway": { - "gateway_id": "GAT-123" + "gateway_id": "GAT-123", + "target": { + "family": "vendor" + } + }, + "localnet": { + "families": { + "vendor": { + "addr": "whatEVERyouWANT!!!#!#!" + } + } }, "version": 1, "timestamp": "2020-05-01T13:39:07Z", diff --git a/tests/traces/simple/devices/GAT-123/001_state_update.json b/tests/traces/simple/devices/GAT-123/001_state_update.json index 2cab761c86..a1c6180c0b 100644 --- a/tests/traces/simple/devices/GAT-123/001_state_update.json +++ b/tests/traces/simple/devices/GAT-123/001_state_update.json @@ -16,14 +16,6 @@ }, "version": "1.5.0", "gateway": { - "devices": { - "AHU-18003": {}, - "AHU-18002": {}, - "AHU-18001": {}, - "EM-13048": {}, - "EM-13047": {}, - "EM-13049": {} - } }, "timestamp": "2022-07-19T05:04:40Z" } diff --git a/tests/traces/simple/devices/GAT-123/002_state_gateway.json b/tests/traces/simple/devices/GAT-123/002_state_gateway.json index b0981440b6..2e5c8e1155 100644 --- a/tests/traces/simple/devices/GAT-123/002_state_gateway.json +++ b/tests/traces/simple/devices/GAT-123/002_state_gateway.json @@ -1,12 +1,4 @@ { "timestamp": "2022-07-19T05:04:40Z", - "version": "1.5.0", - "devices": { - "AHU-18003": {}, - "AHU-18002": {}, - "AHU-18001": {}, - "EM-13048": {}, - "EM-13047": {}, - "EM-13049": {} - } + "version": "1.5.0" } diff --git a/tests/traces/simple/expected/devices/GAT-123/state.json b/tests/traces/simple/expected/devices/GAT-123/state.json index 7865b78323..ae288eab7a 100644 --- a/tests/traces/simple/expected/devices/GAT-123/state.json +++ b/tests/traces/simple/expected/devices/GAT-123/state.json @@ -1,14 +1,5 @@ { - "gateway" : { - "devices" : { - "AHU-18003" : { }, - "AHU-18002" : { }, - "AHU-18001" : { }, - "EM-13048" : { }, - "EM-13047" : { }, - "EM-13049" : { } - } - }, + "gateway" : { }, "system" : { "software" : { "firmware" : "4.12.0.156" diff --git a/tests/traces/simple/expected/devices/GAT-123/state_gateway.json b/tests/traces/simple/expected/devices/GAT-123/state_gateway.json index 56aaf4636c..7fa0e2737d 100644 --- a/tests/traces/simple/expected/devices/GAT-123/state_gateway.json +++ b/tests/traces/simple/expected/devices/GAT-123/state_gateway.json @@ -1,12 +1,4 @@ { - "devices" : { - "AHU-18003" : { }, - "AHU-18002" : { }, - "AHU-18001" : { }, - "EM-13048" : { }, - "EM-13047" : { }, - "EM-13049" : { } - }, "timestamp" : "1999-10-20T01:02:03Z", "version" : "1.5.0" } \ No newline at end of file diff --git a/udmis/bin/build b/udmis/bin/build index a15043c6f4..33ecf0f5e6 100755 --- a/udmis/bin/build +++ b/udmis/bin/build @@ -20,6 +20,7 @@ jarfile=build/libs/udmis-1.0-SNAPSHOT-all.jar newer_files=$([[ -f $jarfile ]] && find src/ $BASE/gencode/java -type f -newer $jarfile || echo missing) if [[ -z $check && -z $covg && -z $newer_files ]]; then + ls -l $jarfile echo $jarfile up-to-date, skipping build. exit 0 fi diff --git a/udmis/src/main/java/com/google/bos/udmi/service/access/ClearBladeIotAccessProvider.java b/udmis/src/main/java/com/google/bos/udmi/service/access/ClearBladeIotAccessProvider.java index 3113e17d68..24460f6152 100644 --- a/udmis/src/main/java/com/google/bos/udmi/service/access/ClearBladeIotAccessProvider.java +++ b/udmis/src/main/java/com/google/bos/udmi/service/access/ClearBladeIotAccessProvider.java @@ -114,9 +114,7 @@ public class ClearBladeIotAccessProvider extends IotAccessBase { private static final String UDMI_TARGET_TOPIC = "udmi_target"; // TODO: Make this not hardcoded. private static final String UDMI_STATE_TOPIC = "udmi_state"; // TODO: Make this not hardcoded. private static final String TOPIC_NAME_FORMAT = "projects/%s/topics/%s"; - - // TODO: Use a proper parameter call when it's (eventually) available in the Java API. - private static final String FIELD_MASK_HACK = "&fieldMask=id%2Cname"; + public static final String REGISTRIES_FIELD_MASK = "id,name"; private final String projectId; private final DeviceManagerInterface deviceManager; @@ -190,9 +188,9 @@ public Set getRegistriesForRegion(String region) { } try { - String parent = LocationName.of(projectId, region).getLocationFullName() + FIELD_MASK_HACK; + String parent = LocationName.of(projectId, region).getLocationFullName(); ListDeviceRegistriesRequest request = ListDeviceRegistriesRequest.Builder.newBuilder() - .setParent(parent).build(); + .setParent(parent).setFieldMask(REGISTRIES_FIELD_MASK).build(); ListDeviceRegistriesResponse response = deviceManager.listDeviceRegistries(request); requireNonNull(response, "get registries response is null"); List deviceRegistries = response.getDeviceRegistriesList(); diff --git a/udmis/src/main/java/com/google/bos/udmi/service/access/ProfilingProxy.java b/udmis/src/main/java/com/google/bos/udmi/service/access/ProfilingProxy.java index 470fdcbca3..afd840455a 100644 --- a/udmis/src/main/java/com/google/bos/udmi/service/access/ProfilingProxy.java +++ b/udmis/src/main/java/com/google/bos/udmi/service/access/ProfilingProxy.java @@ -3,7 +3,6 @@ import static com.google.common.base.Preconditions.checkArgument; import static com.google.udmi.util.GeneralUtils.ifNotNullThen; import static java.lang.String.format; -import static java.util.Optional.ofNullable; import com.google.bos.udmi.service.pod.ContainerProvider; import java.lang.reflect.InvocationHandler; diff --git a/udmis/udmis.iml b/udmis/udmis.iml index 3db3674dca..0c98a829f5 100644 --- a/udmis/udmis.iml +++ b/udmis/udmis.iml @@ -115,4 +115,4 @@ - \ No newline at end of file + diff --git a/validator/.idea/runConfigurations/SequenceRunner_Individual_Test.xml b/validator/.idea/runConfigurations/SequenceRunner_Individual_Test.xml index 9d0d015dcd..ae52f4b3fb 100644 --- a/validator/.idea/runConfigurations/SequenceRunner_Individual_Test.xml +++ b/validator/.idea/runConfigurations/SequenceRunner_Individual_Test.xml @@ -5,7 +5,7 @@