Basic state addr schema

.gencode_hash.txt

@@ -1,18 +1,18 @@
 b35646a2f3d7c30fd34e3ea6ab6a1070b39c469fd1de49cab1093ff32faaf06d  gencode/docs/command_discovery.html
-e6f7a9de234b2b794f4bee156847ae918ca92c4e0732d85cc287b5310954ec8d  gencode/docs/command_mapping.html
-64bafb080b454189b7b64a95e049c3427fd1cca70cf0809a31150610f40e9525  gencode/docs/config.html
-51c9ffdd21a0ac3a755d0da07f12c85d411456af3b4ee6ff29e25fa535c3c7bc  gencode/docs/config_mapping.html
+5dc95a70d3253d94426ac7b9d17f11733bfcdb2e24d02bdec5eb3e73168812a9  gencode/docs/command_mapping.html
+6da331f75a665719a8602af9ebeaab382b85c9b68c1cfdef4ed9d49ee6bca255  gencode/docs/config.html
+fa3ff4c3c194d37b1d354a528cf4908974f64a73f962076372340ef2086c6420  gencode/docs/config_mapping.html
 cc4bb19794042f88f3a72b197b4d21736e5cebf6ec47ffac560430e9f580181f  gencode/docs/configuration_endpoint.html
 4da8ddd26aed7428171e1cbc6d134b37e30a958d09ce0f255bbb22b130d26f77  gencode/docs/configuration_execution.html
 77c2f116369b449b1d7700e24bcb9e1596b70e9214df27d6a48c39e2217f1bf4  gencode/docs/configuration_pubber.html
 18b056c945aebc33cfd040808472bfa4b35eeada0e089cbb8dcc636a46b2fae7  gencode/docs/envelope.html
-50c6c681feabc94f30ab4913984dca07a59c5291297b79ec9d7b94d91458b314  gencode/docs/event.html
-857a82b4009fc701129307a6c73d5cc0548ffe989ee580c1db6d18ab841af0fc  gencode/docs/event_discovery.html
-c429af250d4e795f47df087638f6fb1ca99a712d0e85f4bc1abd33806ecd2d85  gencode/docs/event_mapping.html
+2976716dc59460a74fd828db04ec34242a6b5e797a0e1d7e0242b4e298b4e0fc  gencode/docs/event.html
+ed08aea339a2c0750a36fbe5818f5e9983a745c7d5d1befc79a1f2f158253b32  gencode/docs/event_discovery.html
+de67eb31191a424a8e324c41a2c0f2ee922f1fe059f1e4f2f313a7632bf36268  gencode/docs/event_mapping.html
 71fe25d3b17d1dc87b52c049a3235c20527f73e12ffa53fa4800a15e53f73732  gencode/docs/event_pointset.html
-cc47b1957a9b19a2d49db560c5d61d9a35e8b396e20d4555838d5f725c2eab0a  gencode/docs/event_system.html
-145871e4f202a4c444ff80eb9569bb834b079d49d24956a30aa5a1b318f508a4  gencode/docs/event_validation.html
-7ec8ab23cde600ec3f11627c185824fb8ff03e2118200e11aaaf694d0985cc78  gencode/docs/metadata.html
+94a334444a5acf425fb4470354a3fe137bd9b22ff7d5dae98d30716681b704ce  gencode/docs/event_system.html
+eea0d64a97ea7e68319292ddd8d72c44e579fb809923e614a1876f4d146b7991  gencode/docs/event_validation.html
+9e4e1693d52573d28ac2a1958c6b5fba55545f0599ad52ae84a6dbb72b42cdc5  gencode/docs/metadata.html
 9300480de06d728cfe366304b4a06ad1fc135cd27fa5fd3f1bc59e33703044a5  gencode/docs/persistent_device.html
 5d039d607af9ec75ee552dfe36b16c702687ea16f5663f41fc49b4533b86e00d  gencode/docs/properties.html
 392f272c1c8cd047eb6906f2f11ffacc7083c32f639da2437d6a9ca861062ecc  gencode/docs/readme.md
@@ -21,9 +21,9 @@ cc47b1957a9b19a2d49db560c5d61d9a35e8b396e20d4555838d5f725c2eab0a  gencode/docs/e
 741b880216be3743f6747800a042f2dbd89f3b0344c6b0a965f4bc010f03a930  gencode/docs/schema_doc.css
 878ea88206c974f40643c3cc430875f9c4e8c5e3fd6bcd6358bd3eb6d48699a9  gencode/docs/schema_doc.min.js
 7ed934930aee763e0beebc349725ba3909115e8d346bb762f28bcbe745bb163a  gencode/docs/schema_extras.js
-c6c4bdbf7e9760ef0be1ea82e2d4c843817747766f83ea55247d8d4ff353f5ba  gencode/docs/state.html
-c9bb295cad10d5e6deb87e68daac3f5e9f054785c7ddeac0d413a5a75f579e16  gencode/docs/state_mapping.html
-441e7b15e14e7439f83b413b5c6655bc1bcddda72c335716efd86fc35b34e794  gencode/docs/state_validation.html
+f110ae4428cf144daa905dbbdb9ce4238e466c6eac42eb5389c718e3b6c26148  gencode/docs/state.html
+40ace42806c06fee2d3f8cc0e26c0714f9c07a22d07fcf118d43a7e077b25fb0  gencode/docs/state_mapping.html
+ad262ecfe697189f33515039c38d2d12aaf1b365a1f2589dbb48f317bcdd64bc  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
@@ -34,7 +34,7 @@ b9f903444ab08907e41eb123286434ff3207b1edd01397af3ddefb8475bbdadc  gencode/java/u
 fcbed49f1af8b791d8c52bcbe18f65521a79d9ac3eb33ec3afd9b342ab2bfc56  gencode/java/udmi/schema/BlobsetState.java
 2e7c0912c6f43b8dae9e9149b7361d3640bde4f01de6e13d8e487fe01be2c2c0  gencode/java/udmi/schema/Bucket.java
 0a4f6bcd5065418c1cdc6c05b900b3de31744847d25b6ab6de7aabb1e724710e  gencode/java/udmi/schema/BuildingTranslation.java
-8e6bff5601e454f152f8d1831c89403e8d3be747d5870aedcb3bdfe2bddaba59  gencode/java/udmi/schema/Category.java
+982446db41b318f2cd09ceab6eec8848419daaed31fb2eb4c51f186d040d997b  gencode/java/udmi/schema/Category.java
 a2eeff86f4302272736d84602e2ca36a64d27c8ef6761cc05ffb8ad17b030d4d  gencode/java/udmi/schema/CloudModel.java
 ff79de9390aa25bb45fb3e2ebb682c865ccab764f56d9644377d9d28c0ab10e4  gencode/java/udmi/schema/Config.java
 cf9762392e02b5d04c6498963222cc0c00f7be6c3cd82bde3d063a5eceba2b65  gencode/java/udmi/schema/Connections.java
@@ -44,7 +44,7 @@ cf9762392e02b5d04c6498963222cc0c00f7be6c3cd82bde3d063a5eceba2b65  gencode/java/u
 d4a82e132b2d223c4a82384d22455283c0b64aba3100fc210e72f9700b9df2d0  gencode/java/udmi/schema/DeviceValidationEvent.java
 587d67a67431349939dffd37b880c44e798a1eb607d54bd6d8a077bbac668067  gencode/java/udmi/schema/DiscoveryCommand.java
 e809df42a73ed843977e447fa3333140dcdbe7d09b4e88bf1b8fd52fbaf9ae1a  gencode/java/udmi/schema/DiscoveryConfig.java
-6b891a32cdce1edcf320917bc2ea3b93f01761bea5cfcf0597e1c5dedcf1e067  gencode/java/udmi/schema/DiscoveryEvent.java
+822102d69e5c88df4deb924edfdff10937a86a78dc68dd04a1a75696d5fd1b4f  gencode/java/udmi/schema/DiscoveryEvent.java
 04112dd47b0f761131c276c67d3cd8b789d25e6716b5732be9fef14fc6831f1d  gencode/java/udmi/schema/DiscoveryModel.java
 0a11a539707571f79bd82b1958886cecae3209e2daef36dfca885adb4c61a07a  gencode/java/udmi/schema/DiscoveryState.java
 6b93cd56b76045fa06de08a1506be93f8880c7c837f753e0b27ae8a9ffcd0dac  gencode/java/udmi/schema/EndpointConfiguration.java
@@ -54,10 +54,11 @@ dd2eb479a8e93a851c535c8b40fbd62e152bd60e0473f3b23800ec61f798bed0  gencode/java/u
 e9f5c77be81486b6b8c6d88f70f2d50583d8c3fafa2ac09ead80f44b8d5e751e  gencode/java/udmi/schema/Event.java
 3588da3767dc3e51d629b14ecce6f6bb8433beaab787be3d7ba377d60ac372e7  gencode/java/udmi/schema/ExecutionConfiguration.java
 2e77a29988e6c17875d3f781be931e3b835bb310639f60d3bb28f24405a86bed  gencode/java/udmi/schema/FamilyDiscoveryConfig.java
-ae4a645f199c8e24b3303463d428ca17af7603ae9ae9238397a6a82e752ab454  gencode/java/udmi/schema/FamilyDiscoveryEvent.java
+9643391d71c6bd206a4ec69ee7b46ba2bf061b85ccd0bc050046a84df85c8414  gencode/java/udmi/schema/FamilyDiscoveryEvent.java
 5ad9bf328fa1500250ff8bc75f2044b3815c5c11cb368e1cc228ac8ca16639c2  gencode/java/udmi/schema/FamilyDiscoveryState.java
 9959a84eea3e549c142c3edf637c86eb56eca138108ebd51fc2985e45aa41484  gencode/java/udmi/schema/FamilyDiscoveryTestingModel.java
-efb376cd7a80ca74fbf74d3ef3f4101d393341a91d01db36456aa84f6be3d0a5  gencode/java/udmi/schema/FamilyLocalnetModel.java
+6c4d5e6a713c9df0d46afac2a3967eee2f087821604f3d9d6a2ff51696486f3f  gencode/java/udmi/schema/FamilyLocalnetModel.java
+a7ad0cf79a86a92c8d22b5ac3e609f321454ba4834065e24de208b1f6ebba447  gencode/java/udmi/schema/FamilyLocalnetState.java
 c2dd28041f1c856b28de5fdc7ac161f4c6da3abfb22f156d2b51e71116b515db  gencode/java/udmi/schema/FeatureEnumerationEvent.java
 d3fdb2d8b485c1e61786dfde45cc8be08294339bb31a1b8f02180485789a3ab2  gencode/java/udmi/schema/FeatureValidationState.java
 60a8115ae1acae7c199b63180823198d38ec50d57b48dd85aca1ccc865058f85  gencode/java/udmi/schema/GatewayConfig.java
@@ -67,6 +68,7 @@ b0d4bff14a65ebddc2dd253c996708a4cce99592e82978f057f32a6d9c7768a1  gencode/java/u
 a5e5adfc187709e8646a11c92e804acfb67743f9d72149008aaca954df3177f6  gencode/java/udmi/schema/Level.java
 07fd4911363437b274c19b024759b04b116152176702da8d4203c4ff4cb55b7f  gencode/java/udmi/schema/LocalnetConfig.java
 910c68183db7703b00bcb81146ad73e6fe0d4bbc4caec4dc9c621f3cc2e5eee5  gencode/java/udmi/schema/LocalnetModel.java
+fbd50211341169f0cf60e15cb7fc7441348621c059aa0dd122e5bf6cbed1bbb5  gencode/java/udmi/schema/LocalnetState.java
 2df4ae32d0bbecc21f7c3f6a416a195baa766a6210cfa8abca4a7bb45b9c7961  gencode/java/udmi/schema/Location.java
 ccc7c234dd522a91d387d55573677681bbc5a6926f0fbf1101c2e9f607cafd63  gencode/java/udmi/schema/MappingCommand.java
 0f6f85a4aaffb90735acc2565e8e4afa349d3ded5781cb1dce1ebbaa237feaa7  gencode/java/udmi/schema/MappingConfig.java
@@ -96,7 +98,7 @@ abe99dd74122c186403baa6982300a9d5968f8bbb7a67b1689104111b98f32fb  gencode/java/u
 6106698c615a2de50e81cf6378250529604f56aaa119208abb27203c6e260538  gencode/java/udmi/schema/SequenceValidationState.java
 2c8e43204c00a57c26c9bfd19f0f385991eb9855072c0556ac1732344a10270b  gencode/java/udmi/schema/SetupReflectorConfig.java
 649c0291ad81421fc51da0c2f7da3286628127157a5a6eef77610e8c37c14941  gencode/java/udmi/schema/SetupReflectorState.java
-580df660dad1b97399002271716d597f72aa1a6110a49de9e162104c231752f4  gencode/java/udmi/schema/State.java
+9dc7e377f3392d35b5b4da3d1bbeb5e8d9a375a13ec6c852c478112cf26d8006  gencode/java/udmi/schema/State.java
 47ad54328160a1aabce719a3263d4bfea903e8e8255e04a54ace86eb095b0f0c  gencode/java/udmi/schema/StateSystemHardware.java
 c9b920d355e5f6350fa6eb978afbfe55dd1438df171d2ea215845d5ac0b3e7e9  gencode/java/udmi/schema/StateSystemOperation.java
 d771dcb6bd06620e4e21419420d252b1f4aa0c55d0be315d6310299cebff56d6  gencode/java/udmi/schema/SystemConfig.java
@@ -112,7 +114,7 @@ ac6f8fd87c8986cce01e872460c15ff6fe71e3816f9bde610acfe25f7d38c8d4  gencode/java/u
 7d7ade206dbaee9991b7b6875ced6a12bf7d1a07ed04309e63535d6e786a23b9  gencode/java/udmi/schema/ValidationState.java
 e007ddd1ceeae3603c85110c33e1bb4a418ff9c7a791ca0df25b7ea3caeafd36  gencode/java/udmi/schema/ValidationSummary.java
 b77d953fd22e655c0f10ae32deeaa222769d971f8c38b3379eba45720fb910cc  gencode/java/udmi/schema/VirtualEquipmentLinks.java
-0aa4f549ba1ef60a36405b01bf703abf1cd13d91f689b556f3a586fed0bb0a84  gencode/python/udmi/schema/__init__.py
+8907a9be9c19ef877ddb8d18a036a1a0d2d80393e4d05d81d9ccd7d7810f1179  gencode/python/udmi/schema/__init__.py
 4b25dd95f863059b761269f93adcae7049507924a1c6e74d6856849203c179db  gencode/python/udmi/schema/ancillary_properties.py
 dab4f5fca272ec48c2881bca2b6bc43786ada47fa1f6dd935c35f7ce0eb6b0f6  gencode/python/udmi/schema/building_translation.py
 470b688984b89b25fcdfa8e08bd95b0c5d8c551d53a6ab5512503ee39419e6fa  gencode/python/udmi/schema/category.py
@@ -125,7 +127,7 @@ b975892df78076dabc797b4c0be87f20b33eacda11f9d1ac1c09be33d4937a87  gencode/python
 7a6411ba2646881ffad5b6ad472c980e48a11b36ab2c9c77d12608ccc7225594  gencode/python/udmi/schema/config_discovery.py
 a5edb9ac5ecd5a4459f93ce613691735f299f35718f2e35410206fc91c263dd1  gencode/python/udmi/schema/config_discovery_family.py
 b461bdc24310ef972faf579b5be577b5af67fb0977d6afb4c42955211b26e3d5  gencode/python/udmi/schema/config_gateway.py
-8b2bf3e753c09e375f0fd59dcf1f0be61205ed247160b7a8718cb3b9ebef2c30  gencode/python/udmi/schema/config_localnet.py
+297c1650d469d2e55fb2358d094dba5430accab2b5fd7b2b6598d7dafb3bd350  gencode/python/udmi/schema/config_localnet.py
 ac3facbd96f7cb2f7e387e7497d6a36af379a2687329571f250c5670f9933244  gencode/python/udmi/schema/config_mapping.py
 1867ee8f1f4552ff121b7a2a62815817b2c9939a8817f1e093fbd688b8faa1a4  gencode/python/udmi/schema/config_mapping_device.py
 9eab64849e04b25203d5da47856c3f8dda2b96903e4dc43ab932ee35014700bd  gencode/python/udmi/schema/config_pointset.py
@@ -138,8 +140,8 @@ bbaa2d9322d0c92282116c4a28edbb363d01681dc093e6463999f127aa108f51  gencode/python
 ccd7dfb6aef2835be999688ad841c16cea127b6ab272873870cefb7fae6adc45  gencode/python/udmi/schema/envelope.py
 ed8ace0196c5e99d20778cb4210aa88cfe44a5e4539af98a1e194b9a71fa538e  gencode/python/udmi/schema/equipment_translation.py
 1eb9019b9d0b4ff7de2df8beb625a4f89292d636ece0c02f160495c537bd6c2c  gencode/python/udmi/schema/event.py
-c377e60657bb42ac510d2ea075ae5cb26c3fd9eae18867c7a0b52ff4c0ef3eab  gencode/python/udmi/schema/event_discovery.py
-ad33b91a7fabb4eed7e49c30a983a2106c96330facbe0f376f94d06e2263d6d0  gencode/python/udmi/schema/event_discovery_family.py
+9090b5765a6c3868f362b2b46c08a9ea21bb5d8ae6832c768db7b5de4923ac6a  gencode/python/udmi/schema/event_discovery.py
+4f63fe1ce9493a5dcaf2c2bad84b5c279e54eb4de17b26a79a21dc17563c1f02  gencode/python/udmi/schema/event_discovery_family.py
 c4275c18624ed7833c2b86c900cead1cf98bef88c6299ce0b03d74a093e73b9a  gencode/python/udmi/schema/event_discovery_feature.py
 42e6fb6edda2b6aeae5e5b48ae66f87a5daf336bca1e746b1157e8f1ce31d5d5  gencode/python/udmi/schema/event_discovery_point.py
 50bdecfa353d86d04a1ad0ebac5b3625f8fd4ee8a1e2f8e51b29055a37d9685c  gencode/python/udmi/schema/event_mapping.py
@@ -156,7 +158,7 @@ b2227a48f21594f78c07c427de64e7ce51dc0ecd4b8091601d739a5f5038a2c9  gencode/python
 44d057dffcac3a994e7b894f8e1ebb643ba49d7dbfbb0bfea9cc04f97af0bc47  gencode/python/udmi/schema/model_discovery_family.py
 9416018a6d01094ab7af77c35ae4e5e2271a5d52c3bd3e381a541650415048b2  gencode/python/udmi/schema/model_gateway.py
 ae6a7bc93b520cdc90cd158f876a58e98a3e000402ebb1ca632f01ee492d408a  gencode/python/udmi/schema/model_localnet.py
-4718368765cacc2cbf552a65346452a14690d0175e9cc921fc576a5c7691fa1d  gencode/python/udmi/schema/model_localnet_family.py
+15437819e992231f9c1be86f7d9c74f2ea73efe0101fda65c0bbaaeb78e6bf93  gencode/python/udmi/schema/model_localnet_family.py
 abe431dc7702c80992b2c9736ab924d80d1033493036976f0cefa8c2108227be  gencode/python/udmi/schema/model_pointset.py
 1ad65c005d865b9259bfa239b2dc4cd1cde13d312ecbc7843bb61cc31d6cabde  gencode/python/udmi/schema/model_pointset_point.py
 ee9c02c35438fb7d9aacb15a21ec7b35b533c1000d0bde044ec3923b1fdccca4  gencode/python/udmi/schema/model_system.py
@@ -168,12 +170,14 @@ e5873d82a3b3b550e3a5aef71d5656141bc6dbab9bf96d8fc1797d2ee7ae1ff4  gencode/python
 a58f8c98e837a5b56126ca0f410e02f1e9cfcd80a8cb429e0ef522defab1f690  gencode/python/udmi/schema/properties.py
 7fd3cd24bc9704778eba11696d21c4e88a35aea6e37e468d88666bc40eaafbad  gencode/python/udmi/schema/reflect_config.py
 1a4eef286957d77418777eb7f4cd1ee13aa24c2d916ec71a7ff4e56de76e303e  gencode/python/udmi/schema/reflect_state.py
-32bc70a30e37e89cfae14b44add18d546a6f9e00a3ec3519ede9c7486114d39c  gencode/python/udmi/schema/state.py
+03880d929419402a76e1ff1ae3faec7520eff6b8b632d19dc13de70f0f9873f2  gencode/python/udmi/schema/state.py
 4a908cee3fb8afb559bcbfa594e57dbc515a35e4468e02600751b2fcce05a238  gencode/python/udmi/schema/state_blobset.py
 b7f07c4a74dcd5262cb3eb817cc568f73efd253c3ae5be44620a0204507105a6  gencode/python/udmi/schema/state_blobset_blob.py
 8c6fc5fd63ab50768cb3662228ed893eb8b9d563cd062efaed12f5079a652d0c  gencode/python/udmi/schema/state_discovery.py
 187400078dfc89912062ca1ad92f61e32d28126ae56119d83e6767d58cda1117  gencode/python/udmi/schema/state_discovery_family.py
 05e82aa15c64842e206ae8ce3d5810d115bb890d009ea5d657822fad0e0d2165  gencode/python/udmi/schema/state_gateway.py
+2a128e51eb51c70f19e7847ecfaa048a42e370b0d64198b5db782bcc03e19949  gencode/python/udmi/schema/state_localnet.py
+8570625c25d99fb5e4033d594c9210abce8117fcc40088782a596d8ab53c8f29  gencode/python/udmi/schema/state_localnet_family.py
 cb6a5558fe87dea5bce9e1cc6b22984a7d8c379babc4941c50df13edad36579a  gencode/python/udmi/schema/state_mapping.py
 f2a76b32a5568d87a8c9ca8b32dc8a129bc7386f9522c5399d32db433be4cb70  gencode/python/udmi/schema/state_mapping_device.py
 3520ad936af70b414d9e7f90e606a011768bc4ee3bf1248714acc517ee9b393d  gencode/python/udmi/schema/state_pointset.py

.github/workflows/testing.yml

@@ -74,35 +74,20 @@ jobs:
         if: "${{ env.GCP_TARGET_PROJECT != '' }}"
         run: |
           bin/test_redirect $GCP_TARGET_PROJECT
-      - name: pubber cmd checks
+      - name: pubber logs #1
         env:
           GCP_TARGET_PROJECT: ${{ secrets.GCP_TARGET_PROJECT }}
         if: "${{ env.GCP_TARGET_PROJECT != '' }}"
         run: |
           echo ::::::: pubber.out.1
           cat pubber.out.1
-          echo :::::::
-          echo Simple checks that a redirect happened and failed
-          fgrep registries/ZZ-TRI-FECTA/devices pubber.out.1
-          fgrep registries/missing/devices pubber.out.1
-          fgrep 'While waiting for connection start: Connection error' pubber.out.1
-          fgrep 'Endpoint connection restored to last working endpoint' pubber.out.1
-      - name: pubber config checks
+      - name: pubber logs #2
         env:
           GCP_TARGET_PROJECT: ${{ secrets.GCP_TARGET_PROJECT }}
         if: "${{ env.GCP_TARGET_PROJECT != '' }}"
         run: |
           echo ::::::: pubber.out.2
           cat pubber.out.2
-          echo :::::::
-          echo Check the redirect-by-config setup
-          fgrep registries/ZZ-TRI-FECTA/devices pubber.out.2
-          fgrep registries/reconfigure/devices pubber.out.2
-          fgrep 'While waiting for connection start: Connection error' pubber.out.2
-          fgrep 'Endpoint connection restored to last working endpoint' pubber.out.2
-          fgrep 'Stopping system with extreme prejudice, restart true' pubber.out.2  # restart config
-          fgrep 'Stopping system with extreme prejudice, restart false' pubber.out.2  # auto-kill
-          fgrep 'Done with pubber run, exit code 193' pubber.out.2  # last_start auto-kill check
 
   udmi:
     name: Integration Tests

.wordlist.txt

@@ -159,3 +159,4 @@ validator
 writeback
 Writeback
 yaml
+localnet

bin/augment_metadata

@@ -0,0 +1,43 @@
+#!/bin/bash -e
+#
+# Modify the indicated device metadata.json file with bits for testing. Only really useful in controlled
+# situations where, e.g., the MAC address of the pubber system needs to be dynamically extracted by
+# the testing infrastrucure. Not intended for use outside of CI testing.
+#
+
+ROOT_DIR=$(dirname $0)/..
+cd $ROOT_DIR
+
+if [[ $# -ne 2 ]]; then
+    echo Usage: $0 SITE_DIR DEVICE_ID
+    false
+fi
+
+site_dir=$1
+device_id=$2
+shift 2
+
+device_dir=$site_dir/devices/$device_id
+mkdir -p $device_dir/out
+metadata_file=$device_dir/metadata.json
+metadata_out=$site_dir/out/devices/$device_id/metadata_mod.json
+# TODO: Implement some mechanism to auto-detect if _norm.json already exists and is up-to-date, and use that.
+
+# Get the interface with the lowest default route metric.
+default_iface=$(ip route | fgrep default | awk '{print $11, $5}' | sort -n | head -n 1 | awk '{print $2}')
+
+# Get the ethernet mac address
+ether_addr=$(ip addr show dev $default_iface | fgrep ether | awk '{print $2}')
+ipv4_addr=$(ip addr show dev $default_iface | fgrep 'inet ' | awk '{print $2}')
+ipv4_addr=${ipv4_addr%/*}
+ipv6_addr=$(ip addr show dev $default_iface | fgrep 'inet6 ' | awk '{print $2}')
+ipv6_addr=${ipv6_addr%/*}
+
+echo Setting $metadata_out ether addr to $ether_addr
+echo Setting $metadata_out ipv4 addr to $ipv4_addr
+echo Setting $metadata_out ipv6 addr to $ipv6_addr
+jq ".localnet.families.ether.addr = \"$ether_addr\"" $metadata_file |
+    jq ".localnet.families.ipv4.addr = \"$ipv4_addr\"" |
+    jq ".localnet.families.ipv6.addr = \"$ipv6_addr\"" > $metadata_out
+
+ls -l $metadata_file $metadata_out

bin/clone_model

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

bin/cloud_logs

@@ -1,6 +1,7 @@
 #!/bin/bash -e
 
 project_id=$1
+shift
 
 if [[ -z $project_id ]]; then
    echo $0 [project_id]
@@ -9,6 +10,6 @@ fi
 
 for function in udmi_config udmi_target udmi_state udmi_reflect; do
     echo Capturing $function.log...
-    gcloud --project=$project_id functions logs read $function --sort-by=time_utc --limit=1000 > $function.log
+    gcloud --project=$project_id functions logs read $function $@ --sort-by=time_utc --limit=1000 > $function.log
 done