Adding basic etcd capability to system (#854)

faucetsdn · Apr 12, 2024 · fe62bcf · fe62bcf
1 parent 2db6e02
commit fe62bcf
Show file tree

Hide file tree

Showing 47 changed files with 630 additions and 1,795 deletions.
diff --git a/.gencode_hash.txt b/.gencode_hash.txt
@@ -2,10 +2,10 @@
 158e714e54b2a6d0b90bfca00d178369b04508dc4fa84a979690a813ca2dd724  gencode/docs/command_mapping.html
 c70a7137ee1a30b35c9e19ca9bb54916247f9eb2e50eab37591cd2ca10b5eddb  gencode/docs/config.html
 22bfb3fd7c0e73dac4cbd830aa7983714917ec6da813f6bf5768ce3aa9786fb2  gencode/docs/config_mapping.html
-797b2f2102da26f3dee3c5d58cf8551a3da747703950f085f2e616af329affdb  gencode/docs/configuration_endpoint.html
-352fdfd0a03165381f03ff5c117910f7c4de602fcce6f48aa9c599971ba75cfc  gencode/docs/configuration_execution.html
-0d5f584db584e499df039444f65fc4daac4c0d66c94b3073a277cddac196cf58  gencode/docs/configuration_pod.html
-45db665fd1cffbdfc4cf51df7c324ff737ff5061f89291b6e2ea3ee16e5f1c28  gencode/docs/configuration_pubber.html
+754c02f24a929e3b5f95696e961ab5588163c3dbaab9b5411524f01cb1130029  gencode/docs/configuration_endpoint.html
+99598dba319190427a07c54a16e7796c45e1d1a7e7b5e61c35db1f9cf88f0b35  gencode/docs/configuration_execution.html
+e361a8d1649d9e595ae4a220c9241d49a0355b996fed211b85cf6a3ecbe2a723  gencode/docs/configuration_pod.html
+156ba6bf85ad5a097a7eb7c36331717641184504f3f43db0bdc90d1abee28572  gencode/docs/configuration_pubber.html
 f24d15e549f1b143b50d6011f2f7fd03286e1cd128a3e25591195b25f8efc472  gencode/docs/data_template.html
 8f2383ad4e1fc136f73bca559e9ba6dd6357521231a8ec3c0fa63aa7dd725158  gencode/docs/event.html
 363a3a709d3e5c5f34349ae9ae6bf62cf198a0c9fe2379f75f74930bf01a76ad  gencode/docs/event_discovery.html
@@ -15,7 +15,7 @@ e702bedda9d2dd94dcbdaacff29972a8d130a5d85959896010b9cc8b0922132c  gencode/docs/e
 a4a99c4be9483e889c2d0d180d72d2ed332d587ac9305c7615da0e70fd55a56d  gencode/docs/event_validation.html
 73a631098abe67df5da1f2dcfaf3e4ea7f9d29f4aac6e34cef8b3b9258376559  gencode/docs/metadata.html
 bdacad842fc2b5696045a353f4acb07ce9481dab5d6710c8efc39e808ea0a372  gencode/docs/monitoring.html
-0c94d260b39463e8c98d281346a65bde7edfa86393ec1b3bafe1472c5749de75  gencode/docs/persistent_device.html
+86b62cb8e66ffb97d717fb8f1bf6a4f7d0a759cd15a8d040d5cc3451666f7c72  gencode/docs/persistent_device.html
 5d039d607af9ec75ee552dfe36b16c702687ea16f5663f41fc49b4533b86e00d  gencode/docs/properties.html
 16512c8cc60e4f1a0e01555f3fb6c8a49d3f2b609275a8dc9e62f38fa7b404ca  gencode/docs/query_cloud.html
 aa9e6875ae849193ab15d8314ba707e73343944dac34de85b90166e41d16e8c6  gencode/docs/readme.md
@@ -58,7 +58,7 @@ d4a82e132b2d223c4a82384d22455283c0b64aba3100fc210e72f9700b9df2d0  gencode/java/u
 53765856531c0a65060b2633e06c701a5073ae72c4fbf5e27668ddb6c0dc7a1f  gencode/java/udmi/schema/DiscoveryEvent.java
 bb4509f13e30ebc9964e213eabf3e36f0c7d73a54a052fea281a484ad84c3596  gencode/java/udmi/schema/DiscoveryModel.java
 fbe412e8c874139d828021a034cf6a6a6e1d35d01ccffe98ae35ac48187de753  gencode/java/udmi/schema/DiscoveryState.java
-4089bbb80bf641c9845485bc9bccc1b69ffc8b84f64db86b067ee6560a1977a4  gencode/java/udmi/schema/EndpointConfiguration.java
+1bb0e11e80df75dcedcbea6caf0625412e43ef483ad960daadcf496afa16f522  gencode/java/udmi/schema/EndpointConfiguration.java
 dc25e685886e11a741418be9191a478e13c0244647b5a0cac65d6c1e55055578  gencode/java/udmi/schema/Entry.java
 73a4f6023c715ecb06d14408efb2ee038015bc0db3262d139a3750801dfca1e3  gencode/java/udmi/schema/Envelope.java
 c6cdc63b7044af906236f1ae545079dc07279adddd4d67ef98c595174a712e36  gencode/java/udmi/schema/Event.java
@@ -75,7 +75,7 @@ d3fdb2d8b485c1e61786dfde45cc8be08294339bb31a1b8f02180485789a3ab2  gencode/java/u
 a4fac9e07e930eec7735f67d78eab1e72881987ecc0475c41ce46ae5a9bc5ea7  gencode/java/udmi/schema/GatewayConfig.java
 ce79df57185ee108f6a60efb49c2ea80f249e678d3ccd4d91e702b653571c21b  gencode/java/udmi/schema/GatewayModel.java
 3ac2583e350075d5a07431c4208b87c9f02a5d1e3c651e3a67cf78f5c680ac52  gencode/java/udmi/schema/GatewayState.java
-99a2611b894699e9651854e6d4cebbda0ed8d5120b68762412f858bffaae3846  gencode/java/udmi/schema/IotAccess.java
+b3e65d763d581839f8023f2a9b715a487f14360e9b2d718bb2e2733c03bdf7a1  gencode/java/udmi/schema/IotAccess.java
 b0d4bff14a65ebddc2dd253c996708a4cce99592e82978f057f32a6d9c7768a1  gencode/java/udmi/schema/Jwt.java
 b539bc4304e1e604e9c6aa0242fb1344de9b18a8c88e12fb5c6f0a2530419501  gencode/java/udmi/schema/Level.java
 f02320b5b493d2475df0ef60cd18e86e4bf91244ebfec6f7ab45a792e0d44f15  gencode/java/udmi/schema/LocalnetConfig.java
@@ -94,7 +94,7 @@ df64e4ddbf543ac70e7c2af9d3fbc20ffe3dff68c6718aa9ceadab7f64d3d171  gencode/java/u
 b3b7ef6cae004d5fdb4052f860df0aa583df87bb798a027fc769aeaf16489789  gencode/java/udmi/schema/MonitoringMetric.java
 4e7fb33911cf11845d494a07502577647cb96e1196cb7b76553190d14b6ed099  gencode/java/udmi/schema/Operation.java
 5e1c5411fae4d7c47391ceb5d19ae864fcd484df75ac6b6db39fd2d12647dec8  gencode/java/udmi/schema/Physical_tag.java
-afd4e8dcf55ac7fd91a00bc5348efb7dfe7950037a0eae9365a27d24c4f2f2e9  gencode/java/udmi/schema/PodConfiguration.java
+23955b795d528d7cdb43e16262f065aaa6ebd09b461baab14cc570194c2fc67a  gencode/java/udmi/schema/PodConfiguration.java
 6346d4ff373e01c1f2df420ae5ef970e6af2f347db82ee3574eb3ccb8b7ba648  gencode/java/udmi/schema/PointDiscovery.java
 468c2c95e9dcbaf4ff706fad7f168c14321eaa35b7fb190848ea8bfd86d981d7  gencode/java/udmi/schema/PointPointsetConfig.java
 8f3fc1cdc2dcd3e524863f4675aebabc450a35f5fd1cdc3fd37289b5cab7f2ec  gencode/java/udmi/schema/PointPointsetEvent.java
@@ -155,9 +155,9 @@ ac3facbd96f7cb2f7e387e7497d6a36af379a2687329571f250c5670f9933244  gencode/python
 7da3bdb37f338260d5f3829fa5fcbb9bbf9f146b514a68319c314a96c6b8ac12  gencode/python/udmi/schema/config_system.py
 b15c649657d0fb2a102a3e1ff9653c9002715d3b412d44c544a080c37b6a9811  gencode/python/udmi/schema/config_system_testing.py
 30b1809e364cb3f7070002bb4a9954b11b25543b099b4bbe450d280001e4de55  gencode/python/udmi/schema/config_udmi.py
-ef5efa8522340f44650566bd3c11a6710d014bd7d7a64cbdfc472adb6c9f16b3  gencode/python/udmi/schema/configuration_endpoint.py
+9b2567eba7e0d42fde35b42b9a0c632d45b7f356ebfd12ec83f2e4b478e50331  gencode/python/udmi/schema/configuration_endpoint.py
 ce2ff5646f2707cad62426b54f769eac763308e411ef1925aa54eae1274a8e75  gencode/python/udmi/schema/configuration_execution.py
-afc89a204d7099791303cf9231b19cc6ba320d1de95a921381f5e47bbafac842  gencode/python/udmi/schema/configuration_pod.py
+87affaacbb01a89b983b6307ef5eaf30b9ea673940ca8cd158068dc468dd0945  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
 bed77c13436a192047a0dcdcaea7c5d7175e99a76c6c40409cce9e232ab5bc12  gencode/python/udmi/schema/configuration_pubber.py

diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -31,7 +31,6 @@ jobs:
           bin/setup_base
           bin/clone_model
           bin/start_pubsub
-          bin/test_mosquitto
       - name: bin/run_tests all_tests
         run: bin/run_tests all_tests
       - name: all test output
@@ -240,6 +239,37 @@ jobs:
           name: udmi-support_${{ github.run_id }}-b
           path: '*_udmi-support_*.tgz'
 
+  runlocal:
+    name: UDMIS Local Setup
+    runs-on: ubuntu-latest
+    needs: pretest
+    timeout-minutes: 10
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+      - name: base setup
+        run: bin/run_tests install_dependencies
+      - name: bin/start_etcd
+        run: bin/start_etcd
+      - name: bin/test_etcd
+        run: bin/test_etcd
+      - name: bin/test_mosquitto
+        run: bin/test_mosquitto
+      - name: bin/test_udmis
+        run: bin/test_udmis
+      - name: support bundle
+        if: ${{ !cancelled() }}
+        run: bin/support ${{ github.repository_owner }}_${{ github.job }}_
+      - uses: actions/upload-artifact@v4
+        if: ${{ !cancelled() }}
+        with:
+          if-no-files-found: error
+          name: udmi-support_${{ github.run_id }}-l
+          path: '*_udmi-support_*.tgz'
+
   redirect:
     name: Endpoint Redirection
     runs-on: ubuntu-latest
@@ -280,7 +310,7 @@ jobs:
     name: Post-test Summarization
     runs-on: ubuntu-latest
     timeout-minutes: 5
-    needs: [ baseline, sequencer, redirect ]
+    needs: [ baseline, sequencer, redirect, runlocal ]
     if: ${{ !cancelled() && vars.TARGET_PROJECT != '' }}
     env:
       TARGET_PROJECT: ${{ vars.TARGET_PROJECT }}

diff --git a/bin/pull_messages b/bin/pull_messages
@@ -31,12 +31,13 @@ while true; do
         echo $raw_data > $tmp_file.raw
         data=$(echo $raw_data | tr - + | base64 --decode)
 
-        if [[ $raw_data == null ]]; then
+        if [[ $raw_data == null || -z $raw_data ]]; then
             break
         fi
 
         if [[ -z $data ]]; then
             echo Bad/empty message data: $raw_data
+            continue
         fi
 
         if [[ $subType == null ]]; then

diff --git a/bin/run_tests b/bin/run_tests
@@ -13,9 +13,8 @@ where [step] is one of:
   schema_tests
   trace_tests
   registrar_tests
-  udmis_tests
   util_tests
-  all_tests (except util_tests)
+  all_tests
 EOF
   false
 }
@@ -69,19 +68,12 @@ case "$1" in
     test_wrap bin/test_registrar
     test_wrap bin/test_sites
     ;;
-  udmis_tests)
-    test_wrap bin/test_udmis
-    ;;
-  util_tests)
-    test_wrap bin/test_locate
-    ;;
   all_tests)
     run_wrap install_dependencies
     run_wrap code_tests
     run_wrap schema_tests
     run_wrap trace_tests
     run_wrap registrar_tests
-    run_wrap udmis_tests
     ;;
   *)
     usage unrecognized step $1

diff --git a/bin/start_etcd b/bin/start_etcd
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+
+IMAGE=quay.io/coreos/etcd:v3.5.13
+
+docker kill etcd || true
+
+docker run -v /usr/share/ca-certificates/:/etc/ssl/certs \
+       -p 2379:2379 --rm --name etcd ${IMAGE} etcd --version
+
+docker run -d -v /usr/share/ca-certificates/:/etc/ssl/certs \
+       -p 2379:2379 --rm --name etcd ${IMAGE} etcd \
+       -listen-client-urls=http://0.0.0.0:2379 \
+       -advertise-client-urls=http://127.0.0.1:2379
diff --git a/bin/support b/bin/support
@@ -23,7 +23,7 @@ echo Copying cached config files to $OUT_DIR/
 cp $CONFIG_FILES $OUT_DIR/ || true
 
 site_model=
-config_files=$(ls -t $OUT_DIR/*_config.json)
+config_files=$(ls -t $OUT_DIR/*_config.json) || true
 for config in $config_files; do
     site_model=$(jq -r .site_model $config)
     site_model=$(realpath --relative-to=$PWD $site_model)

diff --git a/bin/test_etcd b/bin/test_etcd
@@ -0,0 +1,3 @@
+#/bin/bash -e
+
+udmis/bin/etcdctl member list
diff --git a/bin/test_locate b/bin/test_locate
diff --git a/gencode/docs/configuration_endpoint.html b/gencode/docs/configuration_endpoint.html