From e1b7b29773b48967bb6666c0fa04719660236bb4 Mon Sep 17 00:00:00 2001
From: Trevor <grafnu@users.noreply.github.com>
Date: Fri, 23 Jun 2023 21:06:59 -0700
Subject: [PATCH] UDMIS dynamic switching between ClearBlade and GCP for IoT
 Core (#669)

---
 .gencode_hash.txt                             |  15 ++-
 .../com/google/udmi/util/GeneralUtils.java    |  10 +-
 gencode/docs/configuration_execution.html     |   2 +-
 gencode/docs/configuration_pod.html           |  97 +++++++++++---
 .../udmi/schema/ExecutionConfiguration.java   |  54 +-------
 gencode/java/udmi/schema/IotAccess.java       |  56 +++++++-
 .../java/udmi/schema/PodConfiguration.java    |   4 +-
 gencode/python/udmi/schema/__init__.py        |   1 +
 gencode/python/udmi/schema/access_iot.py      |  42 ++++++
 .../python/udmi/schema/configuration_pod.py   |  46 +------
 pubber/build.gradle                           |   7 +-
 schema/access_iot.json                        |  13 ++
 schema/common.json                            |   2 +
 schema/configuration_pod.json                 |  12 +-
 udmis/.idea/compiler.xml                      |   4 +-
 udmis/.idea/misc.xml                          |   2 +-
 .../UdmiServicePod_configured.xml             |   2 +-
 udmis/Dockerfile.udmis                        |  10 +-
 udmis/bin/container                           |   6 +-
 udmis/bin/run                                 |   4 +-
 udmis/build.gradle                            |   6 +-
 udmis/etc/gcp_pod.json                        |   6 +-
 udmis/k8s_deployment.yaml                     |  11 +-
 udmis/k8s_pod.yaml                            |  18 +--
 .../access/ClearBladeIotAccessProvider.java   |  60 ++++++---
 .../access/DynamicIotAccessProvider.java      | 125 ++++++++++++++++++
 .../service/access/GcpIotAccessProvider.java  |  44 +++---
 .../service/access/IotAccessProvider.java     |  39 ++++--
 .../udmi/service/core/ReflectProcessor.java   |  39 +++---
 .../bos/udmi/service/core/StateProcessor.java |   9 +-
 .../bos/udmi/service/core/UdmisComponent.java |   6 +-
 .../bos/udmi/service/pod/UdmiServicePod.java  |  11 +-
 udmis/src/test/configs/clearblade_pod.json    |   6 +-
 udmis/src/test/configs/dynamic_pod.json       |  30 +++++
 udmis/src/test/configs/gcp_pod.json           |   6 +-
 .../ClearBladeIotAccessProviderTest.java      |   4 +-
 .../access/DynamicIotAccessProviderTest.java  |  13 ++
 .../access/GcpIotAccessProviderTest.java      |   9 +-
 .../service/core/ReflectProcessorTest.java    |  54 ++++----
 .../udmi/service/pod/UdmiServicePodTest.java  |   4 +-
 udmis/udmis.iml                               |   2 +-
 validator/build.gradle                        |   7 +-
 .../bos/iot/core/proxy/MqttPublisher.java     |   4 +-
 .../google/daq/mqtt/registrar/Registrar.java  |   3 +-
 .../google/daq/mqtt/util/CloudIotManager.java |   8 +-
 .../google/daq/mqtt/validator/Validator.java  |   2 +-
 validator/validator.iml                       |   2 +-
 47 files changed, 629 insertions(+), 288 deletions(-)
 create mode 100644 gencode/python/udmi/schema/access_iot.py
 create mode 100644 schema/access_iot.json
 create mode 100644 udmis/src/main/java/com/google/bos/udmi/service/access/DynamicIotAccessProvider.java
 create mode 100644 udmis/src/test/configs/dynamic_pod.json
 create mode 100644 udmis/src/test/java/com/google/bos/udmi/service/access/DynamicIotAccessProviderTest.java

diff --git a/.gencode_hash.txt b/.gencode_hash.txt
index 503584e540..a42e6ef27e 100644
--- a/.gencode_hash.txt
+++ b/.gencode_hash.txt
@@ -3,8 +3,8 @@ b35646a2f3d7c30fd34e3ea6ab6a1070b39c469fd1de49cab1093ff32faaf06d  gencode/docs/c
 e693079943921c88e24140521637c58bc9aadfb9aee96dfba414bbaa7be958d0  gencode/docs/config.html
 be1a8f90f09893f0dec4eea418c3134b0f2525a555c64548564ff767abf3cfbe  gencode/docs/config_mapping.html
 7933c756d45dfb24f9f6e34661b98126654fd58a61e81b7434f7cd0d578226b8  gencode/docs/configuration_endpoint.html
-ee5ab92a146772420f511f42db92992c91ca4cd0ee819f3d5e5fb0c584e5b91c  gencode/docs/configuration_execution.html
-f53ff402d0229a94b6b951ccfe451320a0ce3114c25dca3c390e549cfc87dc19  gencode/docs/configuration_pod.html
+a580d0aed508642dfd537540a269b99f56593dde7eadbce82fba2802708c2efa  gencode/docs/configuration_execution.html
+18eb64d2798022402c0e4cdb56fa6a9f62c1ecb7004b2b17c2395ce287fba612  gencode/docs/configuration_pod.html
 732c6acc2116974000ec25bfdfa00ba6e3c5c2af13d0e3a0d71b3d4b8eeda059  gencode/docs/configuration_pubber.html
 0428bbfb1c46c66d9ee0c90cb89f36f4f9be5fc535aabace698716978bf50876  gencode/docs/event.html
 09bb8486e02f703768a09d5755753fe232d651555a1219d1101a37d21a1368b7  gencode/docs/event_discovery.html
@@ -54,7 +54,7 @@ dd2eb479a8e93a851c535c8b40fbd62e152bd60e0473f3b23800ec61f798bed0  gencode/java/u
 06758aca1e0043ddf343b504030f47bb19260e99a82e2d66f12e86092a2434ca  gencode/java/udmi/schema/Enumerate.java
 05e3443f9a9da29ed561310b13be1d14459d9dfe292a438e42af2fbd2165a606  gencode/java/udmi/schema/Envelope.java
 e9f5c77be81486b6b8c6d88f70f2d50583d8c3fafa2ac09ead80f44b8d5e751e  gencode/java/udmi/schema/Event.java
-27eb7fb05ca354955392b45584eab2a77bd7d12f099000f69ba3d01d5f62a45b  gencode/java/udmi/schema/ExecutionConfiguration.java
+a4778cf4ebd7f280f7773cc00528e50b058b7405391856d71b20d2d43294ca41  gencode/java/udmi/schema/ExecutionConfiguration.java
 2e77a29988e6c17875d3f781be931e3b835bb310639f60d3bb28f24405a86bed  gencode/java/udmi/schema/FamilyDiscoveryConfig.java
 9643391d71c6bd206a4ec69ee7b46ba2bf061b85ccd0bc050046a84df85c8414  gencode/java/udmi/schema/FamilyDiscoveryEvent.java
 5ad9bf328fa1500250ff8bc75f2044b3815c5c11cb368e1cc228ac8ca16639c2  gencode/java/udmi/schema/FamilyDiscoveryState.java
@@ -66,7 +66,7 @@ d3fdb2d8b485c1e61786dfde45cc8be08294339bb31a1b8f02180485789a3ab2  gencode/java/u
 60a8115ae1acae7c199b63180823198d38ec50d57b48dd85aca1ccc865058f85  gencode/java/udmi/schema/GatewayConfig.java
 56b46f4914ef1f4baa59bf597186ff7901b7c8b607720ec798f4e4e6ad59aa08  gencode/java/udmi/schema/GatewayModel.java
 e0e7739046e834c0f0ca6a70b38b4579618899be3162887a0fa7ab60bbff22a5  gencode/java/udmi/schema/GatewayState.java
-ecfc1d743cef14420b1b637b80b68c4584a58da48986103b6cb426baecc83bef  gencode/java/udmi/schema/IotAccess.java
+93a37c0fc8d5c59c50e670164109d78e4b7124cd3106fc7c8ebf3497c6f42c27  gencode/java/udmi/schema/IotAccess.java
 b0d4bff14a65ebddc2dd253c996708a4cce99592e82978f057f32a6d9c7768a1  gencode/java/udmi/schema/Jwt.java
 a5e5adfc187709e8646a11c92e804acfb67743f9d72149008aaca954df3177f6  gencode/java/udmi/schema/Level.java
 07fd4911363437b274c19b024759b04b116152176702da8d4203c4ff4cb55b7f  gencode/java/udmi/schema/LocalnetConfig.java
@@ -84,7 +84,7 @@ df64e4ddbf543ac70e7c2af9d3fbc20ffe3dff68c6718aa9ceadab7f64d3d171  gencode/java/u
 b3b7ef6cae004d5fdb4052f860df0aa583df87bb798a027fc769aeaf16489789  gencode/java/udmi/schema/MonitoringMetric.java
 3896bacd5b35b37f88bea402947aae7f2f7bab6e63bc30517381158ba0826602  gencode/java/udmi/schema/Operation.java
 5e1c5411fae4d7c47391ceb5d19ae864fcd484df75ac6b6db39fd2d12647dec8  gencode/java/udmi/schema/Physical_tag.java
-635584cac5f01774bbfc6b2d41f15d5039cbbe1b90c8b0a97fa9133cdbc40962  gencode/java/udmi/schema/PodConfiguration.java
+679d530693e6f1a32edc328bb8f62af7c27d24227fdfa919498eac9645578899  gencode/java/udmi/schema/PodConfiguration.java
 d808259db6bbcd26ecf438844ce286d15d4750906be24588d97acfbe8a4ae315  gencode/java/udmi/schema/PointEnumerationEvent.java
 eb478a6ebd66b150da8d6dc8fdf05a10d09d6d0ea1df8a0578728703718c5551  gencode/java/udmi/schema/PointPointsetConfig.java
 8f3fc1cdc2dcd3e524863f4675aebabc450a35f5fd1cdc3fd37289b5cab7f2ec  gencode/java/udmi/schema/PointPointsetEvent.java
@@ -120,7 +120,8 @@ ac6f8fd87c8986cce01e872460c15ff6fe71e3816f9bde610acfe25f7d38c8d4  gencode/java/u
 b1dbcd3f4b5c34651d5a4f22feae54344b5b643226ded921d8fa2c37c3ffd1e7  gencode/java/udmi/schema/ValidationState.java
 e007ddd1ceeae3603c85110c33e1bb4a418ff9c7a791ca0df25b7ea3caeafd36  gencode/java/udmi/schema/ValidationSummary.java
 b77d953fd22e655c0f10ae32deeaa222769d971f8c38b3379eba45720fb910cc  gencode/java/udmi/schema/VirtualEquipmentLinks.java
-02fc67509f185f3556856588645bddbee3458fe365be2b779c3413b54163c45a  gencode/python/udmi/schema/__init__.py
+a53342802ea70e6529a8502f145c3bd0490bb189ceb1939ae8d123f3e9cde088  gencode/python/udmi/schema/__init__.py
+19c37b9957bc0ccfeee77133a275fea8d912b131320c7f45054735ed282fb996  gencode/python/udmi/schema/access_iot.py
 4b25dd95f863059b761269f93adcae7049507924a1c6e74d6856849203c179db  gencode/python/udmi/schema/ancillary_properties.py
 dab4f5fca272ec48c2881bca2b6bc43786ada47fa1f6dd935c35f7ce0eb6b0f6  gencode/python/udmi/schema/building_translation.py
 470b688984b89b25fcdfa8e08bd95b0c5d8c551d53a6ab5512503ee39419e6fa  gencode/python/udmi/schema/category.py
@@ -143,7 +144,7 @@ cce623b34fd694880039a1c080214c33e00acaef5bc72276cf11a3bb2de40000  gencode/python
 5e615089842674a183a2218b7e518c3581795df3a4cf9cb77ffcebf347dfe0c0  gencode/python/udmi/schema/config_udmi.py
 c35c1a4d37220b8f3b87d66152253160cfcd5a710fa58af51dfe3abe0a83021a  gencode/python/udmi/schema/configuration_endpoint.py
 da1ca9aec0b35d3af956d7c908b8285d1df5ec545f67a3727c54ccce22f4724c  gencode/python/udmi/schema/configuration_execution.py
-43280b007ec2af213c72a55540dcad93f2b5ed17024ade033606827d631e086f  gencode/python/udmi/schema/configuration_pod.py
+498cdf9417f0a6cf832617025b6cc21771809d40cd2887bcd760701443b32e53  gencode/python/udmi/schema/configuration_pod.py
 11c8841ed5c2a5bcaf4b44c943c8f70fcb5010f1027a025b46300435353b2432  gencode/python/udmi/schema/configuration_pod_bridge.py
 7f4f8c1a6ead34bf72b9134b97a39001752eb0f9647fafaac82ced4bb2f46b88  gencode/python/udmi/schema/configuration_pubber.py
 fbb4b2c04c170c0da5cdd868612429fe920e44b591fcad2522b2e047d580d537  gencode/python/udmi/schema/entry.py
diff --git a/common/src/main/java/com/google/udmi/util/GeneralUtils.java b/common/src/main/java/com/google/udmi/util/GeneralUtils.java
index 90873f17cd..ec1669f976 100644
--- a/common/src/main/java/com/google/udmi/util/GeneralUtils.java
+++ b/common/src/main/java/com/google/udmi/util/GeneralUtils.java
@@ -15,17 +15,18 @@
 import java.io.PrintStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.security.spec.ECField;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Optional;
+import java.util.TreeMap;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Supplier;
+import java.util.stream.Collector;
 import java.util.stream.Collectors;
-import javax.annotation.Nullable;
 
 public class GeneralUtils {
 
@@ -123,6 +124,11 @@ public static <T> T fromJsonString(String body, Class<T> valueType) {
     }
   }
 
+  public static <T> Collector<Entry<String, T>, ?, TreeMap<String, String>> sortedMapCollector(
+      Function<Entry<String, T>, String> prioritizer) {
+    return Collectors.toMap(prioritizer, Entry::getKey, GeneralUtils::mapReplace, TreeMap::new);
+  }
+
   public static String toJsonString(Object object) {
     try {
       if (object == null) {
diff --git a/gencode/docs/configuration_execution.html b/gencode/docs/configuration_execution.html
index 66a9bd98a9..53a20f8340 100644
--- a/gencode/docs/configuration_execution.html
+++ b/gencode/docs/configuration_execution.html
@@ -352,7 +352,7 @@ <h2 class="mb-0">
 
     <div class="enum-value" id="iot_provider_enum">
                 <h4>Must be one of:</h4>
-                <ul class="list-group"><li class="list-group-item enum-item">"gcp_native"</li><li class="list-group-item enum-item">"gcp"</li><li class="list-group-item enum-item">"clearblade"</li></ul>
+                <ul class="list-group"><li class="list-group-item enum-item">"dynamic"</li><li class="list-group-item enum-item">"gcp_native"</li><li class="list-group-item enum-item">"gcp"</li><li class="list-group-item enum-item">"clearblade_native"</li><li class="list-group-item enum-item">"clearblade"</li></ul>
                 </div>
             
 
diff --git a/gencode/docs/configuration_pod.html b/gencode/docs/configuration_pod.html
index 83023bd0b5..a54aab76c1 100644
--- a/gencode/docs/configuration_pod.html
+++ b/gencode/docs/configuration_pod.html
@@ -3959,18 +3959,61 @@ <h2 class="mb-0">
             
 
             
-<div class="accordion" id="accordioniot_access_provider">
+<div class="accordion" id="accordioniot_access_pattern1">
     <div class="card">
-        <div class="card-header" id="headingiot_access_provider">
+        <div class="card-header" id="headingiot_access_pattern1">
             <h2 class="mb-0">
-                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#iot_access_provider"
-                        aria-expanded="" aria-controls="iot_access_provider" onclick="setAnchor('#iot_access_provider')"><span class="property-name">provider</span></button>
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#iot_access_pattern1"
+                        aria-expanded="" aria-controls="iot_access_pattern1" onclick="setAnchor('#iot_access_pattern1')"><span class="property-name">^[a-z]+$</span> <span class="badge badge-info pattern-property">Pattern Property</span></button>
             </h2>
         </div>
 
-        <div id="iot_access_provider"
-             class="collapse property-definition-div" aria-labelledby="headingiot_access_provider"
-             data-parent="#accordioniot_access_provider">
+        <div id="iot_access_pattern1"
+             class="collapse property-definition-div" aria-labelledby="headingiot_access_pattern1"
+             data-parent="#accordioniot_access_pattern1">
+            <div class="card-body pl-5"><h2 class="handle">
+                        <label>Pattern Property</label>
+                    </h2>
+                    <p>All property whose name matches the following regular expression must respect the following conditions</p>
+                    <span class="pattern-value">Property name regular expression: <code>^[a-z]+$</code></span>
+                    <br/>
+
+    <div class="breadcrumbs">root
+        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+            <path
+                fill-rule="evenodd"
+                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
+            />
+        </svg>
+    <a href="#iot_access" onclick="anchorLink('iot_access')">iot_access</a>
+        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+            <path
+                fill-rule="evenodd"
+                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
+            />
+        </svg>
+    <a href="#iot_access_pattern1" onclick="anchorLink('iot_access_pattern1')">access_iot.json</a></div><span class="badge badge-dark value-type">Type: object</span><br/>
+
+
+     <span class="badge badge-info no-additional">No Additional Properties</span>
+            
+
+            
+            
+
+            
+<div class="accordion" id="accordioniot_access_pattern1_provider">
+    <div class="card">
+        <div class="card-header" id="headingiot_access_pattern1_provider">
+            <h2 class="mb-0">
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#iot_access_pattern1_provider"
+                        aria-expanded="" aria-controls="iot_access_pattern1_provider" onclick="setAnchor('#iot_access_pattern1_provider')"><span class="property-name">provider</span></button>
+            </h2>
+        </div>
+
+        <div id="iot_access_pattern1_provider"
+             class="collapse property-definition-div" aria-labelledby="headingiot_access_pattern1_provider"
+             data-parent="#accordioniot_access_pattern1_provider">
             <div class="card-body pl-5">
 
     <div class="breadcrumbs">root
@@ -3987,12 +4030,19 @@ <h2 class="mb-0">
                 d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
             />
         </svg>
-    <a href="#iot_access_provider" onclick="anchorLink('iot_access_provider')">provider</a></div><span class="badge badge-dark value-type">Type: enum (of string)</span><br/>
+    <a href="#iot_access_pattern1" onclick="anchorLink('iot_access_pattern1')">Iot Access</a>
+        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+            <path
+                fill-rule="evenodd"
+                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
+            />
+        </svg>
+    <a href="#iot_access_pattern1_provider" onclick="anchorLink('iot_access_pattern1_provider')">provider</a></div><span class="badge badge-dark value-type">Type: enum (of string)</span><br/>
 
 
-    <div class="enum-value" id="iot_access_provider_enum">
+    <div class="enum-value" id="iot_access_pattern1_provider_enum">
                 <h4>Must be one of:</h4>
-                <ul class="list-group"><li class="list-group-item enum-item">"gcp_native"</li><li class="list-group-item enum-item">"gcp"</li><li class="list-group-item enum-item">"clearblade"</li></ul>
+                <ul class="list-group"><li class="list-group-item enum-item">"dynamic"</li><li class="list-group-item enum-item">"gcp_native"</li><li class="list-group-item enum-item">"gcp"</li><li class="list-group-item enum-item">"clearblade_native"</li><li class="list-group-item enum-item">"clearblade"</li></ul>
                 </div>
             
 
@@ -4004,18 +4054,18 @@ <h4>Must be one of:</h4>
         </div>
     </div>
 </div>
-<div class="accordion" id="accordioniot_access_project_id">
+<div class="accordion" id="accordioniot_access_pattern1_project_id">
     <div class="card">
-        <div class="card-header" id="headingiot_access_project_id">
+        <div class="card-header" id="headingiot_access_pattern1_project_id">
             <h2 class="mb-0">
-                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#iot_access_project_id"
-                        aria-expanded="" aria-controls="iot_access_project_id" onclick="setAnchor('#iot_access_project_id')"><span class="property-name">project_id</span></button>
+                <button class="btn btn-link property-name-button" type="button" data-toggle="collapse" data-target="#iot_access_pattern1_project_id"
+                        aria-expanded="" aria-controls="iot_access_pattern1_project_id" onclick="setAnchor('#iot_access_pattern1_project_id')"><span class="property-name">project_id</span></button>
             </h2>
         </div>
 
-        <div id="iot_access_project_id"
-             class="collapse property-definition-div" aria-labelledby="headingiot_access_project_id"
-             data-parent="#accordioniot_access_project_id">
+        <div id="iot_access_pattern1_project_id"
+             class="collapse property-definition-div" aria-labelledby="headingiot_access_pattern1_project_id"
+             data-parent="#accordioniot_access_pattern1_project_id">
             <div class="card-body pl-5">
 
     <div class="breadcrumbs">root
@@ -4032,7 +4082,14 @@ <h2 class="mb-0">
                 d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
             />
         </svg>
-    <a href="#iot_access_project_id" onclick="anchorLink('iot_access_project_id')">project_id</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
+    <a href="#iot_access_pattern1" onclick="anchorLink('iot_access_pattern1')">Iot Access</a>
+        <svg width="1em" height="1em" viewBox="0 0 16 16" class="bi bi-arrow-right-short" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+            <path
+                fill-rule="evenodd"
+                d="M4 8a.5.5 0 0 1 .5-.5h5.793L8.146 5.354a.5.5 0 1 1 .708-.708l3 3a.5.5 0 0 1 0 .708l-3 3a.5.5 0 0 1-.708-.708L10.293 8.5H4.5A.5.5 0 0 1 4 8z"
+            />
+        </svg>
+    <a href="#iot_access_pattern1_project_id" onclick="anchorLink('iot_access_pattern1_project_id')">project_id</a></div><span class="badge badge-dark value-type">Type: string</span><br/>
 
             
 
@@ -4048,6 +4105,10 @@ <h2 class="mb-0">
         </div>
     </div>
 </div>
+            </div>
+        </div>
+    </div>
+</div>
 
     <footer>
         <p class="generated-by-footer">Generated using <a href="https://github.com/coveooss/json-schema-for-humans">json-schema-for-humans</a></p>
diff --git a/gencode/java/udmi/schema/ExecutionConfiguration.java b/gencode/java/udmi/schema/ExecutionConfiguration.java
index 42cda6ea7a..9f368f63a4 100644
--- a/gencode/java/udmi/schema/ExecutionConfiguration.java
+++ b/gencode/java/udmi/schema/ExecutionConfiguration.java
@@ -1,14 +1,10 @@
 
 package udmi.schema;
 
-import java.util.HashMap;
-import java.util.Map;
 import javax.annotation.processing.Generated;
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
-import com.fasterxml.jackson.annotation.JsonValue;
 
 
 /**
@@ -68,7 +64,7 @@ public class ExecutionConfiguration {
      * 
      */
     @JsonProperty("iot_provider")
-    public ExecutionConfiguration.IotProvider iot_provider;
+    public udmi.schema.IotAccess.IotProvider iot_provider;
     @JsonProperty("project_id")
     public String project_id;
     @JsonProperty("key_file")
@@ -128,52 +124,4 @@ public boolean equals(Object other) {
         return (((((((((((((((((((((this.alt_registry == rhs.alt_registry)||((this.alt_registry!= null)&&this.alt_registry.equals(rhs.alt_registry)))&&((this.min_stage == rhs.min_stage)||((this.min_stage!= null)&&this.min_stage.equals(rhs.min_stage))))&&((this.block_unknown == rhs.block_unknown)||((this.block_unknown!= null)&&this.block_unknown.equals(rhs.block_unknown))))&&((this.cloud_region == rhs.cloud_region)||((this.cloud_region!= null)&&this.cloud_region.equals(rhs.cloud_region))))&&((this.device_id == rhs.device_id)||((this.device_id!= null)&&this.device_id.equals(rhs.device_id))))&&((this.key_file == rhs.key_file)||((this.key_file!= null)&&this.key_file.equals(rhs.key_file))))&&((this.udmi_version == rhs.udmi_version)||((this.udmi_version!= null)&&this.udmi_version.equals(rhs.udmi_version))))&&((this.alt_project == rhs.alt_project)||((this.alt_project!= null)&&this.alt_project.equals(rhs.alt_project))))&&((this.log_level == rhs.log_level)||((this.log_level!= null)&&this.log_level.equals(rhs.log_level))))&&((this.site_model == rhs.site_model)||((this.site_model!= null)&&this.site_model.equals(rhs.site_model))))&&((this.registry_id == rhs.registry_id)||((this.registry_id!= null)&&this.registry_id.equals(rhs.registry_id))))&&((this.feed_name == rhs.feed_name)||((this.feed_name!= null)&&this.feed_name.equals(rhs.feed_name))))&&((this.site_name == rhs.site_name)||((this.site_name!= null)&&this.site_name.equals(rhs.site_name))))&&((this.registry_suffix == rhs.registry_suffix)||((this.registry_suffix!= null)&&this.registry_suffix.equals(rhs.registry_suffix))))&&((this.update_topic == rhs.update_topic)||((this.update_topic!= null)&&this.update_topic.equals(rhs.update_topic))))&&((this.iot_provider == rhs.iot_provider)||((this.iot_provider!= null)&&this.iot_provider.equals(rhs.iot_provider))))&&((this.project_id == rhs.project_id)||((this.project_id!= null)&&this.project_id.equals(rhs.project_id))))&&((this.udmi_root == rhs.udmi_root)||((this.udmi_root!= null)&&this.udmi_root.equals(rhs.udmi_root))))&&((this.serial_no == rhs.serial_no)||((this.serial_no!= null)&&this.serial_no.equals(rhs.serial_no))))&&((this.reflect_region == rhs.reflect_region)||((this.reflect_region!= null)&&this.reflect_region.equals(rhs.reflect_region))));
     }
 
-
-    /**
-     * Iot Provider
-     * <p>
-     * 
-     * 
-     */
-    @Generated("jsonschema2pojo")
-    public enum IotProvider {
-
-        GCP_NATIVE("gcp_native"),
-        GCP("gcp"),
-        CLEARBLADE("clearblade");
-        private final String value;
-        private final static Map<String, ExecutionConfiguration.IotProvider> CONSTANTS = new HashMap<String, ExecutionConfiguration.IotProvider>();
-
-        static {
-            for (ExecutionConfiguration.IotProvider c: values()) {
-                CONSTANTS.put(c.value, c);
-            }
-        }
-
-        IotProvider(String value) {
-            this.value = value;
-        }
-
-        @Override
-        public String toString() {
-            return this.value;
-        }
-
-        @JsonValue
-        public String value() {
-            return this.value;
-        }
-
-        @JsonCreator
-        public static ExecutionConfiguration.IotProvider fromValue(String value) {
-            ExecutionConfiguration.IotProvider constant = CONSTANTS.get(value);
-            if (constant == null) {
-                throw new IllegalArgumentException(value);
-            } else {
-                return constant;
-            }
-        }
-
-    }
-
 }
diff --git a/gencode/java/udmi/schema/IotAccess.java b/gencode/java/udmi/schema/IotAccess.java
index 00206f9634..fd76f6e831 100644
--- a/gencode/java/udmi/schema/IotAccess.java
+++ b/gencode/java/udmi/schema/IotAccess.java
@@ -1,10 +1,14 @@
 
 package udmi.schema;
 
+import java.util.HashMap;
+import java.util.Map;
 import javax.annotation.processing.Generated;
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonValue;
 
 
 /**
@@ -28,7 +32,7 @@ public class IotAccess {
      * 
      */
     @JsonProperty("provider")
-    public udmi.schema.ExecutionConfiguration.IotProvider provider;
+    public IotAccess.IotProvider provider;
     @JsonProperty("project_id")
     public String project_id;
 
@@ -52,4 +56,54 @@ public boolean equals(Object other) {
         return (((this.provider == rhs.provider)||((this.provider!= null)&&this.provider.equals(rhs.provider)))&&((this.project_id == rhs.project_id)||((this.project_id!= null)&&this.project_id.equals(rhs.project_id))));
     }
 
+
+    /**
+     * Iot Provider
+     * <p>
+     * 
+     * 
+     */
+    @Generated("jsonschema2pojo")
+    public enum IotProvider {
+
+        DYNAMIC("dynamic"),
+        GCP_NATIVE("gcp_native"),
+        GCP("gcp"),
+        CLEARBLADE_NATIVE("clearblade_native"),
+        CLEARBLADE("clearblade");
+        private final String value;
+        private final static Map<String, IotAccess.IotProvider> CONSTANTS = new HashMap<String, IotAccess.IotProvider>();
+
+        static {
+            for (IotAccess.IotProvider c: values()) {
+                CONSTANTS.put(c.value, c);
+            }
+        }
+
+        IotProvider(String value) {
+            this.value = value;
+        }
+
+        @Override
+        public String toString() {
+            return this.value;
+        }
+
+        @JsonValue
+        public String value() {
+            return this.value;
+        }
+
+        @JsonCreator
+        public static IotAccess.IotProvider fromValue(String value) {
+            IotAccess.IotProvider constant = CONSTANTS.get(value);
+            if (constant == null) {
+                throw new IllegalArgumentException(value);
+            } else {
+                return constant;
+            }
+        }
+
+    }
+
 }
diff --git a/gencode/java/udmi/schema/PodConfiguration.java b/gencode/java/udmi/schema/PodConfiguration.java
index 9654b28dd5..63fe282ab7 100644
--- a/gencode/java/udmi/schema/PodConfiguration.java
+++ b/gencode/java/udmi/schema/PodConfiguration.java
@@ -39,13 +39,13 @@ public class PodConfiguration {
     @JsonProperty("bridges")
     public HashMap<String, BridgePodConfiguration> bridges;
     /**
-     * Iot Access
+     * Iot Access Providers
      * <p>
      * 
      * 
      */
     @JsonProperty("iot_access")
-    public IotAccess iot_access;
+    public HashMap<String, IotAccess> iot_access;
 
     @Override
     public int hashCode() {
diff --git a/gencode/python/udmi/schema/__init__.py b/gencode/python/udmi/schema/__init__.py
index d606c74abe..aee95c1cd5 100644
--- a/gencode/python/udmi/schema/__init__.py
+++ b/gencode/python/udmi/schema/__init__.py
@@ -1,3 +1,4 @@
+from .access_iot import IotAccess
 from .ancillary_properties import AncillaryProperties
 from .building_translation import BuildingTranslation
 from .category import Category
diff --git a/gencode/python/udmi/schema/access_iot.py b/gencode/python/udmi/schema/access_iot.py
new file mode 100644
index 0000000000..7b86823809
--- /dev/null
+++ b/gencode/python/udmi/schema/access_iot.py
@@ -0,0 +1,42 @@
+"""Generated class for access_iot.json"""
+
+
+class IotAccess:
+  """Generated schema class"""
+
+  def __init__(self):
+    self.provider = None
+    self.project_id = None
+
+  @staticmethod
+  def from_dict(source):
+    if not source:
+      return None
+    result = IotAccess()
+    result.provider = source.get('provider')
+    result.project_id = source.get('project_id')
+    return result
+
+  @staticmethod
+  def map_from(source):
+    if not source:
+      return None
+    result = {}
+    for key in source:
+      result[key] = IotAccess.from_dict(source[key])
+    return result
+
+  @staticmethod
+  def expand_dict(input):
+    result = {}
+    for property in input:
+      result[property] = input[property].to_dict() if input[property] else {}
+    return result
+
+  def to_dict(self):
+    result = {}
+    if self.provider:
+      result['provider'] = self.provider # 5
+    if self.project_id:
+      result['project_id'] = self.project_id # 5
+    return result
diff --git a/gencode/python/udmi/schema/configuration_pod.py b/gencode/python/udmi/schema/configuration_pod.py
index 1d0fc1b152..bc4b44e5c6 100644
--- a/gencode/python/udmi/schema/configuration_pod.py
+++ b/gencode/python/udmi/schema/configuration_pod.py
@@ -2,47 +2,7 @@
 from .configuration_endpoint import EndpointConfiguration
 from .configuration_endpoint import EndpointConfiguration
 from .configuration_pod_bridge import BridgePodConfiguration
-
-
-class IotAccess:
-  """Generated schema class"""
-
-  def __init__(self):
-    self.provider = None
-    self.project_id = None
-
-  @staticmethod
-  def from_dict(source):
-    if not source:
-      return None
-    result = IotAccess()
-    result.provider = source.get('provider')
-    result.project_id = source.get('project_id')
-    return result
-
-  @staticmethod
-  def map_from(source):
-    if not source:
-      return None
-    result = {}
-    for key in source:
-      result[key] = IotAccess.from_dict(source[key])
-    return result
-
-  @staticmethod
-  def expand_dict(input):
-    result = {}
-    for property in input:
-      result[property] = input[property].to_dict() if input[property] else {}
-    return result
-
-  def to_dict(self):
-    result = {}
-    if self.provider:
-      result['provider'] = self.provider # 5
-    if self.project_id:
-      result['project_id'] = self.project_id # 5
-    return result
+from .access_iot import IotAccess
 
 
 class PodConfiguration:
@@ -62,7 +22,7 @@ def from_dict(source):
     result.flow_defaults = EndpointConfiguration.from_dict(source.get('flow_defaults'))
     result.flows = EndpointConfiguration.map_from(source.get('flows'))
     result.bridges = BridgePodConfiguration.map_from(source.get('bridges'))
-    result.iot_access = IotAccess.from_dict(source.get('iot_access'))
+    result.iot_access = IotAccess.map_from(source.get('iot_access'))
     return result
 
   @staticmethod
@@ -90,5 +50,5 @@ def to_dict(self):
     if self.bridges:
       result['bridges'] = BridgePodConfiguration.expand_dict(self.bridges) # 2
     if self.iot_access:
-      result['iot_access'] = self.iot_access.to_dict() # 4
+      result['iot_access'] = IotAccess.expand_dict(self.iot_access) # 2
     return result
diff --git a/pubber/build.gradle b/pubber/build.gradle
index 3b6c4a0145..faa96aa42c 100644
--- a/pubber/build.gradle
+++ b/pubber/build.gradle
@@ -21,8 +21,11 @@ plugins {
 group 'daq-pubber'
 version '1.0-SNAPSHOT'
 
-sourceCompatibility = 17
-targetCompatibility = 17
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
 
 sourceSets {
     main {
diff --git a/schema/access_iot.json b/schema/access_iot.json
new file mode 100644
index 0000000000..3f0fbf62a6
--- /dev/null
+++ b/schema/access_iot.json
@@ -0,0 +1,13 @@
+{
+  "type": "object",
+  "title": "Iot Access",
+  "additionalProperties": false,
+  "properties": {
+    "provider": {
+      "$ref": "file:common.json#/definitions/provider"
+    },
+    "project_id": {
+      "type": "string"
+    }
+  }
+}
diff --git a/schema/common.json b/schema/common.json
index edb97fe032..d7407d1205 100644
--- a/schema/common.json
+++ b/schema/common.json
@@ -17,8 +17,10 @@
     "provider": {
       "title": "Iot Provider",
       "enum": [
+        "dynamic",
         "gcp_native",
         "gcp",
+        "clearblade_native",
         "clearblade"
       ]
     },
diff --git a/schema/configuration_pod.json b/schema/configuration_pod.json
index 08ff5869ec..dd09c7b6a2 100644
--- a/schema/configuration_pod.json
+++ b/schema/configuration_pod.json
@@ -28,14 +28,12 @@
     },
     "iot_access": {
       "type": "object",
-      "title": "Iot Access",
+      "title": "Iot Access Providers",
       "additionalProperties": false,
-      "properties": {
-        "provider": {
-          "$ref": "file:common.json#/definitions/provider"
-        },
-        "project_id": {
-          "type": "string"
+      "existingJavaType": "java.util.HashMap<String, IotAccess>",
+      "patternProperties": {
+        "^[a-z]+$": {
+          "$ref": "file:access_iot.json"
         }
       }
     }
diff --git a/udmis/.idea/compiler.xml b/udmis/.idea/compiler.xml
index 3794d59699..37c198746c 100644
--- a/udmis/.idea/compiler.xml
+++ b/udmis/.idea/compiler.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.9" />
+    <bytecodeTargetLevel target="1.9">
+      <module name="udmis" target="17" />
+    </bytecodeTargetLevel>
   </component>
 </project>
\ No newline at end of file
diff --git a/udmis/.idea/misc.xml b/udmis/.idea/misc.xml
index 22f6958258..eb686c6748 100644
--- a/udmis/.idea/misc.xml
+++ b/udmis/.idea/misc.xml
@@ -5,7 +5,7 @@
     <file type="web" url="file://$PROJECT_DIR$/../gencode" />
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_10" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17_PREVIEW" project-jdk-name="17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>
   <component name="SuppressResolveModulePerSourceSetNotification">
diff --git a/udmis/.idea/runConfigurations/UdmiServicePod_configured.xml b/udmis/.idea/runConfigurations/UdmiServicePod_configured.xml
index 881705d759..0b7aab6829 100644
--- a/udmis/.idea/runConfigurations/UdmiServicePod_configured.xml
+++ b/udmis/.idea/runConfigurations/UdmiServicePod_configured.xml
@@ -5,7 +5,7 @@
     </envs>
     <option name="MAIN_CLASS_NAME" value="com.google.bos.udmi.service.pod.UdmiServicePod" />
     <module name="udmis" />
-    <option name="PROGRAM_PARAMETERS" value="src/test/configs/clearblade_pod.json" />
+    <option name="PROGRAM_PARAMETERS" value="src/test/configs/dynamic_pod.json" />
     <extension name="coverage">
       <pattern>
         <option name="PATTERN" value="com.google.bos.udmi.service.pod.*" />
diff --git a/udmis/Dockerfile.udmis b/udmis/Dockerfile.udmis
index d0b170738a..4ce49f45fb 100644
--- a/udmis/Dockerfile.udmis
+++ b/udmis/Dockerfile.udmis
@@ -9,16 +9,16 @@
 #
 # TODO: Convert this to use alpine base image and make sure it works.
 #
-FROM alpine:latest
-#FROM ubuntu:latest
+#FROM alpine:latest
+FROM ubuntu:latest
 
 WORKDIR /root
 
-RUN apk add openjdk17 bash
-#RUN apt update && apt-get install -y openjdk-17-jre bash
+#RUN apk add openjdk17 bash
+RUN apt update && apt-get install -y openjdk-17-jre bash
 
 ADD bin/ bin/
 ADD var/ var/
 ADD build/libs/udmis-1.0-SNAPSHOT-all.jar build/libs/udmis-1.0-SNAPSHOT-all.jar
 
-CMD ["/root/bin/run", "/udmi/gcp_pod.json"]
+CMD ["/root/bin/run", "/udmi/pod_config.json"]
diff --git a/udmis/bin/container b/udmis/bin/container
index d44a1b9e38..6a816c2599 100755
--- a/udmis/bin/container
+++ b/udmis/bin/container
@@ -6,7 +6,7 @@ DROOT=.
 
 function usage {
     echo Error: $*
-    echo Usage: $0 { build, shell, run, push, deploy, status, logs, stop }
+    echo Usage: $0 { build, shell, run, push, deploy, update, status, logs, stop }
     echo Project: $PROJECT
     exit 1
 }
@@ -33,6 +33,7 @@ RUNARGS="--rm -ti -v $PWD/etc:/udmi -v $HOME/.config:/root/.config --tmpfs /tmp"
 if [[ $cmd == build ]]; then
     rm -rf var
     mkdir -p var
+    bin/build
     cat <<EOF > var/deployed_version.json
 {
   "udmi_version": "$version",
@@ -51,10 +52,13 @@ elif [[ $cmd == push ]]; then
     docker tag $IMAGE $REPOSITORY/$IMAGE
     docker push $REPOSITORY/$IMAGE
     sed -e "s/@PROJECT@/$PROJECT/" < k8s_pod.yaml > var/k8s_pod.yaml
+    sed -e "s/@PROJECT@/$PROJECT/" < k8s_deployment.yaml > var/k8s_deployment.yaml
     echo Updated var/k8s_pod.yaml for deployment.
 elif [[ $cmd == deploy ]]; then
     kubectl delete pod/udmi-test-pod || true
     kubectl apply -f var/k8s_pod.yaml
+elif [[ $cmd == update ]]; then
+    kubectl apply -f var/k8s_deployment.yaml
 elif [[ $cmd == status ]]; then
     kubectl describe pods udmi-test-pod
 elif [[ $cmd == logs ]]; then
diff --git a/udmis/bin/run b/udmis/bin/run
index b0aae527d4..f5d46ac998 100755
--- a/udmis/bin/run
+++ b/udmis/bin/run
@@ -13,7 +13,7 @@ cd $ROOT
 
 POD_JAR=build/libs/udmis-1.0-SNAPSHOT-all.jar
 
-java -jar $POD_JAR $POD_CONFIG || true
+java -jar $POD_JAR $POD_CONFIG
 
-tail -f /dev/null
+echo $?
 
diff --git a/udmis/build.gradle b/udmis/build.gradle
index 0b28ae768a..9910563eb9 100644
--- a/udmis/build.gradle
+++ b/udmis/build.gradle
@@ -21,7 +21,11 @@ plugins {
 group 'udmis'
 version '1.0-SNAPSHOT'
 
-sourceCompatibility = 1.9
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
 
 sourceSets {
     main {
diff --git a/udmis/etc/gcp_pod.json b/udmis/etc/gcp_pod.json
index 7163225074..9336301d87 100644
--- a/udmis/etc/gcp_pod.json
+++ b/udmis/etc/gcp_pod.json
@@ -14,7 +14,9 @@
     }
   },
   "iot_access": {
-    "provider": "gcp",
-    "project_id": "bos-peringknife-dev"
+    "default": {
+      "provider": "gcp",
+      "project_id": "bos-peringknife-dev"
+    }
   }
 }
diff --git a/udmis/k8s_deployment.yaml b/udmis/k8s_deployment.yaml
index a05417c5b7..62f37463df 100644
--- a/udmis/k8s_deployment.yaml
+++ b/udmis/k8s_deployment.yaml
@@ -18,9 +18,18 @@ spec:
     spec:
       containers:
       - name: master
-        image: gcr.io/bos-peringknife-dev/udmis@sha256:30eda97dd6163920d3e4a802f50771b2c2a2e5753b989de2e9ab0b2ea896c08d
+        image: gcr.io/@PROJECT@/udmis
         imagePullPolicy: Always
         resources:
           requests:
             cpu: 100m
             memory: 100Mi
+        volumeMounts:
+        # name must match the volume name below
+        - name: secret-volume
+          mountPath: /udmi
+          readOnly: true
+      volumes:
+      - name: secret-volume
+        secret:
+          secretName: pod-config.json
diff --git a/udmis/k8s_pod.yaml b/udmis/k8s_pod.yaml
index 8956dedc0e..ce523ae9c9 100644
--- a/udmis/k8s_pod.yaml
+++ b/udmis/k8s_pod.yaml
@@ -10,14 +10,16 @@ spec:
       resources:
         requests:
           cpu: 100m
-          memory: 99Mi
+          memory: 100Mi
       volumeMounts:
-        # name must match the volume name below
-        - name: secret-volume
-          mountPath: /udmi
-          readOnly: true
-  # The secret data is exposed to Containers in the Pod through a Volume.
+      - name: secret-volume
+        mountPath: /udmi
+        readOnly: true
   volumes:
     - name: secret-volume
-      secret:
-        secretName: pod-config.json
+      projected:
+        sources:
+        - secret:
+            name: pod_config.json
+        - secret:
+            name: clearblade.json
diff --git a/udmis/src/main/java/com/google/bos/udmi/service/access/ClearBladeIotAccessProvider.java b/udmis/src/main/java/com/google/bos/udmi/service/access/ClearBladeIotAccessProvider.java
index 7b452a4bb4..ce30b0cdc6 100644
--- a/udmis/src/main/java/com/google/bos/udmi/service/access/ClearBladeIotAccessProvider.java
+++ b/udmis/src/main/java/com/google/bos/udmi/service/access/ClearBladeIotAccessProvider.java
@@ -78,6 +78,7 @@
  */
 public class ClearBladeIotAccessProvider extends UdmisComponent implements IotAccessProvider {
 
+  private static final String UDMIS_REGISTRY = "UDMS-REFLECT";
   static final Set<String> CLOUD_REGIONS =
       ImmutableSet.of("us-central1", "europe-west1", "asia-east1");
   private static final String EMPTY_VERSION = "0";
@@ -97,15 +98,13 @@ public class ClearBladeIotAccessProvider extends UdmisComponent implements IotAc
       .build();
 
   private final String projectId;
-  private final Map<String, String> registryCloudRegions;
+  private Map<String, String> registryCloudRegions;
 
   /**
    * Create a new instance for interfacing with GCP IoT Core.
    */
   public ClearBladeIotAccessProvider(IotAccess iotAccess) {
     projectId = requireNonNull(iotAccess.project_id, "gcp project id not specified");
-    debug("Initializing ClearBlade access provider for project " + projectId);
-    registryCloudRegions = fetchRegistryCloudRegions();
   }
 
   private static CloudModel convertDevice(Device device, Operation operation) {
@@ -367,6 +366,23 @@ private void unbindGatewayDevices(String registryId, Device device) {
         .forEach(id -> unbindDevice(registryId, gatewayId, id)));
   }
 
+  private void updateConfig(String registryId, String deviceId, String config) {
+    try {
+      DeviceManagerClient deviceManagerClient = getDeviceManagerClient();
+      ByteString binaryData = new ByteString(encodeBase64(config));
+      String updateVersion = null;
+      String location = getRegistryLocation(registryId);
+      ModifyCloudToDeviceConfigRequest request =
+          ModifyCloudToDeviceConfigRequest.Builder.newBuilder()
+              .setName(DeviceName.of(projectId, location, registryId, deviceId).toString())
+              .setBinaryData(binaryData).setVersionToUpdate(updateVersion).build();
+      DeviceConfig response = deviceManagerClient.modifyCloudToDeviceConfig(request);
+      System.err.println("Config modified version " + response.getVersion());
+    } catch (Exception e) {
+      throw new RuntimeException("While modifying device config", e);
+    }
+  }
+
   private CloudModel updateDevice(String registryId, Device device) {
     DeviceManagerClient deviceManagerClient = getDeviceManagerClient();
     String deviceId = device.toBuilder().getId();
@@ -386,6 +402,24 @@ private CloudModel updateDevice(String registryId, Device device) {
     }
   }
 
+  @Override
+  public void activate() {
+    super.activate();
+    debug("Initializing ClearBlade access provider for project " + projectId);
+    registryCloudRegions = fetchRegistryCloudRegions();
+  }
+
+  @Override
+  public String fetchRegistryMetadata(String registryId, String metadataKey) {
+    try {
+      CloudModel cloudModel = fetchDevice(UDMIS_REGISTRY, registryId);
+      return cloudModel.metadata.get(metadataKey);
+    } catch (Exception e) {
+      debug(format("No device entry for %s/%s", UDMIS_REGISTRY, registryId));
+      return null;
+    }
+  }
+
   @Override
   public Entry<String, String> fetchConfig(String registryId, String deviceId) {
     try {
@@ -462,10 +496,10 @@ public CloudModel modelDevice(String registryId, String deviceId, CloudModel clo
   @Override
   public void modifyConfig(String registryId, String deviceId, SubFolder subFolder,
       String contents) {
-    // TODO: Need to implement checking-and-retry of config version for concurrent operations.
     if (subFolder == SubFolder.UPDATE) {
       updateConfig(registryId, deviceId, contents);
     } else {
+      // TODO: Need to implement checking-and-retry of config version for concurrent operations.
       String configString = fetchConfig(registryId, deviceId).getValue();
       Map<String, Object> configMap = toMap(configString);
       configMap.put(subFolder.toString(), contents);
@@ -494,24 +528,6 @@ public void sendCommand(String registryId, String deviceId, SubFolder subFolder,
     }
   }
 
-  @Override
-  public void updateConfig(String registryId, String deviceId, String config) {
-    try {
-      DeviceManagerClient deviceManagerClient = getDeviceManagerClient();
-      ByteString binaryData = new ByteString(encodeBase64(config));
-      String updateVersion = null;
-      String location = getRegistryLocation(registryId);
-      ModifyCloudToDeviceConfigRequest request =
-          ModifyCloudToDeviceConfigRequest.Builder.newBuilder()
-              .setName(DeviceName.of(projectId, location, registryId, deviceId).toString())
-              .setBinaryData(binaryData).setVersionToUpdate(updateVersion).build();
-      DeviceConfig response = deviceManagerClient.modifyCloudToDeviceConfig(request);
-      System.err.println("Config modified version " + response.getVersion());
-    } catch (Exception e) {
-      throw new RuntimeException("While modifying device config", e);
-    }
-  }
-
   class Empty {
     // Temp hacky class
   }
diff --git a/udmis/src/main/java/com/google/bos/udmi/service/access/DynamicIotAccessProvider.java b/udmis/src/main/java/com/google/bos/udmi/service/access/DynamicIotAccessProvider.java
new file mode 100644
index 0000000000..40a8b22a95
--- /dev/null
+++ b/udmis/src/main/java/com/google/bos/udmi/service/access/DynamicIotAccessProvider.java
@@ -0,0 +1,125 @@
+package com.google.bos.udmi.service.access;
+
+import static com.google.udmi.util.GeneralUtils.sortedMapCollector;
+import static com.google.udmi.util.JsonUtil.getTimestamp;
+import static java.lang.String.format;
+
+import com.google.bos.udmi.service.core.UdmisComponent;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.TreeMap;
+import udmi.schema.CloudModel;
+import udmi.schema.Envelope.SubFolder;
+import udmi.schema.IotAccess;
+
+/**
+ * An IoT Access Provider that dynamically switches between other providers.
+ */
+public class DynamicIotAccessProvider extends UdmisComponent implements IotAccessProvider {
+
+  private final Map<String, String> registryProviders = new HashMap<>();
+  private final List<String> providerList;
+  private final Map<String, IotAccessProvider> providers = new HashMap<>();
+  private final Map<String, String> defaultProvisioned = new HashMap<>();
+
+  /**
+   * Create a new instance for interfacing with multiple providers.
+   */
+  public DynamicIotAccessProvider(IotAccess iotAccess) {
+    providerList = Arrays.asList(iotAccess.project_id.split(","));
+  }
+
+  private String determineProvider(String registryId) {
+    TreeMap<String, String> sortedMap = providers.entrySet().stream()
+        .collect(sortedMapCollector(entry -> registryPriority(registryId, entry)));
+    String providerId = sortedMap.lastEntry().getValue();
+    debug("Determined registry mapping for " + registryId + " to be " + providerId);
+    return providerId;
+  }
+
+  private IotAccessProvider getProviderFor(String registryId) {
+    return providers.get(registryProviders.computeIfAbsent(registryId, this::determineProvider));
+  }
+
+  private String registryPriority(String registryId, Entry<String, IotAccessProvider> provider) {
+    String provisionedAt =
+        provider.getValue().fetchRegistryMetadata(registryId, "udmi_provisioned");
+    debug(format("Provider %s provisioned %s at %s", provider.getKey(), registryId, provisionedAt));
+    return Optional.ofNullable(provisionedAt).orElse(defaultProvisioned.get(provider.getKey()));
+  }
+
+  @Override
+  public void activate() {
+    super.activate();
+    providerList.forEach(providerId -> providers.get(providerId).activate());
+  }
+
+  @Override
+  public Entry<String, String> fetchConfig(String registryId, String deviceId) {
+    return getProviderFor(registryId).fetchConfig(registryId, deviceId);
+  }
+
+  @Override
+  public CloudModel fetchDevice(String deviceRegistryId, String deviceId) {
+    return getProviderFor(deviceRegistryId).fetchDevice(deviceRegistryId, deviceId);
+  }
+
+  @Override
+  public String fetchRegistryMetadata(String registryId, String metadataKey) {
+    return getProviderFor(registryId).fetchRegistryMetadata(registryId, metadataKey);
+  }
+
+  @Override
+  public CloudModel listDevices(String deviceRegistryId) {
+    return getProviderFor(deviceRegistryId).listDevices(deviceRegistryId);
+  }
+
+  @Override
+  public CloudModel modelDevice(String deviceRegistryId, String deviceId, CloudModel cloudModel) {
+    return getProviderFor(deviceRegistryId).modelDevice(deviceRegistryId, deviceId, cloudModel);
+  }
+
+  @Override
+  public void modifyConfig(String registryId, String deviceId, SubFolder folder, String contents) {
+    getProviderFor(registryId).modifyConfig(registryId, deviceId, folder, contents);
+  }
+
+  @Override
+  public void sendCommand(String registryId, String deviceId, SubFolder folder, String message) {
+    getProviderFor(registryId).sendCommand(registryId, deviceId, folder, message);
+  }
+
+  @Override
+  public void setProviderAffinity(String registryId, String deviceId, String providerId) {
+    if (providerId != null) {
+      String previous = registryProviders.put(registryId, providerId);
+      if (!providerId.equals(previous)) {
+        debug(format("Switching registry affinity for %s from %s -> %s", registryId, previous,
+            providerId));
+      }
+    }
+  }
+
+  @Override
+  public void setProviders(Map<String, IotAccessProvider> allProviders) {
+    for (int i = 0; i < providerList.size(); i++) {
+      String providerId = providerList.get(i);
+      providers.computeIfAbsent(providerId, allProviders::get);
+      long inversePriority = (providerList.size() - i) * 10000L;
+      String timestamp = getTimestamp(new Date(inversePriority));
+      debug("Defaulting provider " + providerId + " to " + timestamp);
+      defaultProvisioned.put(providerId, timestamp);
+    }
+  }
+
+  @Override
+  public void shutdown() {
+    providers.values().forEach(IotAccessProvider::shutdown);
+    super.shutdown();
+  }
+}
diff --git a/udmis/src/main/java/com/google/bos/udmi/service/access/GcpIotAccessProvider.java b/udmis/src/main/java/com/google/bos/udmi/service/access/GcpIotAccessProvider.java
index 770ef68455..0e6686d8e6 100644
--- a/udmis/src/main/java/com/google/bos/udmi/service/access/GcpIotAccessProvider.java
+++ b/udmis/src/main/java/com/google/bos/udmi/service/access/GcpIotAccessProvider.java
@@ -75,6 +75,7 @@ public class GcpIotAccessProvider extends UdmisComponent implements IotAccessPro
   private static final String RSA_CERT_FORMAT = "RSA_X509_PEM";
   private static final String ES_KEY_FORMAT = "ES256_PEM";
   private static final String ES_CERT_FILE = "ES256_X509_PEM";
+  private static final String UDMIS_REGISTRY = "UDMS-REFLECT";
   private static final BiMap<Key_format, String> AUTH_TYPE_MAP =
       ImmutableBiMap.of(
           Key_format.RS_256, RSA_KEY_FORMAT,
@@ -87,8 +88,8 @@ public class GcpIotAccessProvider extends UdmisComponent implements IotAccessPro
   private static final GatewayConfig GATEWAY_CONFIG =
       new GatewayConfig().setGatewayType(GATEWAY_TYPE).setGatewayAuthMethod(ASSOCIATION_ONLY);
   private final String projectId;
-  private final Map<String, String> registryCloudRegions;
   private final CloudIot cloudIotService;
+  private Map<String, String> registryCloudRegions;
   private CloudIot.Projects.Locations.Registries registries;
 
   /**
@@ -98,7 +99,6 @@ public class GcpIotAccessProvider extends UdmisComponent implements IotAccessPro
   public GcpIotAccessProvider(IotAccess iotAccess) {
     projectId = requireNonNull(iotAccess.project_id, "gcp project id not specified");
     cloudIotService = createCloudIotService();
-    registryCloudRegions = fetchRegistryCloudRegions();
   }
 
   @NotNull
@@ -277,15 +277,41 @@ private void unbindGatewayDevices(String registryId, String deviceId) {
         .forEach(id -> unbindDevice(registryId, deviceId, id)));
   }
 
+  private void updateConfig(String registryId, String deviceId, String config) {
+    try {
+      String useConfig = ofNullable(config).orElse("");
+      registries.devices().modifyCloudToDeviceConfig(
+          getDevicePath(registryId, deviceId),
+          new ModifyCloudToDeviceConfigRequest().setBinaryData(
+              Base64.getEncoder().encodeToString(useConfig.getBytes()))).execute();
+    } catch (Exception e) {
+      throw new RuntimeException("While modifying device config", e);
+    }
+  }
+
   @Override
   public void activate() {
+    super.activate();
     try {
+      debug("Initializing GCP access provider for project " + projectId);
+      registryCloudRegions = fetchRegistryCloudRegions();
       registries = cloudIotService.projects().locations().registries();
     } catch (Exception e) {
       throw new RuntimeException("While activating", e);
     }
   }
 
+  @Override
+  public String fetchRegistryMetadata(String registryId, String metadataKey) {
+    try {
+      CloudModel cloudModel = fetchDevice(UDMIS_REGISTRY, registryId);
+      return cloudModel.metadata.get(metadataKey);
+    } catch (Exception e) {
+      debug(format("No device entry for %s/%s", UDMIS_REGISTRY, registryId));
+      return null;
+    }
+  }
+
   @Override
   public Entry<String, String> fetchConfig(String registryId, String deviceId) {
     try {
@@ -386,19 +412,7 @@ public void sendCommand(String registryId, String deviceId, SubFolder folder, St
   @Override
   public void shutdown() {
     registries = null;
-  }
-
-  @Override
-  public void updateConfig(String registryId, String deviceId, String config) {
-    try {
-      String useConfig = ofNullable(config).orElse("");
-      registries.devices().modifyCloudToDeviceConfig(
-          getDevicePath(registryId, deviceId),
-          new ModifyCloudToDeviceConfigRequest().setBinaryData(
-              Base64.getEncoder().encodeToString(useConfig.getBytes()))).execute();
-    } catch (Exception e) {
-      throw new RuntimeException("While modifying device config", e);
-    }
+    super.shutdown();
   }
 }
 
diff --git a/udmis/src/main/java/com/google/bos/udmi/service/access/IotAccessProvider.java b/udmis/src/main/java/com/google/bos/udmi/service/access/IotAccessProvider.java
index b0cc12dcfc..7ad0cfbf5f 100644
--- a/udmis/src/main/java/com/google/bos/udmi/service/access/IotAccessProvider.java
+++ b/udmis/src/main/java/com/google/bos/udmi/service/access/IotAccessProvider.java
@@ -1,12 +1,14 @@
 package com.google.bos.udmi.service.access;
 
+import static java.lang.String.format;
+
 import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import java.util.Map.Entry;
 import udmi.schema.CloudModel;
 import udmi.schema.Envelope.SubFolder;
-import udmi.schema.ExecutionConfiguration.IotProvider;
 import udmi.schema.IotAccess;
+import udmi.schema.IotAccess.IotProvider;
 
 /**
  * Generic interface for accessing iot device management.
@@ -14,6 +16,7 @@
 public interface IotAccessProvider {
 
   Map<IotProvider, Class<? extends IotAccessProvider>> PROVIDERS = ImmutableMap.of(
+      IotProvider.DYNAMIC, DynamicIotAccessProvider.class,
       IotProvider.CLEARBLADE, ClearBladeIotAccessProvider.class,
       IotProvider.GCP, GcpIotAccessProvider.class
   );
@@ -21,33 +24,43 @@ public interface IotAccessProvider {
   /**
    * Factory constructor for new instances.
    */
-  static IotAccessProvider from(IotAccess iotAccess) {
+  static IotAccessProvider from(Entry<String, IotAccess> iotAccessEntry) {
+    String entryName = iotAccessEntry.getKey();
+    IotAccess iotAccess = iotAccessEntry.getValue();
     try {
       return PROVIDERS.get(iotAccess.provider).getDeclaredConstructor(IotAccess.class)
           .newInstance(iotAccess);
     } catch (Exception e) {
-      throw new RuntimeException("While instantiating access provider " + iotAccess.provider, e);
+      throw new RuntimeException(
+          format("While instantiating access provider %s as %s", entryName, iotAccess.provider), e);
     }
   }
 
   void activate();
 
-  Entry<String, String> fetchConfig(String registryId, String deviceId);
-
-  void shutdown();
 
-  /**
-   * Send a command to a device.
-   */
-  void sendCommand(String registryId, String deviceId, SubFolder folder, String message);
+  default void setProviders(Map<String, IotAccessProvider> allProviders) {
+  }
 
-  void modifyConfig(String registryId, String deviceId, SubFolder folder, String contents);
+  default void setProviderAffinity(String registryId, String deviceId, String providerId) {
+  }
 
-  void updateConfig(String registryId, String deviceId, String config);
+  String fetchRegistryMetadata(String registryId, String metadataKey);
 
-  CloudModel listDevices(String deviceRegistryId);
+  Entry<String, String> fetchConfig(String registryId, String deviceId);
 
   CloudModel fetchDevice(String deviceRegistryId, String deviceId);
 
+  CloudModel listDevices(String deviceRegistryId);
+
   CloudModel modelDevice(String deviceRegistryId, String deviceId, CloudModel cloudModel);
+
+  void modifyConfig(String registryId, String deviceId, SubFolder folder, String contents);
+
+  /**
+   * Send a command to a device.
+   */
+  void sendCommand(String registryId, String deviceId, SubFolder folder, String message);
+
+  void shutdown();
 }
diff --git a/udmis/src/main/java/com/google/bos/udmi/service/core/ReflectProcessor.java b/udmis/src/main/java/com/google/bos/udmi/service/core/ReflectProcessor.java
index 8d3ff2f28c..e329e66f3a 100644
--- a/udmis/src/main/java/com/google/bos/udmi/service/core/ReflectProcessor.java
+++ b/udmis/src/main/java/com/google/bos/udmi/service/core/ReflectProcessor.java
@@ -13,6 +13,7 @@
 import static com.google.udmi.util.JsonUtil.stringify;
 import static com.google.udmi.util.JsonUtil.toMap;
 import static java.util.Objects.requireNonNull;
+import static udmi.schema.Envelope.SubFolder.UPDATE;
 
 import com.google.bos.udmi.service.messaging.MessageContinuation;
 import com.google.udmi.util.GeneralUtils;
@@ -38,16 +39,10 @@ public class ReflectProcessor extends UdmisComponent {
   private final SetupUdmiConfig deployed =
       loadFileStrictRequired(SetupUdmiConfig.class, new File(DEPLOY_FILE));
 
-  @Override
-  public void activate() {
-    debug(stringify(deployed));
-    super.activate();
-  }
-
   @Override
   protected void defaultHandler(Object message) {
     MessageContinuation continuation = getContinuation(message);
-    requireNonNull(provider, "iot access provider not set");
+    requireNonNull(iotAccess, "iot access provider not set");
     Envelope reflection = continuation.getEnvelope();
     try {
       if (reflection.subFolder == null) {
@@ -110,34 +105,33 @@ private void processException(Envelope reflection, Exception e) {
 
   private void processReflection(Envelope reflection, Envelope envelope,
       Map<String, Object> payload) {
+    iotAccess.setProviderAffinity(envelope.deviceRegistryId, envelope.deviceId, reflection.source);
     CloudModel result = getReflectionResult(envelope, payload);
     envelope.subType = SubType.REPLY;
     sendReflectCommand(reflection, envelope, result);
   }
 
   private CloudModel queryCloudDevice(Envelope attributes) {
-    return provider.fetchDevice(attributes.deviceRegistryId, attributes.deviceId);
+    return iotAccess.fetchDevice(attributes.deviceRegistryId, attributes.deviceId);
   }
 
   private CloudModel queryCloudRegistry(Envelope attributes) {
-    return provider.listDevices(attributes.deviceRegistryId);
+    return iotAccess.listDevices(attributes.deviceRegistryId);
   }
 
   private CloudModel reflectModel(Envelope attributes, CloudModel request) {
     return requireNonNull(
-        provider.modelDevice(attributes.deviceRegistryId, attributes.deviceId, request),
+        iotAccess.modelDevice(attributes.deviceRegistryId, attributes.deviceId, request),
         "missing reflect model response");
   }
 
   private CloudModel reflectPropagate(Envelope attributes, Map<String, Object> payload) {
-    switch (attributes.subType) {
-      case CONFIG:
-        provider.modifyConfig(attributes.deviceRegistryId, attributes.deviceId, SubFolder.UPDATE,
-            stringify(payload));
-        return new CloudModel();
-      default:
-        throw new RuntimeException("Unknown propagate subType " + attributes.subType);
+    if (requireNonNull(attributes.subType) == SubType.CONFIG) {
+      iotAccess.modifyConfig(attributes.deviceRegistryId, attributes.deviceId, UPDATE,
+          stringify(payload));
+      return new CloudModel();
     }
+    throw new RuntimeException("Unknown propagate subType " + attributes.subType);
   }
 
   private CloudModel reflectQuery(Envelope attributes, Map<String, Object> payload) {
@@ -157,7 +151,7 @@ private void sendReflectCommand(Envelope reflection, Envelope message, Object pa
     String reflectRegistry = reflection.deviceRegistryId;
     String deviceRegistry = reflection.deviceId;
     message.payload = encodeBase64(stringify(payload));
-    provider.sendCommand(reflectRegistry, deviceRegistry, SubFolder.UDMI, stringify(message));
+    iotAccess.sendCommand(reflectRegistry, deviceRegistry, SubFolder.UDMI, stringify(message));
   }
 
   private void stateHandler(Envelope envelope, UdmiState toolState) {
@@ -176,6 +170,13 @@ private void stateHandler(Envelope envelope, UdmiState toolState) {
     configMap.put(SubFolder.UDMI.value(), udmiConfig);
     String contents = stringify(configMap);
     debug("Setting reflector config %s %s %s", registryId, deviceId, contents);
-    provider.updateConfig(registryId, deviceId, contents);
+    iotAccess.setProviderAffinity(registryId, deviceId, envelope.source);
+    iotAccess.modifyConfig(registryId, deviceId, UPDATE, contents);
+  }
+
+  @Override
+  public void activate() {
+    debug(stringify(deployed));
+    super.activate();
   }
 }
diff --git a/udmis/src/main/java/com/google/bos/udmi/service/core/StateProcessor.java b/udmis/src/main/java/com/google/bos/udmi/service/core/StateProcessor.java
index d60b7acbde..58b6b86635 100644
--- a/udmis/src/main/java/com/google/bos/udmi/service/core/StateProcessor.java
+++ b/udmis/src/main/java/com/google/bos/udmi/service/core/StateProcessor.java
@@ -2,16 +2,15 @@
 
 import static com.google.udmi.util.GeneralUtils.ifNotNullThen;
 import static com.google.udmi.util.JsonUtil.convertToStrict;
-import static com.google.udmi.util.JsonUtil.fromString;
 import static com.google.udmi.util.JsonUtil.fromStringStrict;
 import static com.google.udmi.util.JsonUtil.getTimestamp;
 import static com.google.udmi.util.JsonUtil.stringify;
 import static java.util.Objects.requireNonNull;
+import static udmi.schema.Envelope.SubFolder.UPDATE;
 
 import com.google.bos.udmi.service.messaging.MessageContinuation;
 import com.google.bos.udmi.service.messaging.StateUpdate;
 import com.google.udmi.util.GeneralUtils;
-import com.google.udmi.util.JsonUtil;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.Map.Entry;
@@ -65,9 +64,9 @@ private void updateLastStart(StateUpdate message, String registryId, String devi
       return;
     }
     try {
-      requireNonNull(provider, "iot access provider not set");
+      requireNonNull(iotAccess, "iot access provider not set");
       Date newLastStart = message.system.operation.last_start;
-      Entry<String, String> configEntry = provider.fetchConfig(registryId, deviceId);
+      Entry<String, String> configEntry = iotAccess.fetchConfig(registryId, deviceId);
       Config configMessage = fromStringStrict(Config.class, configEntry.getValue());
       Date oldLastStart = configMessage.system.operation.last_start;
       boolean shouldUpdate = oldLastStart == null || oldLastStart.before(newLastStart);
@@ -75,7 +74,7 @@ private void updateLastStart(StateUpdate message, String registryId, String devi
           getTimestamp(newLastStart), shouldUpdate);
       if (shouldUpdate) {
         configMessage.system.operation.last_start = newLastStart;
-        provider.updateConfig(registryId, deviceId, stringify(configMessage));
+        iotAccess.modifyConfig(registryId, deviceId, UPDATE, stringify(configMessage));
       }
     } catch (Exception e) {
       debug("Could not process config last_state update, skipping: "
diff --git a/udmis/src/main/java/com/google/bos/udmi/service/core/UdmisComponent.java b/udmis/src/main/java/com/google/bos/udmi/service/core/UdmisComponent.java
index 63065fe632..e3dfc2263b 100644
--- a/udmis/src/main/java/com/google/bos/udmi/service/core/UdmisComponent.java
+++ b/udmis/src/main/java/com/google/bos/udmi/service/core/UdmisComponent.java
@@ -29,7 +29,7 @@ public abstract class UdmisComponent extends ContainerBase {
   );
 
   protected MessageDispatcher dispatcher;
-  protected IotAccessProvider provider;
+  protected IotAccessProvider iotAccess;
 
   /**
    * Create a new instance of the given target class with the provided configuration.
@@ -88,8 +88,8 @@ public int getMessageCount(Class<?> clazz) {
     return dispatcher.getHandlerCount(clazz);
   }
 
-  public void setIotAccessProvider(IotAccessProvider provider) {
-    this.provider = provider;
+  public void setIotAccessProvider(IotAccessProvider iotAccess) {
+    this.iotAccess = iotAccess;
   }
 
   /**
diff --git a/udmis/src/main/java/com/google/bos/udmi/service/pod/UdmiServicePod.java b/udmis/src/main/java/com/google/bos/udmi/service/pod/UdmiServicePod.java
index 6a872f4082..59e619512c 100644
--- a/udmis/src/main/java/com/google/bos/udmi/service/pod/UdmiServicePod.java
+++ b/udmis/src/main/java/com/google/bos/udmi/service/pod/UdmiServicePod.java
@@ -6,6 +6,7 @@
 import static com.google.udmi.util.GeneralUtils.ifNotNullGet;
 import static com.google.udmi.util.GeneralUtils.ifNotNullThen;
 import static com.google.udmi.util.JsonUtil.loadFileStrictRequired;
+import static com.google.udmi.util.JsonUtil.toMap;
 import static java.util.Optional.ofNullable;
 
 import com.google.bos.udmi.service.access.IotAccessProvider;
@@ -28,6 +29,7 @@
  */
 public class UdmiServicePod {
 
+  public static final String DEFAULT_PROVIDER_KEY = "default";
   private static final Map<String, BridgePodConfiguration> NO_BRIDGES = ImmutableMap.of();
   private static final Map<String, EndpointConfiguration> NO_FLOWS = ImmutableMap.of();
   private static final Map<String, Class<? extends UdmisComponent>> PROCESSORS = ImmutableMap.of(
@@ -58,7 +60,14 @@ public UdmiServicePod(String[] args) {
       bridges = ofNullable(bridgeEntries).orElse(NO_BRIDGES).entrySet().stream()
           .map(this::makeBridgeFor).collect(Collectors.toList());
 
-      setIotAccessProvider(ifNotNullGet(podConfiguration.iot_access, IotAccessProvider::from));
+      if (podConfiguration.iot_access != null) {
+        Map<String, IotAccessProvider> providerMap =
+            podConfiguration.iot_access.entrySet().stream()
+                .collect(Collectors.toMap(Entry::getKey, IotAccessProvider::from));
+        IotAccessProvider provider = providerMap.get(DEFAULT_PROVIDER_KEY);
+        provider.setProviders(providerMap);
+        setIotAccessProvider(provider);
+      }
     } catch (Exception e) {
       throw new RuntimeException("While instantiating pod " + CSV_JOINER.join(args), e);
     }
diff --git a/udmis/src/test/configs/clearblade_pod.json b/udmis/src/test/configs/clearblade_pod.json
index 8ea16d884a..1bac656637 100644
--- a/udmis/src/test/configs/clearblade_pod.json
+++ b/udmis/src/test/configs/clearblade_pod.json
@@ -14,7 +14,9 @@
     }
   },
   "iot_access": {
-    "provider": "clearblade",
-    "project_id": "udmi-external"
+    "default": {
+      "provider": "clearblade",
+      "project_id": "udmi-external"
+    }
   }
 }
diff --git a/udmis/src/test/configs/dynamic_pod.json b/udmis/src/test/configs/dynamic_pod.json
new file mode 100644
index 0000000000..19ee58b557
--- /dev/null
+++ b/udmis/src/test/configs/dynamic_pod.json
@@ -0,0 +1,30 @@
+{
+  "flow_defaults": {
+    "protocol": "pubsub",
+    "hostname": "udmi-external"
+  },
+  "flows": {
+    "state": {
+      "recv_id": "udmi_state",
+      "send_id": "udmi_target"
+    },
+    "reflect": {
+      "recv_id": "udmi_reflect",
+      "send_id": "udmi_target"
+    }
+  },
+  "iot_access": {
+    "default": {
+      "provider": "dynamic",
+      "project_id": "gcp,clearblade-iot-core"
+    },
+    "clearblade-iot-core": {
+      "provider": "clearblade",
+      "project_id": "udmi-external"
+    },
+    "gcp": {
+      "provider": "gcp",
+      "project_id": "bos-peringknife-dev"
+    }
+  }
+}
diff --git a/udmis/src/test/configs/gcp_pod.json b/udmis/src/test/configs/gcp_pod.json
index 8ff297baf6..6e9e9f230b 100644
--- a/udmis/src/test/configs/gcp_pod.json
+++ b/udmis/src/test/configs/gcp_pod.json
@@ -14,7 +14,9 @@
     }
   },
   "iot_access": {
-    "provider": "gcp_iot_core",
-    "project_id": "bos-peringknife-dev"
+    "default": {
+      "provider": "gcp_iot_core",
+      "project_id": "bos-peringknife-dev"
+    }
   }
 }
diff --git a/udmis/src/test/java/com/google/bos/udmi/service/access/ClearBladeIotAccessProviderTest.java b/udmis/src/test/java/com/google/bos/udmi/service/access/ClearBladeIotAccessProviderTest.java
index eb8a9b334c..b142c57812 100644
--- a/udmis/src/test/java/com/google/bos/udmi/service/access/ClearBladeIotAccessProviderTest.java
+++ b/udmis/src/test/java/com/google/bos/udmi/service/access/ClearBladeIotAccessProviderTest.java
@@ -31,7 +31,9 @@ class ClearBladeIotAccessProviderTest {
   private ClearBladeIotAccessProvider getProvider() {
     IotAccess iotAccess = new IotAccess();
     iotAccess.project_id = TEST_PROJECT;
-    return new ClearBladeIotAccessProviderMock(iotAccess);
+    ClearBladeIotAccessProviderMock providerMock = new ClearBladeIotAccessProviderMock(iotAccess);
+    providerMock.activate();
+    return providerMock;
   }
 
   private class ClearBladeIotAccessProviderMock extends ClearBladeIotAccessProvider {
diff --git a/udmis/src/test/java/com/google/bos/udmi/service/access/DynamicIotAccessProviderTest.java b/udmis/src/test/java/com/google/bos/udmi/service/access/DynamicIotAccessProviderTest.java
new file mode 100644
index 0000000000..bab9e392fc
--- /dev/null
+++ b/udmis/src/test/java/com/google/bos/udmi/service/access/DynamicIotAccessProviderTest.java
@@ -0,0 +1,13 @@
+package com.google.bos.udmi.service.access;
+
+import org.junit.jupiter.api.Test;
+
+class DynamicIotAccessProviderTest {
+
+  private static final String GCP_REGISTRY = "TEST_GCP";
+  private static final String CB_REGISTRY = "TEST_CB";
+
+  @Test
+  void modifyConfig() {
+  }
+}
\ No newline at end of file
diff --git a/udmis/src/test/java/com/google/bos/udmi/service/access/GcpIotAccessProviderTest.java b/udmis/src/test/java/com/google/bos/udmi/service/access/GcpIotAccessProviderTest.java
index 66bde99083..0ef224faa3 100644
--- a/udmis/src/test/java/com/google/bos/udmi/service/access/GcpIotAccessProviderTest.java
+++ b/udmis/src/test/java/com/google/bos/udmi/service/access/GcpIotAccessProviderTest.java
@@ -104,7 +104,7 @@ public MockedGcpIotAccessProvider() {
 
   @Test
   void listDevices() throws IOException {
-    IotAccessProvider provider = new MockedGcpIotAccessProvider();
+    IotAccessProvider provider = getProvider();
     provider.activate();
 
     Devices devices = cloudIot.projects().locations().registries().devices();
@@ -120,4 +120,11 @@ void listDevices() throws IOException {
     assertEquals(1, strings.size(), "expected number of devices");
     assertTrue(strings.contains(TEST_DEVICE), "result contains expected device");
   }
+
+  @NotNull
+  private MockedGcpIotAccessProvider getProvider() {
+    MockedGcpIotAccessProvider mockedGcpIotAccessProvider = new MockedGcpIotAccessProvider();
+    mockedGcpIotAccessProvider.activate();
+    return mockedGcpIotAccessProvider;
+  }
 }
diff --git a/udmis/src/test/java/com/google/bos/udmi/service/core/ReflectProcessorTest.java b/udmis/src/test/java/com/google/bos/udmi/service/core/ReflectProcessorTest.java
index 540d8ba1ad..54412bfea1 100644
--- a/udmis/src/test/java/com/google/bos/udmi/service/core/ReflectProcessorTest.java
+++ b/udmis/src/test/java/com/google/bos/udmi/service/core/ReflectProcessorTest.java
@@ -3,7 +3,6 @@
 import static com.google.bos.udmi.service.core.UdmisComponent.FUNCTIONS_VERSION_MAX;
 import static com.google.bos.udmi.service.core.UdmisComponent.FUNCTIONS_VERSION_MIN;
 import static com.google.udmi.util.GeneralUtils.encodeBase64;
-import static com.google.udmi.util.GeneralUtils.ifNotNullThen;
 import static com.google.udmi.util.JsonUtil.convertToStrict;
 import static com.google.udmi.util.JsonUtil.stringify;
 import static com.google.udmi.util.JsonUtil.toMap;
@@ -11,9 +10,9 @@
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.ArgumentMatchers.notNull;
+import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
 
 import com.google.bos.udmi.service.messaging.impl.MessageBase.Bundle;
@@ -22,7 +21,6 @@
 import java.util.List;
 import java.util.Map;
 import org.jetbrains.annotations.NotNull;
-import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -47,11 +45,6 @@ public class ReflectProcessorTest extends ProcessorTestBase {
     return ReflectProcessor.class;
   }
 
-  @BeforeEach
-  public void initializeInstance() {
-    initializeTestInstance();
-  }
-
   private void activeTestInstance(Runnable action) {
     verify(provider, times(1)).activate();
     verify(provider, times(0)).shutdown();
@@ -102,23 +95,6 @@ private void validateUdmiConfig(UdmiConfig config) {
     assertEquals(TEST_TIMESTAMP, config.setup.deployed_at, "deployed at time");
   }
 
-  @Test
-  public void modelDevice() {
-    CloudModel returnModel = new CloudModel();
-    returnModel.operation = Operation.CREATE;
-    when(provider.modelDevice(anyString(), anyString(), notNull())).thenReturn(returnModel);
-    CloudModel requestModel = new CloudModel();
-    requestModel.operation = Operation.BIND;
-    activeTestInstance(() -> getReverseDispatcher().publish(makeModelBundle(requestModel)));
-    verify(provider, times(1)).modelDevice(eq(TEST_REGISTRY), eq(TEST_DEVICE), eq(requestModel));
-
-    ArgumentCaptor<String> commandCaptor = ArgumentCaptor.forClass(String.class);
-    verify(provider, times(1)).sendCommand(eq(TEST_REGISTRY), eq(TEST_DEVICE), eq(SubFolder.UDMI),
-        commandCaptor.capture());
-    Envelope envelope = JsonUtil.fromStringStrict(Envelope.class, commandCaptor.getValue());
-    assertEquals(transactionId, envelope.transactionId);
-  }
-
   /**
    * Test that the basic udmi-reflect state/config handshake works. When a client connects it
    * updates the state of the device entry, which then should trigger the underlying logic to output
@@ -132,14 +108,19 @@ public void initialInitExchange() {
     assertEquals(1, getDefaultCount(), "default handler count");
 
     ArgumentCaptor<String> configCaptor = ArgumentCaptor.forClass(String.class);
-    verify(provider, times(1)).updateConfig(eq(TEST_REGISTRY), eq(TEST_DEVICE),
-        configCaptor.capture());
+    verify(provider, times(1)).modifyConfig(eq(TEST_REGISTRY), eq(TEST_DEVICE),
+        eq(SubFolder.UPDATE), configCaptor.capture());
     Map<String, Object> stringObjectMap = toMap(configCaptor.getValue());
     UdmiConfig udmi =
         convertToStrict(UdmiConfig.class, stringObjectMap.get(SubFolder.UDMI.value()));
     validateUdmiConfig(udmi);
   }
 
+  @BeforeEach
+  public void initializeInstance() {
+    initializeTestInstance();
+  }
+
   /**
    * Test reflector initial state/config exchange sequence with an invalid bundle.
    */
@@ -157,8 +138,21 @@ public void invalidInitExchange() {
     assertEquals(SubFolder.ERROR, errorEnvelope.subFolder, "expected error response");
   }
 
-  @AfterEach
-  public void verifyNothingElse() {
-    ifNotNullThen(provider, provider -> verifyNoMoreInteractions(provider));
+  @Test
+  public void modelDevice() {
+    CloudModel returnModel = new CloudModel();
+    returnModel.operation = Operation.CREATE;
+    when(provider.modelDevice(anyString(), anyString(), notNull())).thenReturn(returnModel);
+
+    CloudModel requestModel = new CloudModel();
+    requestModel.operation = Operation.BIND;
+    activeTestInstance(() -> getReverseDispatcher().publish(makeModelBundle(requestModel)));
+    verify(provider, times(1)).modelDevice(eq(TEST_REGISTRY), eq(TEST_DEVICE), eq(requestModel));
+
+    ArgumentCaptor<String> commandCaptor = ArgumentCaptor.forClass(String.class);
+    verify(provider, times(1)).sendCommand(eq(TEST_REGISTRY), eq(TEST_DEVICE), eq(SubFolder.UDMI),
+        commandCaptor.capture());
+    Envelope envelope = JsonUtil.fromStringStrict(Envelope.class, commandCaptor.getValue());
+    assertEquals(transactionId, envelope.transactionId);
   }
 }
\ No newline at end of file
diff --git a/udmis/src/test/java/com/google/bos/udmi/service/pod/UdmiServicePodTest.java b/udmis/src/test/java/com/google/bos/udmi/service/pod/UdmiServicePodTest.java
index cd7a3a2430..537b2a4bbc 100644
--- a/udmis/src/test/java/com/google/bos/udmi/service/pod/UdmiServicePodTest.java
+++ b/udmis/src/test/java/com/google/bos/udmi/service/pod/UdmiServicePodTest.java
@@ -12,6 +12,7 @@
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
@@ -178,7 +179,8 @@ public void reflectPodTest() throws Exception {
 
     verify(iotAccessProvider, times(1)).activate();
     verify(iotAccessProvider, times(1)).shutdown();
-    verify(iotAccessProvider, times(1)).updateConfig(anyString(), anyString(), anyString());
+    verify(iotAccessProvider, times(1)).modifyConfig(anyString(), anyString(), eq(SubFolder.UPDATE),
+        anyString());
   }
 
   @AfterEach
diff --git a/udmis/udmis.iml b/udmis/udmis.iml
index fa99f3898a..8f2e06b5e0 100644
--- a/udmis/udmis.iml
+++ b/udmis/udmis.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="udmis" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="udmis" external.system.module.version="1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_9">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
     <output url="file://$MODULE_DIR$/out/production/classes" />
     <output-test url="file://$MODULE_DIR$/out/test/classes" />
     <exclude-output />
diff --git a/validator/build.gradle b/validator/build.gradle
index af7b04646e..55ca4f6d09 100644
--- a/validator/build.gradle
+++ b/validator/build.gradle
@@ -21,8 +21,11 @@ plugins {
 group 'daq-validator'
 version '1.0-SNAPSHOT'
 
-sourceCompatibility = 17
-targetCompatibility = 17
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
 
 sourceSets {
     main {
diff --git a/validator/src/main/java/com/google/bos/iot/core/proxy/MqttPublisher.java b/validator/src/main/java/com/google/bos/iot/core/proxy/MqttPublisher.java
index f2282cc434..cf5d701232 100644
--- a/validator/src/main/java/com/google/bos/iot/core/proxy/MqttPublisher.java
+++ b/validator/src/main/java/com/google/bos/iot/core/proxy/MqttPublisher.java
@@ -1,7 +1,7 @@
 package com.google.bos.iot.core.proxy;
 
 import static com.google.bos.iot.core.proxy.ProxyTarget.STATE_TOPIC;
-import static udmi.schema.ExecutionConfiguration.IotProvider.CLEARBLADE;
+import static udmi.schema.IotAccess.IotProvider.CLEARBLADE;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
@@ -33,7 +33,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import udmi.schema.ExecutionConfiguration;
-import udmi.schema.ExecutionConfiguration.IotProvider;
+import udmi.schema.IotAccess.IotProvider;
 
 /**
  * Handle publishing sensor data to a Cloud IoT MQTT endpoint.
diff --git a/validator/src/main/java/com/google/daq/mqtt/registrar/Registrar.java b/validator/src/main/java/com/google/daq/mqtt/registrar/Registrar.java
index d8c2dc39c5..fdc56f5613 100644
--- a/validator/src/main/java/com/google/daq/mqtt/registrar/Registrar.java
+++ b/validator/src/main/java/com/google/daq/mqtt/registrar/Registrar.java
@@ -7,7 +7,6 @@
 import static com.google.udmi.util.Common.UDMI_VERSION_KEY;
 import static com.google.udmi.util.GeneralUtils.CSV_JOINER;
 import static com.google.udmi.util.GeneralUtils.ifNotNullGet;
-import static com.google.udmi.util.GeneralUtils.ifNotNullGet;
 import static com.google.udmi.util.GeneralUtils.isTrue;
 import static com.google.udmi.util.JsonUtil.OBJECT_MAPPER;
 import static java.util.Optional.ofNullable;
@@ -60,7 +59,7 @@
 import udmi.schema.Credential;
 import udmi.schema.Envelope.SubFolder;
 import udmi.schema.ExecutionConfiguration;
-import udmi.schema.ExecutionConfiguration.IotProvider;
+import udmi.schema.IotAccess.IotProvider;
 import udmi.schema.Metadata;
 import udmi.schema.SetupUdmiConfig;
 
diff --git a/validator/src/main/java/com/google/daq/mqtt/util/CloudIotManager.java b/validator/src/main/java/com/google/daq/mqtt/util/CloudIotManager.java
index a0ae704182..788dae4052 100644
--- a/validator/src/main/java/com/google/daq/mqtt/util/CloudIotManager.java
+++ b/validator/src/main/java/com/google/daq/mqtt/util/CloudIotManager.java
@@ -3,14 +3,12 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.daq.mqtt.util.ConfigUtil.readExecutionConfiguration;
 import static java.util.Optional.ofNullable;
-import static udmi.schema.ExecutionConfiguration.IotProvider.GCP_NATIVE;
+import static udmi.schema.IotAccess.IotProvider.GCP_NATIVE;
 
 import com.google.common.collect.ImmutableList;
-import com.google.udmi.util.Common;
 import com.google.udmi.util.SiteModel;
 import java.io.File;
 import java.util.Base64;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -21,8 +19,8 @@
 import udmi.schema.Credential;
 import udmi.schema.Credential.Key_format;
 import udmi.schema.ExecutionConfiguration;
+import udmi.schema.IotAccess;
 import udmi.schema.SetupUdmiConfig;
-import udmi.schema.SetupUdmiState;
 
 /**
  * Encapsulation of all Cloud IoT interaction functions.
@@ -57,7 +55,7 @@ public class CloudIotManager {
    * @param iotProvider    indicates which iot provider type
    */
   public CloudIotManager(String projectId, File siteDir, String altRegistry,
-      String registrySuffix, ExecutionConfiguration.IotProvider iotProvider) {
+      String registrySuffix, IotAccess.IotProvider iotProvider) {
     checkNotNull(projectId, "project id undefined");
     this.siteDir = checkNotNull(siteDir, "site directory undefined");
     this.useReflectClient = ofNullable(iotProvider).orElse(GCP_NATIVE) != GCP_NATIVE;
diff --git a/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java b/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java
index 02233f853f..cc9752992b 100644
--- a/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java
+++ b/validator/src/main/java/com/google/daq/mqtt/validator/Validator.java
@@ -86,7 +86,7 @@
 import udmi.schema.Envelope.SubFolder;
 import udmi.schema.Envelope.SubType;
 import udmi.schema.ExecutionConfiguration;
-import udmi.schema.ExecutionConfiguration.IotProvider;
+import udmi.schema.IotAccess.IotProvider;
 import udmi.schema.Level;
 import udmi.schema.Metadata;
 import udmi.schema.PointsetEvent;
diff --git a/validator/validator.iml b/validator/validator.iml
index fc22cc9ba3..ff729d4088 100644
--- a/validator/validator.iml
+++ b/validator/validator.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="validator" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="daq-validator" external.system.module.version="1.0-SNAPSHOT" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_17">
+  <component name="NewModuleRootManager">
     <output url="file://$MODULE_DIR$/out/production/classes" />
     <output-test url="file://$MODULE_DIR$/out/test/classes" />
     <exclude-output />