Merge branch 'master' into documentation

.gencode_hash.txt

@@ -7,13 +7,13 @@ c70a7137ee1a30b35c9e19ca9bb54916247f9eb2e50eab37591cd2ca10b5eddb  gencode/docs/c
 3bc5d62ea07f817fc5cf84859724176fc3bff019e6e81ecfab0c35c39486fa5f  gencode/docs/configuration_pod.html
 156ba6bf85ad5a097a7eb7c36331717641184504f3f43db0bdc90d1abee28572  gencode/docs/configuration_pubber.html
 f24d15e549f1b143b50d6011f2f7fd03286e1cd128a3e25591195b25f8efc472  gencode/docs/data_template.html
-cf81ddb4ed910159a9825cf4b6b68042421fdb9e1b49afa4ea4eced40d9cfc53  gencode/docs/events.html
-dee267d04e54ddaa1b20a22cc09576a783534f33f773ac99ed61f7e818709e6a  gencode/docs/events_discovery.html
+0c6efea81a5f6c2b4fa2b2b7c42c1bc8cbcaf56d90005d7944ab18a9ce31dfa6  gencode/docs/events.html
+402b4282634bbd48d940adf804eb26b507140cc0d8d6ee2a715f01ecece680b2  gencode/docs/events_discovery.html
 65858e981eaad27e41fd7f64aae7d6a82d4519e798145eb10898e59cead517c3  gencode/docs/events_mapping.html
 c3bae844432d172033bc416e623fecee7608efd01d916b7eaee96252932c552a  gencode/docs/events_pointset.html
 eed6ae125d94cf1986de96c210b0937b9c7b199724839f43fce3b357b057f8be  gencode/docs/events_system.html
 e3683cb4561b6dda5703cb659fd6a8f12242725de389709a12eb45f146cbb295  gencode/docs/events_validation.html
-ecafb56114c92e873329f184471ae39c002a12f1495bd75b24df22846ebb35a3  gencode/docs/metadata.html
+c2f9b2c3ec0bf68698d1c7f18b4fe53c38bac1da01a3b88365e82a0e209e0d6c  gencode/docs/metadata.html
 b110edfb73182782c7539adef417a970959432c92d4c9f4a0bf7e328c0e8427d  gencode/docs/monitoring.html
 86b62cb8e66ffb97d717fb8f1bf6a4f7d0a759cd15a8d040d5cc3451666f7c72  gencode/docs/persistent_device.html
 5d039d607af9ec75ee552dfe36b16c702687ea16f5663f41fc49b4533b86e00d  gencode/docs/properties.html
@@ -42,12 +42,12 @@ fcbed49f1af8b791d8c52bcbe18f65521a79d9ac3eb33ec3afd9b342ab2bfc56  gencode/java/u
 0c133f64013d5f2c4be203708def7ae11be631e90d5992222d6b4c97eef2573e  gencode/java/udmi/schema/CapabilityValidationState.java
 ec164962f2f00924ecb41ae07c2e01d6bf027951ccc605e0210988370b987973  gencode/java/udmi/schema/Category.java
 a010037f8ad570060c6a03e5aa13bc6d5261a61bf70eb71e0d00e124036decea  gencode/java/udmi/schema/CloudConfigModel.java
-325bf22814870bd4eb0c0b9d39418d9351e50c7d6452304f5d27c2e9be39269b  gencode/java/udmi/schema/CloudModel.java
+65328b8a88d357ad3205e3fa8eef6fe9148a86b955790022be3c7804cab145fb  gencode/java/udmi/schema/CloudModel.java
 06c8c3131f111e49e0d3e518603a3f66349d5dee1aee64a98659cb8703a8baa6  gencode/java/udmi/schema/CloudQuery.java
 992fb7d6bb8ce9eaf7fdfe69af575e442214bb62f82f846987eee473e952e980  gencode/java/udmi/schema/Common.java
 377eb78de936317676faaf7ec5a32ad17f2c2c54a3280df87f5fcc2d36c7014d  gencode/java/udmi/schema/Config.java
 cf9762392e02b5d04c6498963222cc0c00f7be6c3cd82bde3d063a5eceba2b65  gencode/java/udmi/schema/Connections.java
-bce2fb657360d2c4e07816edb643cbf91c372f547226a6bf9f9e90af0a5e25b5  gencode/java/udmi/schema/Coordinates.java
+a16d97089e851c59f3aa1e7818df1f71b317c30d46f92f80f63d318e100c88d0  gencode/java/udmi/schema/Coordinates.java
 8164e93ccc76d78548d456890e064df8427a09bbcd50686b37a10d3ff5ad429f  gencode/java/udmi/schema/Credential.java
 f8e26ca82202194ba41c4e3d6b3792022c3b38e24af6dfbb6cfea692fc593da8  gencode/java/udmi/schema/Depths.java
 10d67bf2080403fd196f63097e4ce2151edaafe3cf4ac77598ef83e06f94cb05  gencode/java/udmi/schema/DeviceMappingConfig.java
@@ -82,14 +82,14 @@ b539bc4304e1e604e9c6aa0242fb1344de9b18a8c88e12fb5c6f0a2530419501  gencode/java/u
 f02320b5b493d2475df0ef60cd18e86e4bf91244ebfec6f7ab45a792e0d44f15  gencode/java/udmi/schema/LocalnetConfig.java
 f33492dcb3570d5073113376e306156f0cbdf22a18d7fe12cb43b87b13819b50  gencode/java/udmi/schema/LocalnetModel.java
 5fa1983db1022beebf978f217a3eb1f0ddf86bc6d9573d4cd151f4c0adbc9d13  gencode/java/udmi/schema/LocalnetState.java
-e43c83b3d43d75cc71252343b29865e10317cf9610851ab022197a6b6bbd37c2  gencode/java/udmi/schema/Location.java
+7e39a99438de0260f2cad5938a0f03492bfb01b5ce52a84fd3768bff6e50b93f  gencode/java/udmi/schema/Location.java
 7f71faa644ac86f3dcaf832d39a0deecfe443fc6a3bff912c0a66c09243c4cd9  gencode/java/udmi/schema/MappingCommand.java
 0f6f85a4aaffb90735acc2565e8e4afa349d3ded5781cb1dce1ebbaa237feaa7  gencode/java/udmi/schema/MappingConfig.java
 2786ae25faad6bd0d9f20985e3576ffbe15c1b98c16033f7459a00df3573c44b  gencode/java/udmi/schema/MappingEventEntity.java
 9ba718b4f74dd3c2022ca57ca4d1527a2c69c8358f02356392bfb9a0a4e9619d  gencode/java/udmi/schema/MappingEvents.java
 84fc81b687d42c689b6b9794716e34bdfd06daf3ab3640a5cf47baf74c185cee  gencode/java/udmi/schema/MappingState.java
 73c28ed2d7b7f8ee9abdab9fcb9ac7b261fc2c4f03e37cb5122c535e31d38fdd  gencode/java/udmi/schema/MessageTemplateData.java
-1a8d432677de0d8803954eff42ae46d4cac7a9f1fe028332d84e66dfd3f7c60b  gencode/java/udmi/schema/Metadata.java
+46f885e5cc860d0f81e32fded88bcb6aefe5c514f1011df37a3be2237e46a748  gencode/java/udmi/schema/Metadata.java
 df64e4ddbf543ac70e7c2af9d3fbc20ffe3dff68c6718aa9ceadab7f64d3d171  gencode/java/udmi/schema/Metrics.java
 14722df90406cdcd29c7c946e5fcdf6a3e513eb879a7fbb493801fc0d9093504  gencode/java/udmi/schema/Monitoring.java
 31dab2c11cfcfdd346b1fe83e92a86abc652de05d85634a22a2c5c3f17c741aa  gencode/java/udmi/schema/MonitoringMetric.java
@@ -99,7 +99,7 @@ df64e4ddbf543ac70e7c2af9d3fbc20ffe3dff68c6718aa9ceadab7f64d3d171  gencode/java/u
 6346d4ff373e01c1f2df420ae5ef970e6af2f347db82ee3574eb3ccb8b7ba648  gencode/java/udmi/schema/PointDiscovery.java
 468c2c95e9dcbaf4ff706fad7f168c14321eaa35b7fb190848ea8bfd86d981d7  gencode/java/udmi/schema/PointPointsetConfig.java
 0d8c1078c554b36546e6267fb356250b44b585a28b9e383df7c1b2e731289634  gencode/java/udmi/schema/PointPointsetEvents.java
-65337109653a93d873dae40eb517857149bae1b20c7b479f41b35c0822d94ba0  gencode/java/udmi/schema/PointPointsetModel.java
+bb5688b14a19e24dc49d65550043c7fb395a64c6aa1229d15bf227551d08e389  gencode/java/udmi/schema/PointPointsetModel.java
 eb4b94f5f0324e74e10efd6b8b9652e1d612531a6d77c941d7967672f99e90af  gencode/java/udmi/schema/PointPointsetState.java
 1ba0fbfeedddc1a4e39efdff85cf5905c91fb7a4b5ff7d87ed9359ee61f060cc  gencode/java/udmi/schema/PointsetConfig.java
 b457b31c3e535c798287bb04129b4d7dbf34507bfe8a8ff9664bc04025650e19  gencode/java/udmi/schema/PointsetEvents.java
@@ -179,8 +179,8 @@ e0f14e21c3a56768981eaf561431d52933c629c16b865df2b99585d6d6082462  gencode/python
 a61368a737743f63365d1ec4c49ddc84c0e9a09452c6d73d4a4cd013e4bd015f  gencode/python/udmi/schema/events_system.py
 8f4ec5b4d717a0c497e914a2e15c72d96bfd3bbb119fa3b1e21ac96243c195bd  gencode/python/udmi/schema/events_validation.py
 3707a9a5a07b7cf80e4ce6b0ca81584de74a9d5fe361214a4d3b6f22dd30cad8  gencode/python/udmi/schema/events_validation_device.py
-0936dcf3fdd01ef7e7a4d9938dae46acc109e3894acdbe0f4fb700bdbae78405  gencode/python/udmi/schema/metadata.py
-1c1607cd38b9c57568d3226b833c88d6c156e7a6ff5d0ddf65818667dbfac067  gencode/python/udmi/schema/model_cloud.py
+63530c153724e76351bf0e85fcaa75d87b6ded24e6f131e4485e40becbab0081  gencode/python/udmi/schema/metadata.py
+547e0cbdb212fec4e2daac9d5c5bcbe86f6657a2e9ad967c4354107eef691514  gencode/python/udmi/schema/model_cloud.py
 2ec91522178789a3d5ec27ad8ed13a94b8619139359dc3dcad9601b9adc1582d  gencode/python/udmi/schema/model_cloud_config.py
 387e3f68dad9ddd6211a4e10d25c35026a4c0083b606819fdb4e338be9e135ca  gencode/python/udmi/schema/model_discovery.py
 cead43bbefcc2d957bf8316560edf849d74df9270f9473d87c2a3bdf61f08332  gencode/python/udmi/schema/model_discovery_family.py
@@ -189,8 +189,8 @@ bef91798566798ec70b2fe10ae52c909090de9095b92e2567da3cbdcec29cd2c  gencode/python
 ae6a7bc93b520cdc90cd158f876a58e98a3e000402ebb1ca632f01ee492d408a  gencode/python/udmi/schema/model_localnet.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
-94c4ab60f73d260638bb48a1397820900c069fb4e5316a6eda406cf192671d4c  gencode/python/udmi/schema/model_system.py
+1378f80c1b968d13d546fc7b2125df772f97573a703955e6eb55950dd621d9e7  gencode/python/udmi/schema/model_pointset_point.py
+514a179ccdcb418a3e1004df49d4a42bc4b971ff16bdaadf4ad1ede6e26094f9  gencode/python/udmi/schema/model_system.py
 15b349141ebae651c6c3c5c313b197d49c8b2b44e8ff1b0639848ad42e5c4e63  gencode/python/udmi/schema/model_system_hardware.py
 b48ae013d203eb31cc388a084c0cc6f93d4d5534336d4da2ecbccd84a085ea2b  gencode/python/udmi/schema/model_testing.py
 5c50847e136a033ea511209238bb570499b43fbee6189dae06603132dcb9f01f  gencode/python/udmi/schema/model_testing_target.py

.wordlist.txt

@@ -19,6 +19,7 @@ buildingsiot
 centric
 CLA
 CLI
+Clearblade
 CloudRun
 CoAP
 comms
@@ -106,6 +107,7 @@ postfix
 prem
 Prem
 prepend
+prepended
 programmatically
 provisioner
 proxied

bin/validator

@@ -12,7 +12,7 @@ echo $(date --utc +%Y%m%d-%H%M%S) $0 $@ >> $OUT_DIR/cmd_history.log
 site_path=$(realpath $1)
 shift
 
-if [[ -n $1 ]]; then
+if [[ -n ${1:-} ]]; then
     project_id=$1
     shift
 fi

docs/tools/registrar.md

@@ -36,14 +36,35 @@ The registrar tool can be run locally to just validate the metadata, or with an
 `project_id` to specify a target GCP project. Additional command-line arguments can
 be used to specific specific device(s) to register (rather than all).
 
-Usage: `bin/registrar site_path [project_id] [options] [devices...]`
+```
+Usage:
 
+bin/registrar site_path [project_id] [options] [devices...]
+
+bin/registrar config_file
+```
+
+* `config_file`: Path to a configuration file which contains configuration options;
 * `site_path`: The _directory_ containing the site model, or a model-with-project _file_ directly.
-* `project_id`: The (optional) GCP project ID that contains the target registry. This information
-  can also be included in the specified site model.
-* `options`: Various options to impact behavior. Typically `-u` for _update_ and `-d` for _delete_.
+* `project_id`: The project ID that contains the target registry. The project ID can be prepended with iot_provider:
+  * `//clearblade/PROJECT_ID` for a public Clearblade project.
+  * `//gbos/PROJECT_ID` for a Google operated Clearblade project.
+* `options`: Various options to impact behavior:
+  * `-u` Update.
+  * `-d` Delete all device in the site model from the registry (combine with `-x` to delete all devices from the registry)
+  * `-b` Block unknown devices.
+  * `-x` Delete unknown devices from the registry.
+  * `-n` Number of thread counts.
 * `devices`: Multiple device entries for limited registration. Can be just the device name
-(`AHU-12`), or path to device (`site/devices/AHU-12`) for use with file-name glob.
+  (`AHU-12`), or path to device (`site/devices/AHU-12`) for use with file-name glob.
+
+Examples:
+
+```
+bin/registrar sites/UK-LON-ABC //gbos/bos-platform-testing 
+bin/registrar sites/UK-LON-ABC/cloud_iot_config.json
+```
+
 
 Running the tool will create some output files for each device, and also a top-level
 `registration_summary.json` file with summary results. Detailed error reports (if any)