Make OptimizeForPerformance Configurable. (Azure#282)

* Make OptimizeForPerformance Configurable. * Fixed typo.
pratson20 · Sep 14, 2018 · 5155346 · 5155346
1 parent 94621d5
commit 5155346
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 26 deletions.
diff --git a/smoke/IotEdgeQuickstart/Program.cs b/smoke/IotEdgeQuickstart/Program.cs
@@ -33,25 +33,26 @@ All options to this command have defaults. If an option is not specified and
   its corresponding environment variable is not defined, then the default will
   be used.
 
-  Option                    Default value
-  --bootstrapper            'iotedged'
-  --bootstrapper-archive    no path (archive is installed from apt or pypi)
-  --connection-string       get the value from Key Vault
-  --device-id               an auto-generated unique identifier
-  --edge-hostname           'quickstart'
-  --eventhub-endpoint       get the value from Key Vault
-  --leave-running           none (or 'all' if given as a switch)
-  --password                anonymous, or Key Vault if --registry is specified
-  --registry                mcr.microsoft.com (anonymous)
-  --tag                     '1.0'
-  --use-http                if --bootstrapper=iotedged then use Unix Domain
-                            Sockets, otherwise N/A
-                            switch form uses local IP address as hostname
-  --username                anonymous, or Key Vault if --registry is specified
-  --no-deployment           deploy Edge Hub and temperature sensor modules
-  --no-verify               false
-  --verify-data-from-module tempSensor
-  --deployment              deployment json file
+  Option                     Default value
+  --bootstrapper             'iotedged'
+  --bootstrapper-archive     no path (archive is installed from apt or pypi)
+  --connection-string        get the value from Key Vault
+  --device-id                an auto-generated unique identifier
+  --edge-hostname            'quickstart'
+  --eventhub-endpoint        get the value from Key Vault
+  --leave-running            none (or 'all' if given as a switch)
+  --password                 anonymous, or Key Vault if --registry is specified
+  --registry                 mcr.microsoft.com (anonymous)
+  --tag                      '1.0'
+  --use-http                 if --bootstrapper=iotedged then use Unix Domain
+                             Sockets, otherwise N/A
+                             switch form uses local IP address as hostname
+  --username                 anonymous, or Key Vault if --registry is specified
+  --no-deployment            deploy Edge Hub and temperature sensor modules
+  --no-verify                false
+  --optimize_for_performance true
+  --verify-data-from-module  tempSensor
+  --deployment               deployment json file
 "
         )]
     [HelpOption]
@@ -102,6 +103,9 @@ class Program
         [Option("--no-verify", CommandOptionType.NoValue, Description = "Don't verify the behavior of the deployment (e.g.: temp sensor)")]
         public bool NoVerify { get; } = false;
 
+        [Option("--optimize_for_performance <true/false>", CommandOptionType.SingleValue, Description = "Add OptimizeForPerformance Flag on edgeHub. Only when no deployment is passed.")]
+        public bool OptimizeForPerformance { get; } = true;
+
         [Option("--verify-data-from-module", Description = "Verify if a given module sent data do IoTHub.")]
         public string VerifyDataFromModule { get; } = "tempSensor";
 
@@ -186,7 +190,8 @@ async Task<int> OnExecuteAsync()
                     deployment,
                     this.DeviceCaCert,
                     this.DeviceCaPk,
-                    this.DeviceCaCerts);
+                    this.DeviceCaCerts,
+                    this.OptimizeForPerformance);
                 await test.RunAsync();
             }
             catch (Exception ex)

diff --git a/smoke/IotEdgeQuickstart/Quickstart.cs b/smoke/IotEdgeQuickstart/Quickstart.cs
@@ -30,8 +30,9 @@ public Quickstart(
             Option<string> deploymentFileName,
             string deviceCaCert,
             string deviceCaPk,
-            string deviceCaCerts) :
-            base(bootstrapper, credentials, iothubConnectionString, eventhubCompatibleEndpointWithEntityPath, imageTag, deviceId, hostname, deploymentFileName, deviceCaCert, deviceCaPk, deviceCaCerts)
+            string deviceCaCerts,
+            bool optimizedForPerformance) :
+            base(bootstrapper, credentials, iothubConnectionString, eventhubCompatibleEndpointWithEntityPath, imageTag, deviceId, hostname, deploymentFileName, deviceCaCert, deviceCaPk, deviceCaCerts, optimizedForPerformance)
         {
             this.leaveRunning = leaveRunning;
             this.noDeployment = noDeployment;

diff --git a/smoke/IotEdgeQuickstart/details/Details.cs b/smoke/IotEdgeQuickstart/details/Details.cs
@@ -29,6 +29,7 @@ public class Details
         readonly string deviceCaCert;
         readonly string deviceCaPk;
         readonly string deviceCaCerts;
+        readonly bool optimizedForPerformance;
 
         DeviceContext context;
 
@@ -43,7 +44,8 @@ protected Details(
             Option<string> deploymentFileName,
             string deviceCaCert,
             string deviceCaPk,
-            string deviceCaCerts
+            string deviceCaCerts,
+            bool optimizedForPerformance
             )
         {
             this.bootstrapper = bootstrapper;
@@ -57,6 +59,7 @@ string deviceCaCerts
             this.deviceCaCert = deviceCaCert;
             this.deviceCaPk = deviceCaPk;
             this.deviceCaCerts = deviceCaCerts;
+            this.optimizedForPerformance = optimizedForPerformance;
         }
 
         protected Task VerifyEdgeIsNotAlreadyActive() => this.bootstrapper.VerifyNotActive();
@@ -328,6 +331,7 @@ string BuildImageName(string name)
                     json = Regex.Replace(json, "<image-edge-hub>", edgeHubImage);
                     json = Regex.Replace(json, "<image-temp-sensor>", tempSensorImage);
                     json = Regex.Replace(json, "<registry-info>", deployJsonRegistry);
+                    json = Regex.Replace(json, "<optimized-for-performance>", this.optimizedForPerformance.ToString());
                     return json;
                 });
 
@@ -368,7 +372,7 @@ string BuildImageName(string name)
             },
 		    ""env"": {
 				""OptimizeForPerformance"": {
-					""value"": ""false""
+					""value"": ""<optimized-for-performance>""
 				}
 			},
           }

diff --git a/smoke/IotEdgeQuickstart/e2e_deployment_files/module_to_functions_deployment.template.json b/smoke/IotEdgeQuickstart/e2e_deployment_files/module_to_functions_deployment.template.json
@@ -33,7 +33,7 @@
             },
 		    "env": {
 				"OptimizeForPerformance": {
-					"value": "false"
+					"value": "<OptimizeForPerformance>"
 				}
 			},
             "status": "running",

diff --git a/smoke/IotEdgeQuickstart/e2e_deployment_files/module_to_module_deployment.template.json b/smoke/IotEdgeQuickstart/e2e_deployment_files/module_to_module_deployment.template.json
@@ -33,7 +33,7 @@
             },
 		    "env": {
 				"OptimizeForPerformance": {
-					"value": "false"
+					"value": "<OptimizeForPerformance>"
 				}
 			},
             "status": "running",