undo commit

.gencode_hash.txt

@@ -1,28 +1,26 @@
-909b90e19ba41e691ea277eb26ff8a3b7d7bad43ecd7ac082683e97401bde9b5  gencode/docs/cloud_iot_config.html
-b35646a2f3d7c30fd34e3ea6ab6a1070b39c469fd1de49cab1093ff32faaf06d  gencode/docs/command_discovery.html
-e1f62882576d0f4332360f2aedb79b37a43973fb31d862c829af924f8f310ec1  gencode/docs/command_mapping.html
-d93322f64b94bc1808c59cde7b83915ff7e14d50401b9c2ae8467730ed15257c  gencode/docs/config.html
-30c7f39e50e290b0a36a3414cf1c90277ebd249f126f85f0a307bc7b74164e08  gencode/docs/config_mapping.html
-bbb98edbbc279678856c11024f4681261f0b9b58b07f8de6026be70d2e32074a  gencode/docs/configuration_endpoint.html
-299bc6f4d9842fab2d2cfd003d8a8adf94303c560cf71e8595d85cf661558a4d  gencode/docs/configuration_pubber.html
-82fbf41e4e88593f22a929fc8ade4d1e8f75a0fc1aa8452ea1d3b19023bee314  gencode/docs/envelope.html
-276158157fdf8989edf8ef9a53874246fc6e87412aea410712496de9759e922c  gencode/docs/event.html
-a8800ab8384de3b846af0d72cf310acf01644842b557e42eec20b69a0bfa1868  gencode/docs/event_discovery.html
-3019d06826576d287edbf69116ec712c74c8fdfcc5653b51f2573cb9755ebb23  gencode/docs/event_mapping.html
-71fe25d3b17d1dc87b52c049a3235c20527f73e12ffa53fa4800a15e53f73732  gencode/docs/event_pointset.html
-7adf725427f285539b37abdad0c15f32e76bd6e1ec7d775527491597aef32875  gencode/docs/event_system.html
-43025f61381de050eae9680c3193a1d878a397d0b5515dd1063a1a993b0c41ea  gencode/docs/event_validation.html
-208956129b09bde2639068b0bb3282dce09b12edb5e775eeed0834fa4890a001  gencode/docs/metadata.html
-5d039d607af9ec75ee552dfe36b16c702687ea16f5663f41fc49b4533b86e00d  gencode/docs/properties.html
-162f8f3b8ca9491e7dc1d2569d4773acae51f93b07fa875a9ece218d9d4f8a89  gencode/docs/readme.md
-690d56e96c4e180e49e0abcba358ab1842ea06dd3f693918852a9de370c994d5  gencode/docs/reflect_config.html
-9332e44c87dae9261b079424e748d5ee1df08a3c6b39987d254ebf78274e2f34  gencode/docs/reflect_state.html
+52e5e736587cb4d9615b5b48dda53d385fb4c7091864e5d7ebaf804a46519852  gencode/docs/cloud_iot_config.html
+36842bbf9d023a83a3e8958fc3ae607424f4ada5b1e72be35fe2ac443cfd31cc  gencode/docs/command_discovery.html
+4d65d7043d4e37e7f043a3e6d4d859bc84cf6ed1c5a07d9f04b731ee9e6b16ef  gencode/docs/command_mapping.html
+d755727827955c38c6679869a4e9177e44a83770a1c6a046f953954792a6d4a4  gencode/docs/config.html
+6cffb39b5071680f39a7b96bdeb8330b6a8f5fa71ed4c4d42b82d7896080dcd9  gencode/docs/config_mapping.html
+62a5f579661625c0fa53320557be47711e289566b14bd0399b45395cea87ae27  gencode/docs/config_pointset.html
+34e05b6966c611afd4591bdb2f1a606123326c922b0747a3b0861383d68c1177  gencode/docs/configuration_endpoint.html
+01ee911c3d85ce9d5de98a77d15a78e7719bc151efdf5149082c8056b7a60bc1  gencode/docs/envelope.html
+b8972d7b07d1dc6bdb82988e1e9955603a80477cac18e7745ecbd7fe78c104ba  gencode/docs/event_discovery.html
+971c2d352004e53c8fe4fa9370685dca8ed974a97b2e1e2382653be344010346  gencode/docs/event_mapping.html
+8133e380e40f27c56accbffc665b2eeb56ec84a4da3b52ba7aa5e439c9c40572  gencode/docs/event_pointset.html
+ac05c443556b92de96ec1867e72c668da27bc53012fe5821a8035a81ed46aaaf  gencode/docs/event_system.html
+51cc24f8ebe5daa9f165ec401cf4745994823037ba6a0753730339ef81a57fa6  gencode/docs/event_validation.html
+469909f7061efeaed0942e3aad43468e56dbeb335c664412c976d9f1e4bc44c9  gencode/docs/index.html
+6d5081d04c86f8bd444efb41cd788826aa66802d37e8f98e93b6b75425542d5e  gencode/docs/metadata.html
+a5263284652e52822c82a863fc27db765eb55861f96316f07836619376323bce  gencode/docs/model_pointset.html
 741b880216be3743f6747800a042f2dbd89f3b0344c6b0a965f4bc010f03a930  gencode/docs/schema_doc.css
 878ea88206c974f40643c3cc430875f9c4e8c5e3fd6bcd6358bd3eb6d48699a9  gencode/docs/schema_doc.min.js
 7ed934930aee763e0beebc349725ba3909115e8d346bb762f28bcbe745bb163a  gencode/docs/schema_extras.js
-aa1fb0f836ccfdcb275a6763771fdc4b3a3b90a4e2e1cca97e4a929e9075c284  gencode/docs/state.html
-776f696f93961b7da9fab8494d4487aea01533a8df9aab7968687f63de2f9f91  gencode/docs/state_mapping.html
-06f9e538fbab613144d6d5f64274464850f60f4f730b6a04ad0e049ce34276ec  gencode/docs/state_validation.html
+7dab133dd7e23d2b61b325516a274be5007ae9fc739ced3d244bb05ba0dac648  gencode/docs/state.html
+053656d21797603350e92d836e8d6cdcab6733e8c20d2ae47db5cc14bc3a61e5  gencode/docs/state_mapping.html
+b0c4bf203dd8ea482d0d6b7ec9549bd8ddf597faf7afdc410351e527f4cc68b1  gencode/docs/state_pointset.html
+f680b255d4b185cc96347a2c6425bb33c847cf7468d309c33aa7901567cd02b7  gencode/docs/state_validation.html
 d39d7fe37a41c74a40080af7b0a429d201ab1fdff7444428c4b98eb7b38c332b  gencode/java/udmi/schema/Asset.java
 0825a5cec83003bb0a6488c4ed7010a04ae0d3848ef36fe01bb4e6718ba7b96d  gencode/java/udmi/schema/Aux.java
 1f2757c67215cf657297a009a01288108a04daeea919713871a2d34ea903b5f9  gencode/java/udmi/schema/BlobBlobsetConfig.java
@@ -96,11 +94,11 @@ d3968b92497e83a63f18cc0e74484a9807f1bb92db0c92d556ec2caaa143d645  gencode/java/u
 ac6f8fd87c8986cce01e872460c15ff6fe71e3816f9bde610acfe25f7d38c8d4  gencode/java/udmi/schema/ValidationEvent.java
 f7d117dc8b9764acf0c95a13a2bfdfbdf31d1a8ec83a707448aa4d7391ef07e2  gencode/java/udmi/schema/ValidationState.java
 e007ddd1ceeae3603c85110c33e1bb4a418ff9c7a791ca0df25b7ea3caeafd36  gencode/java/udmi/schema/ValidationSummary.java
-033a86846fb9362a37d148f9696d223a2aae2a368452487cb6042407a316225f  gencode/python/udmi/schema/__init__.py
+445723ac8a6c5e7072d344fbd865bbefce409bf9a07e194b6d82e9d0751547bd  gencode/python/udmi/schema/__init__.py
 4b25dd95f863059b761269f93adcae7049507924a1c6e74d6856849203c179db  gencode/python/udmi/schema/ancillary_properties.py
 5ecd6c542f33450cb4ce75d940a6dff4d3bd67d4b9de4aff5ee88abcc301dbff  gencode/python/udmi/schema/building_config.py
 dab4f5fca272ec48c2881bca2b6bc43786ada47fa1f6dd935c35f7ce0eb6b0f6  gencode/python/udmi/schema/building_translation.py
-c33fab16eb86b93692ddbb243a2d6cfe202ca1a0fd76b351a18727a35940d958  gencode/python/udmi/schema/category.py
+d4269e665695f7a431108233a427313e609764f421d7657a23bd68d046f11e83  gencode/python/udmi/schema/category.py
 a61b1c5732f01b7efda41a773d5786fad755f371193ce4478b458387ca2a8fe8  gencode/python/udmi/schema/cloud_iot_config.py
 6578d68f65b87b781086e72566de910db4bef365599fe3188862d4d8a81e84fb  gencode/python/udmi/schema/command_discovery.py
 1254c34d973c9099ae99dcea4534e234e9019f49255e2e27d2afa1bc074fd596  gencode/python/udmi/schema/command_mapping.py

.github/workflows/testing.yml

@@ -111,10 +111,6 @@ jobs:
           more /tmp/sequencer.out
           diff -u /tmp/sequencer.out etc/sequencer.out && echo No sequencer.out diff
           diff -u /tmp/generated.md docs/specs/sequences/generated.md && echo No generated.md diff
-          (ls -1 validator/sequences | xargs -I% diff -u \
-              sites/udmi_site_model/out/devices/AHU-1/tests/%/sequence.md \
-              validator/sequences/%/sequence.md) \
-              && echo Sequences in validator/sequences up to date
       - name: telemetry validator
         env:
           GCP_TARGET_PROJECT: ${{ secrets.GCP_TARGET_PROJECT }}

bin/clone_model

@@ -5,7 +5,7 @@ mkdir -p $ROOT_DIR/sites
 cd $ROOT_DIR/sites 
 
 MODEL_DIR=udmi_site_model
-MODEL_VER=808aa06fbe922b9f749d2a6b52ff03b6f9074b48
+MODEL_VER=1.7
 TEST_SITE_GIT=https://github.com/faucetsdn/$MODEL_DIR.git
 MODEL_REPO=origin
 

bin/gencode

@@ -17,7 +17,7 @@ if [[ -n $check ]]; then
     echo Checking gencode docs links...
     bin/gencode_docs check_links
 
-    echo "Checking gencode hash (dynamic/static)..."
+    echo Checking gencode hash...
     files=`find gencode/ -type f | sort`
     sha256sum $files > /tmp/gencode.hash
     diff /tmp/gencode.hash .gencode_hash.txt

bin/gencode_categories

@@ -9,10 +9,8 @@ import sys
 
 GENCODE_MARKER = '@@ '
 CATEGORY_MARKER = '* '
-WILDCARD_REGEX = ' *\\* _\?\?\?_: (.*)'
 CATEGORY_REGEX = ' *\\* _([a-z]+)_: (\(\*\*([A-Z]+)\*\*\) )?(.*)'
 JSON_FORMAT = '%s%s{ "pattern": "^%s$" }'
-DEVICE_PREFIX = 'device['
 
 JAVA_DESCRIPTION = "\n%s// %s\n"
 JAVA_TARGET = '%spublic static final String %s = "%s";\n'
@@ -33,11 +31,6 @@ def read_categories():
     with open(doc_in) as doc:
         while line := doc.readline():
             indent = line.find(CATEGORY_MARKER)//2
-            wildcard = re.match(WILDCARD_REGEX, line)
-            if wildcard:
-                entry = (group + '[.a-z]+', 'INFO', wildcard.group(1))
-                categories.append(entry)
-                continue
             match = re.match(CATEGORY_REGEX, line)
             if indent < 0 or not match:
                 continue
@@ -90,8 +83,6 @@ def write_java_out(categories):
 def write_java_categories(out, indent, categories):
     for category in categories:
         target = category[0]
-        if target.startswith(DEVICE_PREFIX):
-            continue
         level = category[1]
         desc = category[2]
         const = target.replace('.', '_').upper()

bin/gencode_docs

@@ -28,9 +28,12 @@ fi
 OUTPUT_DIR=gencode/docs
 TMP_DIR=tmp/schema
 
+schema_files=`ls schema/*.json`
+
 if [ "$OP" == gen_bucket ]; then
+    rm -rf $OUTPUT_DIR $TMP_DIR
 
-    input_file=$1
+    input_file=$OP
     output_file=$2
     tmp_file=$output_file.tmp
 
@@ -44,7 +47,7 @@ if [ "$OP" == gen_bucket ]; then
     # Subheadings
     sed -E -i 's;^\t(\t*)([a-zA-Z0-9 .\-_\/]+)\t+$;\t\1*\t**\2**;g' $tmp_file
     # List Items
-    sed -E -i 's;^\t(\t*)([a-zA-Z0-9 .\-_\/]+)\t+([^\t\n].*)$;\t\1*\t_`\2`_ - \3;g' $tmp_file
+    sed -E -i 's;^\t(\t*)([a-zA-Z0-9 .\-_\/]+)\t+([^\t\n].*)$;\t\1*\t`\2` - \3;g' $tmp_file
     # Convert tabs to spaces (comply with style guide)
     expand -t 4 $tmp_file > $output_file
 
@@ -66,12 +69,12 @@ if [ "$OP" == check_links ]; then
 
     missing=
     echo Checking references to externally linked files...
-    while read file comment; do
+    fgrep -v \# etc/external_refs.txt | while read file comment; do
         if [[ -n $file && ! -f $file ]]; then
             echo "Reference to missing file '$file': $comment"
             missing=y
         fi
-    done < <( fgrep -v \# etc/external_refs.txt )
+    done
 
     if [[ -n $missing ]]; then
         exit 1
@@ -86,10 +89,11 @@ if [ -d venv ]; then
     source venv/bin/activate
 fi
 
-rm -rf $OUTPUT_DIR $TMP_DIR
-mkdir -p $OUTPUT_DIR $TMP_DIR
+mkdir -p $OUTPUT_DIR
 
 # Make a copy of the schema files into a tmp folder for any pre generator fixes
+rm -rf $TMP_DIR
+mkdir -p $TMP_DIR
 cp -r schema/. $TMP_DIR
 
 # Remove file: prefix from references so document generator works
@@ -99,7 +103,7 @@ find $TMP_DIR -type f -exec sed -i 's/file://' {} \;
 # is one level down
 find $TMP_DIR -type f -exec sed -i 's;(../docs/;(../../docs/;' {} \;
 
-schemas=$(bin/gencode_root_schemas schema/)
+schemas=$((cd tests/; ls -d *.tests) | sed s/.tests//)
 echo Processing schemas $schemas
 
 for schema in $schemas; do
@@ -109,26 +113,15 @@ done
 
 rm -rf $TMP_DIR
 
-echo Generating schema index page...
-
 # Create index page with links to different schemas
-cp etc/schema_readme_template.md $OUTPUT_DIR/readme.md
+cp etc/schema_index_template.html $OUTPUT_DIR/index.html
 
 for schema in $schemas; do
-    section=$(jq -r '.["$section"]' schema/$schema.json)
-    if [[ -z $section || $(grep -c "## $section\$" $OUTPUT_DIR/readme.md) -eq 0 ]]; then
-        section=Other
-    fi
-    description=$(jq -r .description schema/$schema.json)
-    if [[ $description == null ]]; then
-        description=""
-    else
-        description=$(echo " - $description" | sed 's@(\.\./@(\.\./\.\./@g')
-    fi
-    sed -i "s@## $section@## $section\n* [**$schema**]($schema.html)$description@" $OUTPUT_DIR/readme.md
+    sed -i "s/<!--SCHEMALINK-->/\
+        <div class=\"card\"><a href=\"$schema.html\">$schema<\/a><\/div><!--SCHEMALINK-->/"\
+        $OUTPUT_DIR/index.html
 done
 
-
 # Add navbar
 navbar=$(cat etc/schema_navbar.html)
 navbar=$(printf '%q ' $navbar)