Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Creating formal schema definitions for misc config files #414

Merged
merged 74 commits into from
Aug 10, 2022
Merged
Show file tree
Hide file tree
Changes from 70 commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
fe1150a
Examples for discovery
grafnu Apr 7, 2022
452ac6d
Reverting some changes
grafnu Apr 7, 2022
453373a
Cleanup
grafnu Apr 7, 2022
8b06ded
Reconciling examples
grafnu Apr 8, 2022
70cf462
Merge branch 'master' into examples
grafnu Apr 8, 2022
ad88b07
Docs tweaks
grafnu Apr 8, 2022
a822c5f
Updating docs
grafnu Apr 8, 2022
3beb3ed
REmoving provisioning example
grafnu Apr 8, 2022
0e3c0e0
Adding mapping_format
grafnu Apr 8, 2022
9dce1fa
Adding guid
grafnu Apr 9, 2022
35aa164
Updating examples
grafnu Apr 11, 2022
7d58c8e
Adding staged eqip.txt
grafnu Apr 11, 2022
400d7fd
Updating staged_equp_repsonse
grafnu Apr 12, 2022
b22ff27
Clean up validator
grafnu Apr 13, 2022
deaad1f
Merge branch 'master' into mapping
grafnu Apr 13, 2022
fa9797a
Merge branch 'master' into iotschema
grafnu Apr 22, 2022
41fc033
Merge branch 'master' into mapping
grafnu Apr 22, 2022
80b4230
Merge branch 'master' into iotschema
grafnu Jun 3, 2022
88a5e1f
Merge branch 'master' into mapping
grafnu Jun 3, 2022
e6d8c18
Merge branch 'master' into mapping
grafnu Jun 9, 2022
754a17b
Merge branch 'master' into mapping
grafnu Jun 17, 2022
ba037a8
Adjusting schema locations
grafnu Jun 17, 2022
a3ed46b
Update and rename
grafnu Jun 17, 2022
2940a2e
Docs tweaks
grafnu Jun 17, 2022
b556798
Merge branch 'master' into iotschema
grafnu Jun 17, 2022
e2f4ad3
Merge branch 'master' into iotschema
grafnu Jun 21, 2022
302e517
Merge branch 'master' into mapping
grafnu Jun 24, 2022
4661000
Merge branch 'master' into iotschema
grafnu Jun 24, 2022
28664a4
Merge branch 'master' into iotschema
grafnu Jun 25, 2022
92cd22e
Merge branch 'master' into mapping
grafnu Jun 25, 2022
e036d00
Merge remote-tracking branch 'faucet/master' into mapping
grafnu Jun 27, 2022
10241d2
Merge branch 'master' into mapping
grafnu Jul 16, 2022
9022b94
Merge branch 'master' into iotschema
grafnu Jul 16, 2022
5a9bdb6
Merge branch 'master' into mapping
grafnu Aug 2, 2022
b8887b5
Merge branch 'master' into iotschema
grafnu Aug 2, 2022
f9720b7
Merge branch 'master' into mapping
grafnu Aug 3, 2022
482c184
Merge branch 'master' into iotschema
grafnu Aug 3, 2022
a39e1e5
Merge branch 'master' into mapping
grafnu Aug 7, 2022
7822375
Force reset of udmif
grafnu Aug 7, 2022
bc7c784
Merge branch 'master' into iotschema
grafnu Aug 7, 2022
512f91d
Merge branch 'master' into mapping
grafnu Aug 8, 2022
744e500
Merge branch 'master' into iotschema
grafnu Aug 8, 2022
ccc39fa
Merge branch 'master' into iotschema
grafnu Aug 8, 2022
cf5b682
Cleanup of UDMIF
grafnu Aug 8, 2022
1f98143
Merge branch 'master' into mapping
grafnu Aug 8, 2022
eb32056
Updating with simpler model
grafnu Aug 9, 2022
5168ada
Update text
grafnu Aug 9, 2022
f7e8994
Refactor SiteModel errors
grafnu Aug 9, 2022
3b7774b
Extract common utils
grafnu Aug 9, 2022
256f38c
Fix javadoc
grafnu Aug 9, 2022
874e87f
Cleanup projectId handling
grafnu Aug 9, 2022
2760033
Cleanup extras
grafnu Aug 9, 2022
b0412d1
Docs revert
grafnu Aug 9, 2022
10c08e4
Fixing projectId handling
grafnu Aug 9, 2022
7c7f78c
Adding endpoint schema
grafnu Aug 9, 2022
f757f63
Moving endpoint configuration
grafnu Aug 9, 2022
48c5ba5
Clean up package and imports
grafnu Aug 9, 2022
59aa2bc
Merge branch 'sitemodel' into iotschema
grafnu Aug 9, 2022
f39bdcb
Move endpoint configuration
grafnu Aug 9, 2022
2e5a215
Using gencode
grafnu Aug 9, 2022
5e4fc4b
Basic options
grafnu Aug 9, 2022
d5d1c2f
Adding pubber configuration
grafnu Aug 9, 2022
88a852b
Options refactoring
grafnu Aug 9, 2022
81f5e25
Cleaning up options
grafnu Aug 9, 2022
75f3d3c
Fixing issues
grafnu Aug 9, 2022
c9e8a91
Fixing typos
grafnu Aug 9, 2022
8c8c247
Minor cleanups
grafnu Aug 9, 2022
0d81a96
Optimize imports
grafnu Aug 9, 2022
88c4ed7
Syntax error
grafnu Aug 9, 2022
c9b3d69
Sanitize configuration to provide some extra defaults
grafnu Aug 9, 2022
d424b64
Fixing some links
grafnu Aug 9, 2022
afe232f
Updating tweaks
grafnu Aug 9, 2022
e972b78
hello
grafnu Aug 9, 2022
f4efd32
Fix docs links
grafnu Aug 9, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions .gencode_hash.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ d326a550d75ab7f558f165f1a5e8c24eee2b0b52290a7472f529bb1e15d79fb2 gencode/java/u
2c03651cb2ecda072b1418222eebb5560185669f8ffdd03021ad5ad8ff7ba3b0 gencode/java/udmi/schema/BlobBlobsetState.java
3fccb6bc6714fdc3dd912c8b1155e7ce19b0ac8a7ec48a01be9eb27bdd034a75 gencode/java/udmi/schema/BlobsetConfig.java
fcbed49f1af8b791d8c52bcbe18f65521a79d9ac3eb33ec3afd9b342ab2bfc56 gencode/java/udmi/schema/BlobsetState.java
d6875f63ce67d1b945a0b75a4a660bd083cc52492371a7350c4109f6bf54968b gencode/java/udmi/schema/CloudIotConfig.java
a2eeff86f4302272736d84602e2ca36a64d27c8ef6761cc05ffb8ad17b030d4d gencode/java/udmi/schema/CloudModel.java
ff79de9390aa25bb45fb3e2ebb682c865ccab764f56d9644377d9d28c0ab10e4 gencode/java/udmi/schema/Config.java
d4a82e132b2d223c4a82384d22455283c0b64aba3100fc210e72f9700b9df2d0 gencode/java/udmi/schema/DeviceValidationEvent.java
Expand All @@ -24,6 +25,7 @@ d8a80ab3180d33bfa17564c969018e1d4350a47dbc70c4ae8a5abbfb25cfedc9 gencode/java/u
4793b2370b1f3b8fd89941586b779dffdde83d321a2621907f67d4d297d19b17 gencode/java/udmi/schema/DiscoveryEvent.java
04112dd47b0f761131c276c67d3cd8b789d25e6716b5732be9fef14fc6831f1d gencode/java/udmi/schema/DiscoveryModel.java
9962b0eb7d5adf52af6160e9f3131f8eeb52ae9e518954dbb6aead1bcad0245e gencode/java/udmi/schema/DiscoveryState.java
4e64cf10484266a297fb418b165dd84a9f4b8c2e53520b33915cc96365151fc2 gencode/java/udmi/schema/EndpointConfiguration.java
090bbaf1508aa6ca8380af936af990673f300eb5a940c9e8ab94deb64efa2b7b gencode/java/udmi/schema/Entry.java
cd362f94454eba8fd5ce3fce5d5e2b5f046d0dd9c35b01de69ef4d2e38413cc5 gencode/java/udmi/schema/Envelope.java
e9f5c77be81486b6b8c6d88f70f2d50583d8c3fafa2ac09ead80f44b8d5e751e gencode/java/udmi/schema/Event.java
Expand Down Expand Up @@ -54,6 +56,8 @@ fc3a9415c04d8a06954dbdbfdff5d68ab113cce3948532c19df555778ffb04fa gencode/java/u
61afd6c9c0364b8982c90df7664147829bad8858408b2141299ee8bbc35f1612 gencode/java/udmi/schema/PointsetSummary.java
ca2e7566106818ca7e5190c8041eb86f0c9b3251b0bda8c3ea7ce11a0c891a0a gencode/java/udmi/schema/Position.java
3df66bb1a37a9e0b2b6cf392f8c64d404a73c83e5e13c02bb4844f09b9a04b70 gencode/java/udmi/schema/Properties.java
9552b91c36ec87bd2a765f74d6f7bd1bb583011858aca5d2376980f4144106ed gencode/java/udmi/schema/PubberConfiguration.java
e767077a73430254f7365dbb3f242a1bb5a953a4016c116663d31ae3fbf00509 gencode/java/udmi/schema/PubberOptions.java
7bc53cb9a61df8f804a75aa4860403d19281f7c665cbddd5364a2aa746a1f651 gencode/java/udmi/schema/ReflectorConfig.java
abe99dd74122c186403baa6982300a9d5968f8bbb7a67b1689104111b98f32fb gencode/java/udmi/schema/ReflectorState.java
5a44075bc03f2b9b2cc090f007fd1692832871f0981dcb02579d8dda96a96206 gencode/java/udmi/schema/SetupReflectorConfig.java
Expand All @@ -69,10 +73,11 @@ e0f70f8e2c4793ebd05a38dc249d329eaa5b0171097ecc5fad4630fa0df3536d gencode/java/u
d3968b92497e83a63f18cc0e74484a9807f1bb92db0c92d556ec2caaa143d645 gencode/java/udmi/schema/TestingModel.java
347da3d586ff6e5dcf3ce8ec0c800ec0efd5fed4e0c80eef35de65ad92ae48bf gencode/java/udmi/schema/ValidationEvent.java
e007ddd1ceeae3603c85110c33e1bb4a418ff9c7a791ca0df25b7ea3caeafd36 gencode/java/udmi/schema/ValidationSummary.java
f5f5a460513570c0af0aba1afb8052007987a9f05755586a8ddef5eaa7ef6025 gencode/python/udmi/schema/__init__.py
32e82ac7f7e20c77ab5d40d3de0a06c3934267d449b243bb9cad48493974c306 gencode/python/udmi/schema/__init__.py
4b25dd95f863059b761269f93adcae7049507924a1c6e74d6856849203c179db gencode/python/udmi/schema/ancillary_properties.py
a61b1c5732f01b7efda41a773d5786fad755f371193ce4478b458387ca2a8fe8 gencode/python/udmi/schema/cloud_iot_config.py
6578d68f65b87b781086e72566de910db4bef365599fe3188862d4d8a81e84fb gencode/python/udmi/schema/command_discovery.py
1e13e34fea2cda5c28b6c59e0ef107c79b4ef532b564dd5c5601e211cbf5d21e gencode/python/udmi/schema/common.py
2082a9f3ff4d37bb13a647932fcacb99499f71569cd9dc12d5e63dead34fee63 gencode/python/udmi/schema/common.py
b975892df78076dabc797b4c0be87f20b33eacda11f9d1ac1c09be33d4937a87 gencode/python/udmi/schema/config.py
79eb0299b3751d93c01a5de65eacc717283e99caf0996f3db48a15247f69c8eb gencode/python/udmi/schema/config_blobset.py
95125e3459cec6e12f4e0d3912f9c519b1aec41cf1df9720b54481e69632d7f4 gencode/python/udmi/schema/config_blobset_blob.py
Expand Down Expand Up @@ -107,6 +112,8 @@ abe431dc7702c80992b2c9736ab924d80d1033493036976f0cefa8c2108227be gencode/python
aafe6e70c281152db958adf77a024e3e9fab8293927106297c5ec48c11f54e27 gencode/python/udmi/schema/model_testing.py
5c50847e136a033ea511209238bb570499b43fbee6189dae06603132dcb9f01f gencode/python/udmi/schema/model_testing_target.py
a58f8c98e837a5b56126ca0f410e02f1e9cfcd80a8cb429e0ef522defab1f690 gencode/python/udmi/schema/properties.py
1b2dba2ff079366560c7106aecc5289db19312816fa34a86459e429c94972761 gencode/python/udmi/schema/pubber_configuration.py
68b34e6aed281e62e2b62d0aaea57a57f1d3a657ed39cbd849ddd69659d9d454 gencode/python/udmi/schema/pubber_options.py
1f521678016ad267ad1c817896c7900ba30a85fc694669577b71148193db32c1 gencode/python/udmi/schema/reflect_config.py
1a4eef286957d77418777eb7f4cd1ee13aa24c2d916ec71a7ff4e56de76e303e gencode/python/udmi/schema/reflect_state.py
32bc70a30e37e89cfae14b44add18d546a6f9e00a3ec3519ede9c7486114d39c gencode/python/udmi/schema/state.py
Expand Down
13 changes: 0 additions & 13 deletions common/src/main/java/com/google/udmi/util/CloudIotConfig.java

This file was deleted.

This file was deleted.

30 changes: 30 additions & 0 deletions common/src/main/java/com/google/udmi/util/GeneralUtils.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package com.google.udmi.util;

import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;

public class GeneralUtils {
/**
* Returns a string of enabled options and values.
*/
public static String optionsString(Object target) {
List<String> options = new ArrayList<>();
Class<?> clazz = target.getClass();
Field[] fields = clazz.getDeclaredFields();

for (Field field : fields) {
try {
if (field.get(target) != null && Boolean.TRUE.equals(field.get(target))) {
options.add(field.getName());
} else if (field.get(target) != null) {
options.add(field.getName() + "=" + field.get(target));
}
} catch (IllegalAccessException e) {
throw new RuntimeException(e);
}
}
return String.join(" ", options);
}

}
2 changes: 2 additions & 0 deletions common/src/main/java/com/google/udmi/util/SiteModel.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
import java.util.Set;
import java.util.function.BiConsumer;
import java.util.stream.Collectors;
import udmi.schema.CloudIotConfig;
import udmi.schema.CloudModel.Auth_type;
import udmi.schema.EndpointConfiguration;
import udmi.schema.Envelope;
import udmi.schema.GatewayModel;
import udmi.schema.Metadata;
Expand Down
18 changes: 2 additions & 16 deletions docs/specs/site_model.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ of the integration tests).

At a high-level, the various constructs relevant to UDMI are (described in more detail below):
* `cloud_iot_config.json`
* `devices`
* `devices/`

## Registrar Tool

Expand All @@ -27,21 +27,7 @@ The primary use of the site_model will be through the [registrar](../tools/regis

## `cloud_iot_config.json`

```json
{
"cloud_region": "us-central1",
"reflect_region": "europe-west1",
"site_name": "ZZ-TRI-FECTA",
"registry_id": "registrar_test"
}
```

* `cloud_region`: The cloud region associated with this site. This is used by various tools as
required for API calls.
* `site_name`: The semantic name of the site, which is used for various bits of validation and
reporting.
* `registry_id`: The Cloud IoT Core _registry_ id for this site.
* `reflect_region`: The cloud region used by the UDMS-REFLECT registry for UDMI tool access.
[cloud_iot_config.json](schema) and [example](hdoo)

## `devices/`

Expand Down
61 changes: 61 additions & 0 deletions gencode/java/udmi/schema/CloudIotConfig.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 61 additions & 0 deletions gencode/java/udmi/schema/EndpointConfiguration.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

101 changes: 101 additions & 0 deletions gencode/java/udmi/schema/PubberConfiguration.java

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading