Update version strings in files to 1.4.2 (#720)

faucetsdn · Aug 24, 2023 · b994949 · b994949
1 parent 6df11b3
commit b994949
Show file tree

Hide file tree

Showing 183 changed files with 206 additions and 202 deletions.
diff --git a/docs/guides/development.md b/docs/guides/development.md
@@ -43,9 +43,9 @@ which are preceded by a `y` in `upversion.txt` will have their version upgraded.
 `bin/upgrade_version` does not update any generated files (e.g. for CI testing).
 
 The following files need to be update:
-* After `bin/test_trace simple`, contents of `sites/udmi_site_model/sites/out/devices`
-  into `validator/traces/simple.out/devices`
-* After `bin/test_validator`, `/tmp/validator.out` into `/etc/validator.out` (reset any changes to sites/udmi_site_model before running)
+* After `bin/test_trace simple`, contents of `sites/udmi_site_model/sites/out`
+  into `tests/traces/simple/expected` 
+* After `bin/test_validator`, `/tmp/validator.out` into `/etc/validator.out` (reset any changes to sites/udmi_site_model before running) 
 * After `bin/test_registrar && bin/test_sites`, the `out` directory for each device in `tests/downgrade.site/devices/` into the `expected` subdirectory
   (note these files are ignored by git, but must still be committed)
 

diff --git a/docs/specs/sequences/endpoint_reconfiguration.md b/docs/specs/sequences/endpoint_reconfiguration.md
@@ -78,7 +78,7 @@ Config message to initiate Reconfiguration (sequence #1 in diagrams above)
 <!--example:config/endpoint_reconfiguration.json-->
 ```json
 {
-  "version": "1.4.1",
+  "version": "1.4.2",
   "blobset": {
     "blobs": {
       "_iot_endpoint_config": {
@@ -108,7 +108,7 @@ a successful reconfiguration
 <!--example:state/endpoint_reconfiguration.json-->
 ```json
 {
-  "version": "1.4.1",
+  "version": "1.4.2",
   "timestamp": "2022-07-13T12:00:10.000Z",
   "system": {
     "hardware": {
@@ -138,7 +138,7 @@ This is an example of the state message sent to the original endpoint after a fa
 <!--example:state/endpoint_reconfiguration_failed.json-->
 ```json
 {
-  "version": "1.4.1",
+  "version": "1.4.2",
   "timestamp": "2022-07-13T12:00:11.000Z",
   "system": {
     "hardware": {

diff --git a/etc/category.json b/etc/category.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Category",
   "$comment": "Auto-generated category mappings from bin/gencode_categories.",
   "type": "string",

diff --git a/etc/upversion.txt b/etc/upversion.txt
@@ -106,3 +106,5 @@ y tests/schemas/metadata/nosys.json
 y tests/schemas/state/gateway_test.json
 y tests/schemas/state_validation/sequencer.json
 n tests/schemas/configuration_pubber/mosquitto.json
+y tests/schemas/metadata/network.json
+y tests/schemas/state/networks.json
diff --git a/etc/validator.out b/etc/validator.out
@@ -24,7 +24,7 @@ sites/udmi_site_model/out/devices/AHU-1/config.out
 ::::::::::::::
 {
   "timestamp" : "1999-10-20T01:02:03Z",
-  "version" : "1.4.1",
+  "version" : "1.4.2",
   "sub_folder" : "update",
   "sub_type" : "config",
   "status" : {
@@ -40,7 +40,7 @@ sites/udmi_site_model/out/devices/AHU-1/event_pointset.out
 ::::::::::::::
 {
   "timestamp" : "1999-10-20T01:02:03Z",
-  "version" : "1.4.1",
+  "version" : "1.4.2",
   "sub_folder" : "pointset",
   "sub_type" : "event",
   "status" : {
@@ -67,7 +67,7 @@ sites/udmi_site_model/out/devices/AHU-1/event_system.out
 ::::::::::::::
 {
   "timestamp" : "1999-10-20T01:02:03Z",
-  "version" : "1.4.1",
+  "version" : "1.4.2",
   "sub_folder" : "system",
   "sub_type" : "event",
   "status" : {
@@ -83,7 +83,7 @@ sites/udmi_site_model/out/devices/AHU-1/state.out
 ::::::::::::::
 {
   "timestamp" : "1999-10-20T01:02:03Z",
-  "version" : "1.4.1",
+  "version" : "1.4.2",
   "sub_folder" : "update",
   "sub_type" : "state",
   "status" : {
@@ -99,7 +99,7 @@ sites/udmi_site_model/out/devices/AHU-1/state_localnet.out
 ::::::::::::::
 {
   "timestamp" : "1999-10-20T01:02:03Z",
-  "version" : "1.4.1",
+  "version" : "1.4.2",
   "sub_folder" : "localnet",
   "sub_type" : "state",
   "status" : {
@@ -115,7 +115,7 @@ sites/udmi_site_model/out/devices/AHU-1/state_pointset.out
 ::::::::::::::
 {
   "timestamp" : "1999-10-20T01:02:03Z",
-  "version" : "1.4.1",
+  "version" : "1.4.2",
   "sub_folder" : "pointset",
   "sub_type" : "state",
   "status" : {
@@ -135,7 +135,7 @@ sites/udmi_site_model/out/devices/AHU-1/state_system.out
 ::::::::::::::
 {
   "timestamp" : "1999-10-20T01:02:03Z",
-  "version" : "1.4.1",
+  "version" : "1.4.2",
   "sub_folder" : "system",
   "sub_type" : "state",
   "status" : {
@@ -151,7 +151,7 @@ sites/udmi_site_model/out/devices/AHU-22/config.out
 ::::::::::::::
 {
   "timestamp" : "1999-10-20T01:02:03Z",
-  "version" : "1.4.1",
+  "version" : "1.4.2",
   "sub_folder" : "update",
   "sub_type" : "config",
   "status" : {
@@ -167,7 +167,7 @@ sites/udmi_site_model/out/devices/AHU-22/event_blobset.out
 ::::::::::::::
 {
   "timestamp" : "1999-10-20T01:02:03Z",
-  "version" : "1.4.1",
+  "version" : "1.4.2",
   "sub_folder" : "blobset",
   "sub_type" : "event",
   "status" : {
@@ -190,7 +190,7 @@ sites/udmi_site_model/out/devices/AHU-22/event_discovery.out
 ::::::::::::::
 {
   "timestamp" : "1999-10-20T01:02:03Z",
-  "version" : "1.4.1",
+  "version" : "1.4.2",
   "sub_folder" : "discovery",
   "sub_type" : "event",
   "status" : {
@@ -213,7 +213,7 @@ sites/udmi_site_model/out/devices/AHU-22/event_error.out
 ::::::::::::::
 {
   "timestamp" : "1999-10-20T01:02:03Z",
-  "version" : "1.4.1",
+  "version" : "1.4.2",
   "sub_folder" : "error",
   "sub_type" : "event",
   "status" : {
@@ -236,7 +236,7 @@ sites/udmi_site_model/out/devices/AHU-22/event_invalid.out
 ::::::::::::::
 {
   "timestamp" : "1999-10-20T01:02:03Z",
-  "version" : "1.4.1",
+  "version" : "1.4.2",
   "sub_folder" : "invalid",
   "sub_type" : "event",
   "status" : {
@@ -265,7 +265,7 @@ sites/udmi_site_model/out/devices/AHU-22/event_pointset.out
 ::::::::::::::
 {
   "timestamp" : "1999-10-20T01:02:03Z",
-  "version" : "1.4.1",
+  "version" : "1.4.2",
   "sub_folder" : "pointset",
   "sub_type" : "event",
   "status" : {
@@ -285,7 +285,7 @@ sites/udmi_site_model/out/devices/AHU-22/event_system.out
 ::::::::::::::
 {
   "timestamp" : "1999-10-20T01:02:03Z",
-  "version" : "1.4.1",
+  "version" : "1.4.2",
   "sub_folder" : "system",
   "sub_type" : "event",
   "status" : {
@@ -301,7 +301,7 @@ sites/udmi_site_model/out/devices/AHU-22/state.out
 ::::::::::::::
 {
   "timestamp" : "1999-10-20T01:02:03Z",
-  "version" : "1.4.1",
+  "version" : "1.4.2",
   "sub_folder" : "update",
   "sub_type" : "state",
   "status" : {
@@ -317,7 +317,7 @@ sites/udmi_site_model/out/devices/AHU-22/state_error.out
 ::::::::::::::
 {
   "timestamp" : "1999-10-20T01:02:03Z",
-  "version" : "1.4.1",
+  "version" : "1.4.2",
   "sub_folder" : "error",
   "sub_type" : "state",
   "status" : {
@@ -340,7 +340,7 @@ sites/udmi_site_model/out/devices/AHU-22/state_localnet.out
 ::::::::::::::
 {
   "timestamp" : "1999-10-20T01:02:03Z",
-  "version" : "1.4.1",
+  "version" : "1.4.2",
   "sub_folder" : "localnet",
   "sub_type" : "state",
   "status" : {
@@ -356,7 +356,7 @@ sites/udmi_site_model/out/devices/AHU-22/state_pointset.out
 ::::::::::::::
 {
   "timestamp" : "1999-10-20T01:02:03Z",
-  "version" : "1.4.1",
+  "version" : "1.4.2",
   "sub_folder" : "pointset",
   "sub_type" : "state",
   "status" : {
@@ -376,7 +376,7 @@ sites/udmi_site_model/out/devices/AHU-22/state_system.out
 ::::::::::::::
 {
   "timestamp" : "1999-10-20T01:02:03Z",
-  "version" : "1.4.1",
+  "version" : "1.4.2",
   "sub_folder" : "system",
   "sub_type" : "state",
   "status" : {

diff --git a/pubber/src/main/java/daq/pubber/Pubber.java b/pubber/src/main/java/daq/pubber/Pubber.java
@@ -131,7 +131,7 @@ public class Pubber {
   public static final String DATA_URL_JSON_BASE64 = "data:application/json;base64,";
   public static final String POINTSET_BUCKET = "pointset_state";
   public static final String PUBLISHER_BUCKET = "publisher_bucket";
-  static final String UDMI_VERSION = "1.4.1";
+  static final String UDMI_VERSION = "1.4.2";
   private static final Logger LOG = LoggerFactory.getLogger(Pubber.class);
   private static final String HOSTNAME = System.getenv("HOSTNAME");
   private static final int MIN_REPORT_MS = 200;

diff --git a/schema/access_iot.json b/schema/access_iot.json
@@ -1,4 +1,5 @@
 {
+  "$udmi_version": "1.4.2",
   "type": "object",
   "title": "Iot Access",
   "additionalProperties": false,

diff --git a/schema/ancillary_properties.json b/schema/ancillary_properties.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Ancillary Properties",
   "description": "Arbitrary blob of json associated with this point",
   "existingJavaType": "java.util.HashMap<String, Object>",

diff --git a/schema/building_translation.json b/schema/building_translation.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Building Translation",
   "description": "[Discovery result](../docs/specs/discovery.md) with implicit enumeration",
   "type": "object",

diff --git a/schema/category.json b/schema/category.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Category",
   "$comment": "Auto-generated category mappings from bin/gencode_categories.",
   "type": "string",

diff --git a/schema/command_discovery.json b/schema/command_discovery.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Discovery Command",
   "description": "[Discovery command](../docs/specs/discovery.md) for provisioning",
   "type": "object",

diff --git a/schema/command_mapping.json b/schema/command_mapping.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Mapping Command",
   "description": "[Mapping command](../docs/specs/mapping.md) for provisioning",
   "type": "object",

diff --git a/schema/common.json b/schema/common.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Common",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "definitions": {

diff --git a/schema/config.json b/schema/config.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Config",
   "description": "The config block controls a device's intended behavior. [Config Documentation](../docs/messages/config.md)",
   "$section": "Messages",

diff --git a/schema/config_blobset.json b/schema/config_blobset.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Blobset Config",
   "type": "object",
   "$schema": "http://json-schema.org/draft-07/schema#",

diff --git a/schema/config_blobset_blob.json b/schema/config_blobset_blob.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Blob Blobset Config",
   "type": "object",
   "$schema": "http://json-schema.org/draft-07/schema#",

diff --git a/schema/config_discovery.json b/schema/config_discovery.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Discovery Config",
   "description": "Configuration for [discovery](../docs/specs/discovery.md)",
   "type": "object",

diff --git a/schema/config_discovery_family.json b/schema/config_discovery_family.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Family Discovery Config",
   "description": "Configuration for [discovery](../docs/specs/discovery.md)",
   "type": "object",

diff --git a/schema/config_gateway.json b/schema/config_gateway.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Gateway Config",
   "description": "Configuration for gateways. Only required for devices which are acting as [gateways](../docs/specs/gateway.md)",
   "type": "object",

diff --git a/schema/config_localnet.json b/schema/config_localnet.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Localnet Config",
   "description": "Used to describe device local network parameters",
   "type": "object",

diff --git a/schema/config_mapping.json b/schema/config_mapping.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Mapping Config",
   "description": "Configuration for [mapping](../docs/specs/mapping.md)",
   "type": "object",

diff --git a/schema/config_mapping_device.json b/schema/config_mapping_device.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Device Mapping Config",
   "description": "Configuration for [mapping](../docs/specs/mapping.md)",
   "type": "object",

diff --git a/schema/config_pointset.json b/schema/config_pointset.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Pointset Config",
   "description": "[Pointset Config Documentation](../docs/messages/pointset.md#config)",
   "type": "object",

diff --git a/schema/config_pointset_point.json b/schema/config_pointset_point.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Point Pointset Config",
   "type": "object",
   "$schema": "http://json-schema.org/draft-07/schema#",

diff --git a/schema/config_system.json b/schema/config_system.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "System Config",
   "description": "[System Config Documentation](../docs/messages/system.md#config)",
   "type": "object",

diff --git a/schema/config_system_testing.json b/schema/config_system_testing.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Testing System Config",
   "description": "Configuration parameters for device-under-test",
   "type": "object",

diff --git a/schema/config_udmi.json b/schema/config_udmi.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Udmi Config",
   "description": "Config for a UDMI reflector client",
   "type": "object",

diff --git a/schema/configuration_endpoint.json b/schema/configuration_endpoint.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Endpoint Configuration",
   "description": "Parameters to define a message endpoint",
   "$section": "Blobs",

diff --git a/schema/configuration_execution.json b/schema/configuration_execution.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Execution Configuration",
   "description": "Parameters for configuring the execution run of a UDMI tool",
   "$section": "Tool Configuration",

diff --git a/schema/configuration_pod.json b/schema/configuration_pod.json
@@ -1,5 +1,5 @@
 {
-  "$udmi_version": "1.4.1",
+  "$udmi_version": "1.4.2",
   "title": "Pod Configuration",
   "description": "Parameters for configuring the execution run of a UDMIS pod",
   "$section": "Tool Configuration",