Merge pull request #318 from arocho032/master

paterasMSFT · web-flow · commit 17fa81b07b13 · 2023-01-23T15:21:40.000-05:00
Updated Pool creation to use VirtualMachineConfiguration
diff --git a/CSharp/ArticleProjects/ApplicationInsights/README.md b/CSharp/ArticleProjects/ApplicationInsights/README.md
@@ -310,9 +310,16 @@ binaries on the machine and keep a process running indefinitely.
 CloudPool pool = client.PoolOperations.CreatePool(
     topNWordsConfiguration.PoolId,
     targetDedicated: topNWordsConfiguration.PoolNodeCount,
-    virtualMachineSize: "standard_d1_v2",
-    cloudServiceConfiguration: new CloudServiceConfiguration(osFamily: "5"));
-
+    virtualMachineSize: "standard_d2_v3",
+    virtualMachineConfiguration: new VirtualMachineConfiguration(
+    imageReference: new ImageReference(
+            publisher: topNWordsConfiguration.ImagePublisher,
+            offer: topNWordsConfiguration.ImageOffer,
+            sku: topNWordsConfiguration.ImageSku,
+            version: topNWordsConfiguration.ImageVersion
+        ),
+    nodeAgentSkuId: topNWordsConfiguration.NodeAgentSkuId));
+    
 // Create file staging objects that represent the executable and its dependent assembly to run as the task.
 // These files are copied to every node before the corresponding task is scheduled to run on that node.
 FileToStage applicationMonitoringExe = new FileToStage(BatchApplicationInsightsAssemblyExeName, stagingStorageAccount);
diff --git a/CSharp/ArticleProjects/ApplicationInsights/TopNWords/Job.cs b/CSharp/ArticleProjects/ApplicationInsights/TopNWords/Job.cs
@@ -83,8 +83,15 @@ public async static Task JobMain(string[] args)
                 CloudPool pool = client.PoolOperations.CreatePool(
                     topNWordsConfiguration.PoolId,
                     targetDedicatedComputeNodes: topNWordsConfiguration.PoolNodeCount,
-                    virtualMachineSize: "standard_d1_v2",
-                    cloudServiceConfiguration: new CloudServiceConfiguration(osFamily: "5"));
+                    virtualMachineSize: topNWordsConfiguration.PoolNodeVirtualMachineSize,
+                    virtualMachineConfiguration: new VirtualMachineConfiguration(
+                    imageReference: new ImageReference(
+                            publisher: topNWordsConfiguration.ImagePublisher,
+                            offer: topNWordsConfiguration.ImageOffer,
+                            sku: topNWordsConfiguration.ImageSku,
+                            version: topNWordsConfiguration.ImageVersion
+                        ),
+                    nodeAgentSkuId: topNWordsConfiguration.NodeAgentSkuId));
 
                 List<string> files = new List<string>
                 {
diff --git a/CSharp/ArticleProjects/ApplicationInsights/TopNWords/Settings.cs b/CSharp/ArticleProjects/ApplicationInsights/TopNWords/Settings.cs
@@ -16,5 +16,11 @@ public class Settings
         public bool ShouldDeleteJob { get; set; }
         public bool ShouldDeletePool { get; set; }
         public bool ShouldDeleteContainer { get; set; }
+        public string PoolNodeVirtualMachineSize { get; set; }
+        public string ImagePublisher { get; set; }
+        public string ImageOffer { get; set; }
+        public string ImageSku { get; set; }
+        public string ImageVersion { get; set; }
+        public string NodeAgentSkuId { get; set; }           
     }
 }
diff --git a/CSharp/ArticleProjects/ApplicationInsights/TopNWords/settings.json b/CSharp/ArticleProjects/ApplicationInsights/TopNWords/settings.json
@@ -6,5 +6,11 @@
   "shouldDeletePool": false,
   "shouldDeleteContainer": true,
   "poolId": "TopNWordsPool",
-  "jobId": "TopNWordsJob"
+  "jobId": "TopNWordsJob",
+  "poolNodeVirtualMachineSize": "standard_d2_v3",
+  "imagePublisher": "MicrosoftWindowsServer",
+  "imageOffer": "WindowsServer",
+  "imageSku": "2016-Datacenter-smalldisk",
+  "imageVersion": "latest",
+  "nodeAgentSkuId": "batch.node.windows amd64"   
 }
diff --git a/CSharp/ArticleProjects/JobPrepRelease/Program.cs b/CSharp/ArticleProjects/JobPrepRelease/Program.cs
@@ -74,7 +74,7 @@ private static async Task MainAsync(string[] args)
                 CloudPool pool = await ArticleHelpers.CreatePoolIfNotExistAsync(
                     batchClient,
                     poolId,
-                    "standard_d1_v2",
+                    "standard_d2_v3",
                     2,
                     1);
                 
diff --git a/CSharp/ArticleProjects/MultiInstanceTasks/Program.cs b/CSharp/ArticleProjects/MultiInstanceTasks/Program.cs
@@ -198,10 +198,17 @@ private static async Task CreatePoolAsync(BatchClient batchClient, string poolId
             CloudPool unboundPool =
                 batchClient.PoolOperations.CreatePool(
                     poolId: poolId,
-                    virtualMachineSize: "standard_d1_v2",
+                    virtualMachineSize: "standard_d2_v3",
                     targetDedicatedComputeNodes: numberOfNodes,
-                    cloudServiceConfiguration: new CloudServiceConfiguration(osFamily: "5"));
-
+                    virtualMachineConfiguration: new VirtualMachineConfiguration(
+                    imageReference: new ImageReference(
+                            publisher: "MicrosoftWindowsServer",
+                            offer: "WindowsServer",
+                            sku: "2016-Datacenter-smalldisk",
+                            version: "latest"
+                        ),
+                    nodeAgentSkuId: "batch.node.windows amd64"));
+                    
             // REQUIRED for communication between the MS-MPI processes (in this
             // sample, MPIHelloWorld.exe) running on the different nodes
             unboundPool.InterComputeNodeCommunicationEnabled = true;
diff --git a/CSharp/ArticleProjects/ParallelTasks/Program.cs b/CSharp/ArticleProjects/ParallelTasks/Program.cs
@@ -45,7 +45,7 @@ public static void Main(string[] args)
         private static async Task MainAsync(string[] args)
         {
             // You may adjust these values to experiment with different compute resource scenarios.
-            const string nodeSize      = "standard_d1_v2";
+            const string nodeSize      = "standard_d2_v3";
             const int nodeCount        = 4;
             const int taskSlotsPerNode = 4;
             const int taskCount        = 32;
diff --git a/CSharp/ArticleProjects/PersistOutputs/FileConventionsExample.cs b/CSharp/ArticleProjects/PersistOutputs/FileConventionsExample.cs
@@ -24,11 +24,20 @@ public static async Task<CloudBlobContainer> Run(
             const string appPackageVersion = "1.0";
 
             // Create and configure an unbound pool.
-            CloudPool pool = batchClient.PoolOperations.CreatePool(
-                poolId: poolId,
-                virtualMachineSize: "standard_d1_v2",
+            Func<ImageReference, bool> imageScanner = imageRef =>
+                imageRef.Publisher.Equals("MicrosoftWindowsServer", StringComparison.InvariantCultureIgnoreCase) &&
+                imageRef.Offer.Equals("WindowsServer", StringComparison.InvariantCultureIgnoreCase) &&
+                imageRef.Sku.IndexOf("2012-R2-Datacenter", StringComparison.InvariantCultureIgnoreCase) > -1;
+
+            ImageInformation imageInfo = await SampleHelpers.GetNodeAgentSkuReferenceAsync(batchClient, imageScanner);
+
+            // Create and configure an unbound pool.
+            CloudPool pool = batchClient.PoolOperations.CreatePool(poolId: poolId,
+                virtualMachineSize: "standard_d2_v3",
                 targetDedicatedComputeNodes: nodeCount,
-                cloudServiceConfiguration: new CloudServiceConfiguration(osFamily: "5"));
+                virtualMachineConfiguration: new VirtualMachineConfiguration(
+                    imageInfo.ImageReference,
+                    imageInfo.NodeAgentSkuId));
 
             // Specify the application and version to deploy to the compute nodes. You must
             // first build PersistOutputsTask, then upload it as an application package.
diff --git a/CSharp/ArticleProjects/PersistOutputs/OutputFilesExample.cs b/CSharp/ArticleProjects/PersistOutputs/OutputFilesExample.cs
@@ -191,7 +191,7 @@ private static async Task CreatePoolAsync(BatchClient batchClient, string poolId
 
             // Create and configure an unbound pool.
             CloudPool pool = batchClient.PoolOperations.CreatePool(poolId: poolId,
-                virtualMachineSize: "standard_d1_v2",
+                virtualMachineSize: "standard_d2_v3",
                 targetDedicatedComputeNodes: nodeCount,
                 virtualMachineConfiguration: new VirtualMachineConfiguration(
                     imageInfo.ImageReference,
diff --git a/CSharp/ArticleProjects/TaskDependencies/Program.cs b/CSharp/ArticleProjects/TaskDependencies/Program.cs
@@ -38,7 +38,7 @@ public static void Main(string[] args)
         private static async Task MainAsync(string[] args)
         {
             // You may adjust these values to experiment with different compute resource scenarios.
-            const string nodeSize = "standard_d1_v2";
+            const string nodeSize = "standard_d2_v3";
             const string osFamily = "5";
             const int nodeCount = 1;
 
@@ -66,8 +66,15 @@ private static async Task MainAsync(string[] args)
                     CloudPool unboundPool =
                         batchClient.PoolOperations.CreatePool(
                             poolId: poolId,
-                            cloudServiceConfiguration: new CloudServiceConfiguration(osFamily),
-                            virtualMachineSize: nodeSize,
+                            virtualMachineSize: "standard_d2_v3",
+                            virtualMachineConfiguration: new VirtualMachineConfiguration(
+                            imageReference: new ImageReference(
+                                    publisher: "MicrosoftWindowsServer",
+                                    offer: "WindowsServer",
+                                    sku: "2016-Datacenter-smalldisk",
+                                    version: "latest"
+                                ),
+                            nodeAgentSkuId: "batch.node.windows amd64"),
                             targetDedicatedComputeNodes: nodeCount);
                     await unboundPool.CommitAsync();
 
diff --git a/CSharp/BatchMetrics/BatchMetricsUsageSample/JobSubmitter.cs b/CSharp/BatchMetrics/BatchMetricsUsageSample/JobSubmitter.cs
@@ -21,7 +21,7 @@ public class JobSubmitter
 
         private const string PoolId = "batchmetrics-testpool";
         private const int PoolNodeCount = 5;
-        private const string PoolNodeSize = "small";
+        private const string PoolNodeSize = "standard_d2_v3";
         private const string PoolOSFamily = "4";
 
         private const int TestJobCount = 10;
@@ -46,8 +46,14 @@ private async Task CreatePoolAsync()
                 poolId: PoolId,
                 targetDedicatedComputeNodes: PoolNodeCount,
                 virtualMachineSize: PoolNodeSize,
-                cloudServiceConfiguration: new CloudServiceConfiguration(PoolOSFamily));
-
+                virtualMachineConfiguration: new VirtualMachineConfiguration(
+                imageReference: new ImageReference(
+                        publisher: "MicrosoftWindowsServer",
+                        offer: "WindowsServer",
+                        sku: "2016-Datacenter-smalldisk",
+                        version: "latest"
+                    ),
+                nodeAgentSkuId: "batch.node.windows amd64"));
             pool.TaskSlotsPerNode = 2;
 
             var createPoolResult = await GettingStartedCommon.CreatePoolIfNotExistAsync(this.batchClient, pool);
diff --git a/CSharp/Common/ArticleHelpers.cs b/CSharp/Common/ArticleHelpers.cs
@@ -29,7 +29,14 @@ public async static Task<CloudPool> CreatePoolIfNotExistAsync(BatchClient batchC
             CloudPool pool = batchClient.PoolOperations.CreatePool(poolId: poolId,
                 virtualMachineSize: nodeSize,
                 targetDedicatedComputeNodes: nodeCount,
-                cloudServiceConfiguration: new CloudServiceConfiguration("5"));
+                virtualMachineConfiguration: new VirtualMachineConfiguration(
+                imageReference: new ImageReference(
+                        publisher: "MicrosoftWindowsServer",
+                        offer: "WindowsServer",
+                        sku: "2016-Datacenter-smalldisk",
+                        version: "latest"
+                    ),
+                nodeAgentSkuId: "batch.node.windows amd64"));
 
             pool.TaskSlotsPerNode = taskSlotsPerNode;
 
diff --git a/CSharp/GettingStarted/01_HelloWorld/Program.cs b/CSharp/GettingStarted/01_HelloWorld/Program.cs
@@ -21,7 +21,6 @@ public static void Main(string[] args)
             try
             {
                 AccountSettings accountSettings = SampleHelpers.LoadAccountSettings();
-
                 Settings helloWorldSettings = new ConfigurationBuilder()
                     .SetBasePath(Directory.GetCurrentDirectory())
                     .AddJsonFile("settings.json")
@@ -49,7 +48,9 @@ public static void Main(string[] args)
         /// <summary>
         /// Submits a job to the Azure Batch service, and waits for it to complete
         /// </summary>
-        private static async Task HelloWorldAsync(AccountSettings accountSettings, Settings helloWorldConfigurationSettings)
+        private static async Task HelloWorldAsync(
+            AccountSettings accountSettings, 
+            Settings helloWorldConfigurationSettings)
         {
             Console.WriteLine("Running with the following settings: ");
             Console.WriteLine("-------------------------------------");
@@ -97,7 +98,10 @@ private static async Task HelloWorldAsync(AccountSettings accountSettings, Setti
         /// <param name="configurationSettings">The configuration settings</param>
         /// <param name="jobId">The ID of the job.</param>
         /// <returns>An asynchronous <see cref="Task"/> representing the operation.</returns>
-        private static async Task SubmitJobAsync(BatchClient batchClient, Settings configurationSettings, string jobId)
+        private static async Task SubmitJobAsync(
+            BatchClient batchClient, 
+            Settings configurationSettings,
+            string jobId)
         {
             // create an empty unbound Job
             CloudJob unboundJob = batchClient.JobOperations.CreateJob();
@@ -112,8 +116,15 @@ private static async Task SubmitJobAsync(BatchClient batchClient, Settings confi
                     PoolSpecification = new PoolSpecification()
                     {
                         TargetDedicatedComputeNodes = configurationSettings.PoolTargetNodeCount,
-                        CloudServiceConfiguration = new CloudServiceConfiguration(configurationSettings.PoolOSFamily),
-                        VirtualMachineSize = configurationSettings.PoolNodeVirtualMachineSize
+                        VirtualMachineSize = configurationSettings.PoolNodeVirtualMachineSize,
+                        VirtualMachineConfiguration = new VirtualMachineConfiguration(
+                        imageReference: new ImageReference(
+                                publisher: configurationSettings.ImagePublisher,
+                                offer: configurationSettings.ImageOffer,
+                                sku: configurationSettings.ImageSku,
+                                version: configurationSettings.ImageVersion
+                            ),
+                        nodeAgentSkuId: configurationSettings.NodeAgentSkuId),
                     },
                     KeepAlive = false,
                     PoolLifetimeOption = PoolLifetimeOption.Job
diff --git a/CSharp/GettingStarted/01_HelloWorld/Settings.cs b/CSharp/GettingStarted/01_HelloWorld/Settings.cs
@@ -10,6 +10,11 @@ public partial class Settings
         public string PoolOSFamily { get; set; }
         public string PoolNodeVirtualMachineSize { get; set; }
         public bool ShouldDeleteJob { get; set; }
+        public string ImagePublisher { get; set; }
+        public string ImageOffer { get; set; }
+        public string ImageSku { get; set; }
+        public string ImageVersion { get; set; }
+        public string NodeAgentSkuId { get; set; }
 
         public override string ToString()
         {
@@ -20,6 +25,12 @@ public override string ToString()
             SampleHelpers.AddSetting(stringBuilder, "PoolOSFamily", this.PoolOSFamily);
             SampleHelpers.AddSetting(stringBuilder, "PoolNodeVirtualMachineSize", this.PoolNodeVirtualMachineSize);
             SampleHelpers.AddSetting(stringBuilder, "ShouldDeleteJob", this.ShouldDeleteJob);
+            SampleHelpers.AddSetting(stringBuilder, "ImagePublisher", this.ImagePublisher);
+            SampleHelpers.AddSetting(stringBuilder, "ImageOffer", this.ImageOffer);
+            SampleHelpers.AddSetting(stringBuilder, "ImageSku", this.ImageSku);
+            SampleHelpers.AddSetting(stringBuilder, "ImageVersion", this.ImageVersion);
+            SampleHelpers.AddSetting(stringBuilder, "NodeAgentSkuId", this.NodeAgentSkuId);
+
 
             return stringBuilder.ToString();
         }
diff --git a/CSharp/GettingStarted/01_HelloWorld/settings.json b/CSharp/GettingStarted/01_HelloWorld/settings.json
@@ -1,7 +1,12 @@
 ﻿{
   "poolTargetNodeCount": 2,
-  "poolNodeVirtualMachineSize": "standard_d1_v2",
+  "poolNodeVirtualMachineSize": "standard_d2_v3",
   "poolOSFamily": "5",
   "poolId": "HelloWorld-Pool",
-  "shouldDeleteJob":  true
+  "shouldDeleteJob": true,
+  "imagePublisher": "MicrosoftWindowsServer",
+  "imageOffer": "WindowsServer",
+  "imageSku": "2016-Datacenter-smalldisk",
+  "imageVersion": "latest",
+  "nodeAgentSkuId": "batch.node.windows amd64"
 }
diff --git a/CSharp/GettingStarted/02_PoolsAndResourceFiles/JobSubmitter/JobSubmitter.cs b/CSharp/GettingStarted/02_PoolsAndResourceFiles/JobSubmitter/JobSubmitter.cs
@@ -128,13 +128,21 @@ public async Task RunAsync()
         /// <returns>An asynchronous <see cref="Task"/> representing the operation.</returns>
         private async Task CreatePoolIfNotExistAsync(BatchClient batchClient, CloudStorageAccount cloudStorageAccount)
         {
+
             // You can learn more about os families and versions at:
             // https://azure.microsoft.com/en-us/documentation/articles/cloud-services-guestos-update-matrix/
             CloudPool pool = batchClient.PoolOperations.CreatePool(
                 poolId: this.poolsAndResourceFileSettings.PoolId,
                 targetDedicatedComputeNodes: this.poolsAndResourceFileSettings.PoolTargetNodeCount,
                 virtualMachineSize: this.poolsAndResourceFileSettings.PoolNodeVirtualMachineSize,
-                cloudServiceConfiguration: new CloudServiceConfiguration(this.poolsAndResourceFileSettings.PoolOsFamily));
+                virtualMachineConfiguration: new VirtualMachineConfiguration(
+                        imageReference: new ImageReference(
+                                publisher: poolsAndResourceFileSettings.ImagePublisher,
+                                offer: poolsAndResourceFileSettings.ImageOffer,
+                                sku: poolsAndResourceFileSettings.ImageSku,
+                                version: poolsAndResourceFileSettings.ImageVersion
+                            ),
+                        nodeAgentSkuId: poolsAndResourceFileSettings.NodeAgentSkuId));
 
             // Create a new start task to facilitate pool-wide file management or installation.
             // In this case, we just add a single dummy data file to the StartTask.
diff --git a/CSharp/GettingStarted/02_PoolsAndResourceFiles/JobSubmitter/Settings.cs b/CSharp/GettingStarted/02_PoolsAndResourceFiles/JobSubmitter/Settings.cs
@@ -14,6 +14,11 @@ public class Settings
         public bool ShouldDeletePool { get; set; }
         public bool ShouldDeleteJob { get; set; }
         public string BlobContainer { get; set; }
+        public string ImagePublisher { get; set; }
+        public string ImageOffer { get; set; }
+        public string ImageSku { get; set; }
+        public string ImageVersion { get; set; }
+        public string NodeAgentSkuId { get; set; }        
 
         public override string ToString()
         {
@@ -26,6 +31,11 @@ public override string ToString()
             SampleHelpers.AddSetting(stringBuilder, "ShouldDeletePool", this.ShouldDeletePool);
             SampleHelpers.AddSetting(stringBuilder, "ShouldDeleteJob", this.ShouldDeleteJob);
             SampleHelpers.AddSetting(stringBuilder, "BlobContainer", this.BlobContainer);
+            SampleHelpers.AddSetting(stringBuilder, "ImagePublisher", this.ImagePublisher);
+            SampleHelpers.AddSetting(stringBuilder, "ImageOffer", this.ImageOffer);
+            SampleHelpers.AddSetting(stringBuilder, "ImageSku", this.ImageSku);
+            SampleHelpers.AddSetting(stringBuilder, "ImageVersion", this.ImageVersion);
+            SampleHelpers.AddSetting(stringBuilder, "NodeAgentSkuId", this.NodeAgentSkuId);
             
             return stringBuilder.ToString();
         }
diff --git a/CSharp/GettingStarted/02_PoolsAndResourceFiles/JobSubmitter/settings.json b/CSharp/GettingStarted/02_PoolsAndResourceFiles/JobSubmitter/settings.json
@@ -1,9 +1,14 @@
 ﻿{
   "poolTargetNodeCount": 2,
-  "poolNodeVirtualMachineSize": "standard_d1_v2",
+  "poolNodeVirtualMachineSize": "standard_d2_v3",
   "poolOSFamily": "5",
   "poolId": "PoolsAndResourceFilesPool",
   "shouldDeleteJob": true,
   "shouldDeletePool": false,
-  "blobContainer": "PoolAndResourceFilesContainer"
+  "blobContainer": "PoolAndResourceFilesContainer",
+  "imagePublisher": "MicrosoftWindowsServer",
+  "imageOffer": "WindowsServer",
+  "imageSku": "2016-Datacenter-smalldisk",
+  "imageVersion": "latest",
+  "nodeAgentSkuId": "batch.node.windows amd64"  
 }
diff --git a/CSharp/GettingStarted/03_JobManager/JobSubmitter/JobSubmitter.cs b/CSharp/GettingStarted/03_JobManager/JobSubmitter/JobSubmitter.cs
diff --git a/CSharp/GettingStarted/03_JobManager/JobSubmitter/Settings.cs b/CSharp/GettingStarted/03_JobManager/JobSubmitter/Settings.cs
diff --git a/CSharp/GettingStarted/03_JobManager/JobSubmitter/settings.json b/CSharp/GettingStarted/03_JobManager/JobSubmitter/settings.json
diff --git a/CSharp/TextSearch/Common/Settings.cs b/CSharp/TextSearch/Common/Settings.cs
diff --git a/CSharp/TextSearch/Common/settings.json b/CSharp/TextSearch/Common/settings.json
diff --git a/CSharp/TextSearch/JobSubmitter/JobSubmitter.cs b/CSharp/TextSearch/JobSubmitter/JobSubmitter.cs
diff --git a/CSharp/TopNWords/Job.cs b/CSharp/TopNWords/Job.cs
diff --git a/CSharp/TopNWords/Settings.cs b/CSharp/TopNWords/Settings.cs
diff --git a/CSharp/TopNWords/settings.json b/CSharp/TopNWords/settings.json

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,11 @@ public class Settings`
`16`	`16`	`public bool ShouldDeleteJob { get; set; }`
`17`	`17`	`public bool ShouldDeletePool { get; set; }`
`18`	`18`	`public bool ShouldDeleteContainer { get; set; }`
	`19`	`+ public string PoolNodeVirtualMachineSize { get; set; }`
	`20`	`+ public string ImagePublisher { get; set; }`
	`21`	`+ public string ImageOffer { get; set; }`
	`22`	`+ public string ImageSku { get; set; }`
	`23`	`+ public string ImageVersion { get; set; }`
	`24`	`+ public string NodeAgentSkuId { get; set; }`
`19`	`25`	`}`
`20`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public static void Main(string[] args)`
`45`	`45`	`private static async Task MainAsync(string[] args)`
`46`	`46`	`{`
`47`	`47`	`// You may adjust these values to experiment with different compute resource scenarios.`
`48`		`- const string nodeSize = "standard_d1_v2";`
	`48`	`+ const string nodeSize = "standard_d2_v3";`
`49`	`49`	`const int nodeCount = 4;`
`50`	`50`	`const int taskSlotsPerNode = 4;`
`51`	`51`	`const int taskCount = 32;`