UDMIS Updates for sequencer (#685)

faucetsdn · Jul 18, 2023 · 1e0e302 · 1e0e302
1 parent b5f1464
commit 1e0e302
Show file tree

Hide file tree

Showing 45 changed files with 990 additions and 465 deletions.
diff --git a/.gencode_hash.txt b/.gencode_hash.txt
@@ -1,13 +1,13 @@
 b35646a2f3d7c30fd34e3ea6ab6a1070b39c469fd1de49cab1093ff32faaf06d  gencode/docs/command_discovery.html
 d3758eba2529d4a5f1dfd5ed3355a536936b02285ddde7cc75b1f41f4916203a  gencode/docs/command_mapping.html
-e693079943921c88e24140521637c58bc9aadfb9aee96dfba414bbaa7be958d0  gencode/docs/config.html
+1fccea9bddb81b5d44cc80196678e01e0a76d879c7a48e476a211788cba3bdf3  gencode/docs/config.html
 d40bfc9f4a30c56986435dc08f1e5f42401e5ac043359a1e359011c913cad673  gencode/docs/config_mapping.html
 7933c756d45dfb24f9f6e34661b98126654fd58a61e81b7434f7cd0d578226b8  gencode/docs/configuration_endpoint.html
 98d78bf575e5c4cb4dd42b0946e9e687f926df37ffa9af0ab48a7cf289fb9eb5  gencode/docs/configuration_execution.html
 f7d845d3c4c2369870ecf13a7ac7fad7edce121f486fb779c535d429f0a377e1  gencode/docs/configuration_pod.html
 732c6acc2116974000ec25bfdfa00ba6e3c5c2af13d0e3a0d71b3d4b8eeda059  gencode/docs/configuration_pubber.html
-9fae85cb33d19e10fd8ce57a01fe6b22d76d1c23ad59d627e15feadbab7b4e80  gencode/docs/event.html
-d1d908d7b27b7dcbc4fbbcc63a9c62e9e148e0132c0e9b4459218de35f680656  gencode/docs/event_discovery.html
+564d652ef4393f0b83d5e35c0be26766023c300414f6cef92ccc26cae440c0d1  gencode/docs/event.html
+587e048c161273b927de67b899204bf0e183db64e59ae513f833e5eff406b1ab  gencode/docs/event_discovery.html
 542ef5498c0478986c36681e0827b73b146898351bafa86bfe93582ad22ea03d  gencode/docs/event_mapping.html
 71fe25d3b17d1dc87b52c049a3235c20527f73e12ffa53fa4800a15e53f73732  gencode/docs/event_pointset.html
 acd50976d1afd771d55177db9a1b9452a0c6a35e3e15b2e444c799991294808d  gencode/docs/event_system.html
@@ -20,10 +20,10 @@ d94dda13552e2634037ee14f6a8470be58ef2b5fcb0600c070b1f943f7fbbbba  gencode/docs/m
 741b880216be3743f6747800a042f2dbd89f3b0344c6b0a965f4bc010f03a930  gencode/docs/schema_doc.css
 878ea88206c974f40643c3cc430875f9c4e8c5e3fd6bcd6358bd3eb6d48699a9  gencode/docs/schema_doc.min.js
 7ed934930aee763e0beebc349725ba3909115e8d346bb762f28bcbe745bb163a  gencode/docs/schema_extras.js
-d589358f3dad1baa79e4828e1f2d8d57429b0790fddcf3bfd95f262cd12060c1  gencode/docs/state.html
+f8854f923ab8dbda6559942948298467fe20982bf71f79b0cb0912d9a7ae5167  gencode/docs/state.html
 f4a52cdad2cd9a9646da4d84cc1f3962ddd151a8d348255e5cff30eadfee283c  gencode/docs/state_mapping.html
 9dc52450e6f703cb8e17682c0788a515c06896891494bb4c6a53712e156954ea  gencode/docs/state_udmi.html
-73c46704899d8a65d4faacb61dd2e9b35d61811e42c61c9fb67174a0684a2532  gencode/docs/state_validation.html
+3461dbb6b04de3801f61383789ab3a5d4de414233efb9567a4f83956a50c4de2  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
@@ -35,7 +35,7 @@ fcbed49f1af8b791d8c52bcbe18f65521a79d9ac3eb33ec3afd9b342ab2bfc56  gencode/java/u
 e28c3899bf2cb08cf456dbca29ccc3d4559c1d2145e252095689b171be82b4c6  gencode/java/udmi/schema/BridgePodConfiguration.java
 2e7c0912c6f43b8dae9e9149b7361d3640bde4f01de6e13d8e487fe01be2c2c0  gencode/java/udmi/schema/Bucket.java
 0a4f6bcd5065418c1cdc6c05b900b3de31744847d25b6ab6de7aabb1e724710e  gencode/java/udmi/schema/BuildingTranslation.java
-f63dd9577a096720c067c2317ca4f2d4ff7dc8680dedf08025a8e58e7bef8f21  gencode/java/udmi/schema/Category.java
+36a165d3c65ca02cd095606a27d7efa21f6d3b7134bb49771b315dcdfa7154b7  gencode/java/udmi/schema/Category.java
 251836ed429f0bd2b3fdcca66c252f246d45ef88bd1520c911817e15ddc6afba  gencode/java/udmi/schema/CloudModel.java
 ff79de9390aa25bb45fb3e2ebb682c865ccab764f56d9644377d9d28c0ab10e4  gencode/java/udmi/schema/Config.java
 cf9762392e02b5d04c6498963222cc0c00f7be6c3cd82bde3d063a5eceba2b65  gencode/java/udmi/schema/Connections.java
@@ -101,7 +101,7 @@ ca2e7566106818ca7e5190c8041eb86f0c9b3251b0bda8c3ea7ce11a0c891a0a  gencode/java/u
 f67e410412f6c5eed3b9c70fa7e99a8994353c8ff04b8c649a30e5dcc647ce31  gencode/java/udmi/schema/PubberOptions.java
 703ed0cecb60f284b52e76dc4d612eb798ba3e8781cc40698a46611b36e6b0c9  gencode/java/udmi/schema/SchemaValidationState.java
 6da1708f597a0c64ce30dcbe739095fc7ebc091d63b98af88c73f70706af31ca  gencode/java/udmi/schema/SequenceValidationState.java
-6e9a8a3b23851216dd0a375c5ff5259009de99091e635b870a74e96393429ade  gencode/java/udmi/schema/SetupUdmiConfig.java
+f334e31ea3247ea35fb9ae448d845dbb0e6fa404a25b00344806b0bb62007202  gencode/java/udmi/schema/SetupUdmiConfig.java
 379227aa39dd3f7eae33a14facf4b317b877cc2e6a14adc158258faa0d5d0390  gencode/java/udmi/schema/SetupUdmiState.java
 9dc7e377f3392d35b5b4da3d1bbeb5e8d9a375a13ec6c852c478112cf26d8006  gencode/java/udmi/schema/State.java
 47ad54328160a1aabce719a3263d4bfea903e8e8255e04a54ace86eb095b0f0c  gencode/java/udmi/schema/StateSystemHardware.java
@@ -142,7 +142,7 @@ ac3facbd96f7cb2f7e387e7497d6a36af379a2687329571f250c5670f9933244  gencode/python
 33ce7ee99051d56dd3c4d69edf92583d0bb7fd751417948b71292ac2285d3c19  gencode/python/udmi/schema/config_pointset_point.py
 7da3bdb37f338260d5f3829fa5fcbb9bbf9f146b514a68319c314a96c6b8ac12  gencode/python/udmi/schema/config_system.py
 cce623b34fd694880039a1c080214c33e00acaef5bc72276cf11a3bb2de40000  gencode/python/udmi/schema/config_system_testing.py
-5e615089842674a183a2218b7e518c3581795df3a4cf9cb77ffcebf347dfe0c0  gencode/python/udmi/schema/config_udmi.py
+71cc1c5117f1981754259a64cc93197d29abdcb35a304b2cf8dc7a4318381ea2  gencode/python/udmi/schema/config_udmi.py
 c35c1a4d37220b8f3b87d66152253160cfcd5a710fa58af51dfe3abe0a83021a  gencode/python/udmi/schema/configuration_endpoint.py
 da1ca9aec0b35d3af956d7c908b8285d1df5ec545f67a3727c54ccce22f4724c  gencode/python/udmi/schema/configuration_execution.py
 498cdf9417f0a6cf832617025b6cc21771809d40cd2887bcd760701443b32e53  gencode/python/udmi/schema/configuration_pod.py

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -167,7 +167,7 @@ jobs:
         run: more out/sequencer.out out/generated.md || true
       - name: sequencer end state
         if: ${{ always() }}
-        run: cat sites/udmi_site_model/out/devices/AHU-1/sequencer_state.json || true
+        run: cat sites/udmi_site_model/out/sequencer_AHU-1.json || true
       - name: schema validation output
         if: ${{ always() }}
         run: |
@@ -209,7 +209,14 @@ jobs:
         run: more out/sequencer.out out/generated.md || true
       - name: sequencer end state
         if: ${{ always() }}
-        run: cat sites/udmi_site_model/out/devices/AHU-1/sequencer_state.json || true
+        run: cat sites/udmi_site_model/out/sequencer_AHU-1.json || true
+      - name: schema validation output
+        if: ${{ always() }}
+        run: |
+          echo ============ out/schemas.out
+          cat out/schemas.out || true
+          echo ============ find RESULT.log
+          find sites/udmi_site_model/out/devices/ -name RESULT.log | xargs fgrep -i schema
       - name: pubber logs
         if: ${{ always() }}
         run: more out/pubber.out* pubber/out/*/*.json || true

diff --git a/bin/gencode_categories b/bin/gencode_categories
@@ -15,6 +15,7 @@ DEVICE_PREFIX = 'device'
 JAVA_DESCRIPTION = '\n%s// %s\n'
 JAVA_TARGET = '%spublic static final String %s = "%s";\n'
 JAVA_LEVEL = '%spublic static final Level %s_LEVEL = %s;\n'
+JAVA_VALUE = '%spublic static final int %s_VALUE = %s.value();\n'
 JAVA_MAP_ADD = '%sstatic { LEVEL.put(%s, %s); }\n'
 
 doc_in = os.path.join('docs/specs/categories.md')
@@ -97,6 +98,7 @@ def write_java_categories(out, indent, categories):
     out.write(JAVA_DESCRIPTION % (indent, desc))
     out.write(JAVA_TARGET % (indent, const, target))
     out.write(JAVA_LEVEL % (indent, const, level))
+    out.write(JAVA_VALUE % (indent, const, level))
     out.write(JAVA_MAP_ADD % (indent, const, level))
 
 

diff --git a/bin/test_sequencer b/bin/test_sequencer
@@ -6,6 +6,11 @@ export LC_ALL=C
 ROOT_DIR=$(dirname $0)/..
 cd $ROOT_DIR
 
+debug_opts=-v
+seq_opts=
+alpha_mode=
+clean_cache=
+
 if [[ $1 == 'clean' ]]; then
     shift
     clean_cache=y
@@ -18,8 +23,13 @@ if [[ $1 == 'alpha' ]]; then
     alpha_mode=y
 fi
 
+if [[ $1 == 'full' ]]; then
+    shift
+    debug_opts=
+fi
+
 if [[ $# -lt 1 ]]; then
-    echo Usage: $0 [clean] [alpha] PROJECT_ID [tests...]
+    echo Usage: $0 [clean] [alpha] [full] PROJECT_ID [tests...]
     false
 fi
 
@@ -83,7 +93,7 @@ fi
 bin/augment_metadata $site_path $device_id
 
 # Run in debug mode for fail-fast when things go wrong!
-bin/sequencer -v $seq_opts $site_path $project_id $device_id $serial_no $targets 2>&1 | tee out/sequencer.log
+bin/sequencer $debug_opts $seq_opts $site_path $project_id $device_id $serial_no $targets 2>&1 | tee out/sequencer.log
 echo Completed execution of sequencer test run.
 
 echo Checking reported cloud version info