1.5.2 release testing cleanup (#1003)

faucetsdn · Oct 26, 2024 · 7e85ec0 · 7e85ec0
1 parent ad2b7fe
commit 7e85ec0
Show file tree

Hide file tree

Showing 17 changed files with 317 additions and 28 deletions.
diff --git a/.gencode_hash.txt b/.gencode_hash.txt
@@ -3,7 +3,7 @@
 fb876b8f7bfdccf156d751efddf2660a7a7ab5585e89be0f82c59f7a61e68d4c  gencode/docs/config.html
 22bfb3fd7c0e73dac4cbd830aa7983714917ec6da813f6bf5768ce3aa9786fb2  gencode/docs/config_mapping.html
 f9a67145928e192687c7984c82c2d39450bf6d0d4fd2f95f397e60e8ac619da2  gencode/docs/configuration_endpoint.html
-b3090f5d6d61594eb61ce1e8c2a49001f19007ac2cedde54b7080ed24f8f47d2  gencode/docs/configuration_execution.html
+8ac76a1b8c0c62f19be8cafa36b1f58bc03f3f129e10def91566d0b9172b0c82  gencode/docs/configuration_execution.html
 ed7a8b71e2a0b002151a1a5fa0c038f1af811f7567250c724ac3c4b245ccc6b4  gencode/docs/configuration_pod.html
 1bcbfda7922a7c2d3aa17944b4637124d90940c0bc8db3d36995914873daa341  gencode/docs/configuration_pubber.html
 f24d15e549f1b143b50d6011f2f7fd03286e1cd128a3e25591195b25f8efc472  gencode/docs/data_template.html
@@ -26,7 +26,7 @@ eeafb6e89a6c43816cfcb26244a95615a4ee75966e1c015cae5a13b6cfcb0078  gencode/docs/r
 0f16008af7116a182322736046b05c2718ac8b1f2cd755a60d28c9cfaeb6a8a9  gencode/docs/site_metadata.html
 12a32a1555e58e6ba35566e6613eea5f9b70f80a02d58146ad250acb830cf378  gencode/docs/state.html
 b2398e7f9e352c47867e38f97168f3eb88e23280c7dd576f13e038c8c3f714c9  gencode/docs/state_mapping.html
-968f0198855b0b90a7fe812529ec6b8b8f651f792a07bb439a1ad5940f8e4076  gencode/docs/state_validation.html
+b8ff4cdb4b79449166b1c6e09ac0e58273ae62865b47bf943fdd365739c62a4c  gencode/docs/state_validation.html
 a9ac875562f5f5431e6f090cd63950e452c2fff43a221561929a0747e775964d  gencode/java/udmi/schema/Adjunct.java
 0e0d87fa6bc2f746eaacfbcd0f1258c9c6beee2b03d995868af9aafcbc4a88dc  gencode/java/udmi/schema/Area.java
 768d8b010bc90c5fbe198daf58f3847247ecc620a6fc046fffba877399cf1888  gencode/java/udmi/schema/Asset.java
@@ -66,7 +66,7 @@ a83286d885ec79ccae1eea966e3b7caf99558c2f26165f207707ad4c5178acb4  gencode/java/u
 d2e7afd6e1a9250480144c114ee8877afb9b0dd7048495fe96a821d9e6c80475  gencode/java/udmi/schema/Entry.java
 e0ca9b52b4cfb4be9d6c911a549a9f2f69f5f948f05a9e3a7b224c988f932ae3  gencode/java/udmi/schema/Envelope.java
 4163478ed17191461b0a65abd11c4ddf912cbc104f040a734efd290306fab7b7  gencode/java/udmi/schema/Events.java
-5f48b9b3e602a1fab2e8b2956ff932ad65a04681ac7392e8f1b7c5afb4279609  gencode/java/udmi/schema/ExecutionConfiguration.java
+1960750d0b8f2e18ea02230a51b6380cf555e21de46d6d38d649e626660ba0e2  gencode/java/udmi/schema/ExecutionConfiguration.java
 40686ad8c86447e5f760b6503c26afb6c404950c4458272d9d3fb874ab8ee624  gencode/java/udmi/schema/FamilyDiscovery.java
 a4ba10a0c78ece12640e742d3d0e61ede88eddef9b13f9d1665012579082fbb6  gencode/java/udmi/schema/FamilyDiscoveryConfig.java
 dc1affcb39be03fc5b974aa5216d7d3b692d5bcea292724c33d3323dfe03b771  gencode/java/udmi/schema/FamilyDiscoveryModel.java
@@ -119,8 +119,8 @@ d87deaba67bb3272c528e3491d378bde059b626964a4a2aed15f5643305c2463  gencode/java/u
 14faa115d13ee46d10935b13753bff85758f3b64b5136a59f60d36b5b541687c  gencode/java/udmi/schema/SchemaValidationState.java
 fadf083200e73d46cfdec2f710d40e3d2bc4dbf05196e4d0900186e72b62d95e  gencode/java/udmi/schema/Scoring.java
 ad70168de2e1801e26f2c1a8c33a6169e236682de59fd3f6038a77ac264aca14  gencode/java/udmi/schema/SequenceValidationState.java
-f1da39b7c8b9784e4ad51ef08dc73381cd8e0f4f7dcc903edcf0898c51d86d25  gencode/java/udmi/schema/SetupUdmiConfig.java
-158ca584a225a422af3143b6db05b56e91bcf26a3a4a2d1d4efee53f935b9415  gencode/java/udmi/schema/SetupUdmiState.java
+72e3a07ce890c73fccd3d0cf757d073746b60b722c94edd5425dc066951a048f  gencode/java/udmi/schema/SetupUdmiConfig.java
+600e2694a6eac8c63e37460f2522ef3b4d7745e5a67499bf7ad75746eb5a49a6  gencode/java/udmi/schema/SetupUdmiState.java
 8fcb31df1070010da6d3ae61d741a77d2ce8b3757226bbe35ff9218a0581b1ec  gencode/java/udmi/schema/SiteLinks.java
 a3dc7f14d4270ea370db2015785ad12d4bd61825213ab7ac4ee03dda21dde4f2  gencode/java/udmi/schema/SiteLocation.java
 d1effacea13d7a859f256c26fae214d959dca879b14ffba0d4af51dfa552152a  gencode/java/udmi/schema/SiteMetadata.java
@@ -166,9 +166,9 @@ ac3facbd96f7cb2f7e387e7497d6a36af379a2687329571f250c5670f9933244  gencode/python
 5444c5eb6971addf729566e39e7eb13dd8b78dceeeab3ef8a6ec3d2a7f5ed25c  gencode/python/udmi/schema/config_pointset_point.py
 7da3bdb37f338260d5f3829fa5fcbb9bbf9f146b514a68319c314a96c6b8ac12  gencode/python/udmi/schema/config_system.py
 b15c649657d0fb2a102a3e1ff9653c9002715d3b412d44c544a080c37b6a9811  gencode/python/udmi/schema/config_system_testing.py
-b35b27fc4908bf02bef530d58cc5f6991427f50a73b60174b6ffaecedbdb3ed9  gencode/python/udmi/schema/config_udmi.py
+cb272fce7544ad1aadfdd221aa18190019f8a139059216593e7bf91aadd9e0db  gencode/python/udmi/schema/config_udmi.py
 51ced416a2ab41ec86d77550eb197ffb36291e259c25441d9f28b7714b9a61bd  gencode/python/udmi/schema/configuration_endpoint.py
-802e6433c9471cd1c0a67d44d31ab5991131965127569dff96328457a2f9eb3b  gencode/python/udmi/schema/configuration_execution.py
+ba429fac49fd57af7362418a29a8bde24f0dcb41ebcd9d2fada911218ba78ec4  gencode/python/udmi/schema/configuration_execution.py
 8f65402ddb43815f4482b1c0c965d44c390dbe1561899b3d9df572458ceb97cc  gencode/python/udmi/schema/configuration_pod.py
 c61ee66daa7e632850bc2705370baa8c057e7a34792c6a29b9e4ca00c0eb195b  gencode/python/udmi/schema/configuration_pod_base.py
 ef61eea743cc2629893b18411636672cdfec0e209e58eb7918b33b43edab5196  gencode/python/udmi/schema/configuration_pod_bridge.py
@@ -229,7 +229,7 @@ ee5cc804c59d8216cc3555741748c2d67e30ad5ac2a801ad18b44569835e4f75  gencode/python
 1b313e7c02ed0af08db89453ec6acee7571f9a2af0e289ac6f3f9be3df6928f5  gencode/python/udmi/schema/state_system.py
 8a0bf4294fb70533a056322a6bfc6f13a963381d2100d1468d8b6de757cd72e9  gencode/python/udmi/schema/state_system_hardware.py
 37c55dce0e38dddad3cebb3d40270128a4dbb7b586657d1746bb96dac90e2ac1  gencode/python/udmi/schema/state_system_operation.py
-63bd0332a5ee71a2070acb0087c7f4891e9d2fd8816668c2196478482a8a1d81  gencode/python/udmi/schema/state_udmi.py
+538a92303b86873fcf31349ebcae27eecf4c674de4ad670327256447e6730795  gencode/python/udmi/schema/state_udmi.py
 ad977860afed7a2e7e895e3270350cdf847ffcd24d65d102ecefbdf100908987  gencode/python/udmi/schema/state_validation.py
 69fd8989cff79d3dd1e0396993965112f4bc5d8fb1360e8477b433d202519f75  gencode/python/udmi/schema/state_validation_capability.py
 5d24e4bf0fa0213d380e8058f562f6b9382041ade57cd7d6d9d38d84a68aa1fd  gencode/python/udmi/schema/state_validation_feature.py

diff --git a/.github/workflows/integration.yaml b/.github/workflows/integration.yaml
@@ -133,7 +133,7 @@ jobs:
             SPECIFIC_TEST=${REF_NAME#test-}
             more site_model/out/devices/$DEVICE_ID/tests/$SPECIFIC_TEST/*
           else
-            [[ $(cat site_model/out/devices/$DEVICE_ID/results.md | egrep 'stable \| (pass|skip)' | wc -l) == 3 ]]
+            [[ $(cat site_model/out/devices/$DEVICE_ID/results.md | egrep 'stable \| [0-9]+ \| (pass|skip)' | wc -l) == 3 ]]
           fi
       - name: UDMIS logs
         if: ${{ !cancelled() }}

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -372,8 +372,8 @@ jobs:
       - name: Setup prerequisites
         run: |
           bin/setup_base
-          git clone https://github.com/faucetsdn/udmi_site_model.git
-          ln -s udmi_site_model/ site_model
+          bin/clone_model
+          ln -s sites/udmi_site_model/ site_model
           (cd site_model; git log -n 1)
           docker network create udminet --subnet 192.168.99.0/24
       - name: Build UDMIS
@@ -384,7 +384,7 @@ jobs:
       - name: Start UDMIS container
         run: |
           docker run -d --net udminet --name udmis -p 8883:8883 \
-            -v $(realpath udmi_site_model):/root/site_model \
+            -v $PWD/site_model:/root/site_model \
             -v $PWD/var/tmp:/tmp \
             -v $PWD/var/etcd:/root/udmi/var/etcd \
             -v $PWD/var/mosquitto:/etc/mosquitto \
@@ -397,4 +397,4 @@ jobs:
           done
           ls -l var/tmp/pod_ready.txt 2>&1
       - name: Run Tests
-        run: misc/discoverynode/testing/e2e/test_local $(realpath udmi_site_model)
+        run: misc/discoverynode/testing/e2e/test_local site_model/
diff --git a/bin/sequencer_report b/bin/sequencer_report
@@ -279,7 +279,7 @@ class TemplateHelper:
 @dataclass
 class FeatureStage:
   """Container for scored points and total points for a feature and stage.
-  
+
   Arguments:
     scored: Number of points scored for a given feature at a given stage.
     total: Total points which could possibly have attained.
@@ -433,8 +433,10 @@ class SequencerReport:
             score=result["scoring"]["value"],
             total=result["scoring"]["total"],
         )
-
-        features[feature][result["stage"]].add(test_score=result["scoring"]["value"], test_total=result["scoring"]["total"])
+
+        features[feature][result["stage"]].add(
+          test_score=result["scoring"]["value"],
+          test_total=result["scoring"]["total"])
         features[feature][result["stage"]].tests.append(result)
 
     self.results = {

diff --git a/bin/test_sequcheck b/bin/test_sequcheck
@@ -44,9 +44,10 @@ diff -u out/generated${suffix}.out $UDMI_ROOT/docs/specs/sequences/generated.md
 echo '####################' Finished gencode_seq tests: $failures
 
 echo '####################' Starting expected tests
-SAMPLE_TEST_ROW="| writeback | writeback_failure | alpha | pass | Sequence complete |"
 targets=sites/udmi_site_model*/out*/devices/AHU-1/results.md
-echo "Searching results.md files for: $SAMPLE_TEST_ROW"
+cat $targets > out/all_results.md
+SAMPLE_TEST_ROW="| writeback | writeback_failure | alpha | 10 | pass | Sequence complete |"
+echo "Searching out/all_results.md for: $SAMPLE_TEST_ROW"
 fgrep "$SAMPLE_TEST_ROW" $targets || failures+="expected "
 echo '####################' Finished expected tests: $failures
 

diff --git a/gencode/docs/configuration_execution.html b/gencode/docs/configuration_execution.html
diff --git a/gencode/docs/state_validation.html b/gencode/docs/state_validation.html