E2E test for connection events (Azure#4423) (Azure#4464)

Co-authored-by: vipeller <51135538+vipeller@users.noreply.github.com>
damonbarry · Apr 14, 2022 · 9bd61d3 · 9bd61d3
1 parent 055a569
commit 9bd61d3
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/e2e_deployment_files/nestededge_middleLayerBaseDeployment_amqp.json b/e2e_deployment_files/nestededge_middleLayerBaseDeployment_amqp.json
@@ -33,7 +33,7 @@
                 "value": "true"
               },
               "DeviceScopeCacheRefreshDelaySecs": {
-                "value": 1
+                "value": 0
               },
               "RuntimeLogLevel": {
                 "value": "debug"

diff --git a/e2e_deployment_files/nestededge_middleLayerBaseDeployment_mqtt.json b/e2e_deployment_files/nestededge_middleLayerBaseDeployment_mqtt.json
@@ -43,7 +43,7 @@
                 "value": "true"
               },
               "DeviceScopeCacheRefreshDelaySecs": {
-                "value": 1
+                "value": 0
               },
               "RuntimeLogLevel": {
                 "value": "debug"

diff --git a/e2e_deployment_files/nestededge_topLayerBaseDeployment_amqp.json b/e2e_deployment_files/nestededge_topLayerBaseDeployment_amqp.json
@@ -42,7 +42,7 @@
                 "value": "true"
               },
               "DeviceScopeCacheRefreshDelaySecs": {
-                "value": 1
+                "value": 0
               },
               "RuntimeLogLevel": {
                 "value": "debug"

diff --git a/e2e_deployment_files/nestededge_topLayerBaseDeployment_mqtt.json b/e2e_deployment_files/nestededge_topLayerBaseDeployment_mqtt.json
@@ -45,7 +45,7 @@
                 "value": "true"
               },
               "DeviceScopeCacheRefreshDelaySecs": {
-                "value": 1
+                "value": 0
               },
               "RuntimeLogLevel": {
                 "value": "debug"

diff --git a/test/Microsoft.Azure.Devices.Edge.Test.Common/EdgeRuntime.cs b/test/Microsoft.Azure.Devices.Edge.Test.Common/EdgeRuntime.cs
@@ -44,7 +44,7 @@ public async Task<EdgeDeployment> DeployConfigurationAsync(
 
             if (nestedEdge == true)
             {
-                hubEnvVar = new[] { ("RuntimeLogLevel", "debug"), ("experimentalFeatures__enabled", "true"), ("experimentalFeatures__nestedEdgeEnabled", "true"), ("DeviceScopeCacheRefreshDelaySecs", "1") };
+                hubEnvVar = new[] { ("RuntimeLogLevel", "debug"), ("experimentalFeatures__enabled", "true"), ("experimentalFeatures__nestedEdgeEnabled", "true"), ("DeviceScopeCacheRefreshDelaySecs", "0") };
             }
             else
             {

diff --git a/test/Microsoft.Azure.Devices.Edge.Test/PlugAndPlay.cs b/test/Microsoft.Azure.Devices.Edge.Test/PlugAndPlay.cs
@@ -37,6 +37,13 @@ public async Task PlugAndPlayDeviceClient(Protocol protocol, bool brokerOn)
         {
             CancellationToken token = this.TestToken;
             string leafDeviceId = DeviceId.Current.Generate();
+
+            // If broker is on, MQTT will be used by default in nested environment. And new MQTT won't work for P&P
+            if (Context.Current.NestedEdge && brokerOn)
+            {
+                Assert.Ignore();
+            }
+
             EdgeDeployment deployment = await this.runtime.DeployConfigurationAsync(
                 builder =>
                 {
@@ -85,6 +92,13 @@ await TryFinally.DoAsync(
         public async Task PlugAndPlayModuleClient(Protocol protocol, bool brokerOn)
         {
             CancellationToken token = this.TestToken;
+
+            // If broker is on, MQTT will be used by default in nested environment. And new MQTT won't work for P&P
+            if (Context.Current.NestedEdge && brokerOn)
+            {
+                Assert.Ignore();
+            }
+
             string loadGenImage = Context.Current.LoadGenImage.Expect(() => new ArgumentException("loadGenImage parameter is required for Priority Queues test"));
             EdgeDeployment deployment = await this.runtime.DeployConfigurationAsync(
                 builder =>