Update Batch Powershell to target new SDKs

  - Target Microsoft.Azure.Batch 12.0.
  - Target Microsoft.Azure.Management.Batch 9.0.
  - Update tests.

Author: matthchr

src/Batch/Batch.Test/Batch.Test.csproj

@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Batch" Version="10.1.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Batch" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Azure.Batch" Version="12.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Batch" Version="9.0.0" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
   </ItemGroup>
 

src/Batch/Batch.Test/BatchAccounts/GetBatchNodeAgentSkusCommandTests.cs renamed to src/Batch/Batch.Test/BatchAccounts/GetBatchSupportedImagesCommandTests.cs

@@ -28,18 +28,18 @@
 
 namespace Microsoft.Azure.Commands.Batch.Test.Accounts
 {
-    public class GetBatchNodeAgentSkusCommandTests : WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
+    public class GetBatchSupportedImagesCommandTests : WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
     {
-        private GetBatchAccountNodeAgentSkuCommand cmdlet;
+        private GetBatchAccountSupportedImagesCommand cmdlet;
         private Mock<BatchClient> batchClientMock;
         private Mock<ICommandRuntime> commandRuntimeMock;
 
-        public GetBatchNodeAgentSkusCommandTests(Xunit.Abstractions.ITestOutputHelper output)
+        public GetBatchSupportedImagesCommandTests(Xunit.Abstractions.ITestOutputHelper output)
         {
             ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagement.Common.Models.XunitTracingInterceptor(output));
             batchClientMock = new Mock<BatchClient>();
             commandRuntimeMock = new Mock<ICommandRuntime>();
-            cmdlet = new GetBatchAccountNodeAgentSkuCommand()
+            cmdlet = new GetBatchAccountSupportedImagesCommand()
             {
                 CommandRuntime = commandRuntimeMock.Object,
                 BatchClient = batchClientMock.Object,
@@ -48,45 +48,45 @@ public GetBatchNodeAgentSkusCommandTests(Xunit.Abstractions.ITestOutputHelper ou
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void ListBatchNodeAgentSkusParametersTest()
+        public void ListBatchSupportedImagesParametersTest()
         {
             BatchAccountContext context = BatchTestHelpers.CreateBatchContextWithKeys();
             cmdlet.BatchContext = context;
 
             string[] idsOfNodeAgentSkus = new[] { "batch.node.centos 7", "batch.node.debian 8", "batch.node.opensuse 13.2" };
 
             // Don't go to the service on an Get NodeAgentSkus call
-            AzureOperationResponse<IPage<ProxyModels.NodeAgentSku>, ProxyModels.AccountListNodeAgentSkusHeaders> response =
-                BatchTestHelpers.CreateNodeAgentSkuResponse(idsOfNodeAgentSkus);
+            AzureOperationResponse<IPage<ProxyModels.ImageInformation>, ProxyModels.AccountListSupportedImagesHeaders> response =
+                BatchTestHelpers.CreateSupportedImagesResponse(idsOfNodeAgentSkus);
 
             RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor<
-                ProxyModels.AccountListNodeAgentSkusOptions,
-                AzureOperationResponse<IPage<ProxyModels.NodeAgentSku>, ProxyModels.AccountListNodeAgentSkusHeaders>>(responseToUse: response);
+                ProxyModels.AccountListSupportedImagesOptions,
+                AzureOperationResponse<IPage<ProxyModels.ImageInformation>, ProxyModels.AccountListSupportedImagesHeaders>>(responseToUse: response);
 
             cmdlet.AdditionalBehaviors = new List<BatchClientBehavior>() { interceptor };
 
             // Setup the cmdlet to write pipeline output to a list that can be examined later
-            List<PSNodeAgentSku> pipeline = new List<PSNodeAgentSku>();
+            var pipeline = new List<PSImageInformation>();
             commandRuntimeMock.Setup(r =>
-                r.WriteObject(It.IsAny<PSNodeAgentSku>()))
-                .Callback<object>(p => pipeline.Add((PSNodeAgentSku)p));
+                r.WriteObject(It.IsAny<PSImageInformation>()))
+                .Callback<object>(p => pipeline.Add((PSImageInformation)p));
 
             // Verify no exceptions when required parameter is set
             cmdlet.ExecuteCmdlet();
 
             Assert.Equal(3, pipeline.Count);
             int nodeAgentCount = 0;
-            foreach (PSNodeAgentSku p in pipeline)
+            foreach (PSImageInformation imageInfo in pipeline)
             {
-                Assert.Contains(p.Id, idsOfNodeAgentSkus);
+                Assert.Contains(imageInfo.NodeAgentSkuId, idsOfNodeAgentSkus);
                 nodeAgentCount++;
             }
             Assert.Equal(idsOfNodeAgentSkus.Length, nodeAgentCount);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void ListBatchNodeAgentSkusWithFilterTest()
+        public void ListBatchSupportedImagesWithFilterTest()
         {
             BatchAccountContext context = BatchTestHelpers.CreateBatchContextWithKeys();
             cmdlet.BatchContext = context;
@@ -95,11 +95,14 @@ public void ListBatchNodeAgentSkusWithFilterTest()
             string requestFilter = null;
 
             // Don't go to the service on an Get NodeAgentSkus call
-            AzureOperationResponse<IPage<ProxyModels.NodeAgentSku>, ProxyModels.AccountListNodeAgentSkusHeaders> getResponse = BatchTestHelpers.CreateGenericAzureOperationListResponse<ProxyModels.NodeAgentSku, ProxyModels.AccountListNodeAgentSkusHeaders>();
-            RequestInterceptor requestInterceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor<ProxyModels.AccountListNodeAgentSkusOptions, AzureOperationResponse<IPage<ProxyModels.NodeAgentSku>, ProxyModels.AccountListNodeAgentSkusHeaders>>(responseToUse: getResponse);
+            var getResponse = BatchTestHelpers.CreateGenericAzureOperationListResponse<ProxyModels.ImageInformation, ProxyModels.AccountListSupportedImagesHeaders>();
+            RequestInterceptor requestInterceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor<
+                ProxyModels.AccountListSupportedImagesOptions,
+                AzureOperationResponse<IPage<ProxyModels.ImageInformation>,
+                ProxyModels.AccountListSupportedImagesHeaders>>(responseToUse: getResponse);
             ResponseInterceptor responseInterceptor = new ResponseInterceptor((response, request) =>
             {
-                ProxyModels.AccountListNodeAgentSkusOptions listNodeAgentSkusOptions = (ProxyModels.AccountListNodeAgentSkusOptions)request.Options;
+                var listNodeAgentSkusOptions = (ProxyModels.AccountListSupportedImagesOptions)request.Options;
                 requestFilter = listNodeAgentSkusOptions.Filter;
 
                 return Task.FromResult(response);

src/Batch/Batch.Test/BatchTestHelpers.cs

@@ -48,8 +48,14 @@ public static class BatchTestHelpers
         /// <summary>
         /// Builds an AccountResource object using the specified parameters
         /// </summary>
-        public static BatchAccount CreateAccountResource(string accountName, string resourceGroupName, string location = "location", 
-            Hashtable tags = null, string storageId = null)
+        public static BatchAccount CreateAccountResource(
+            string accountName,
+            string resourceGroupName,
+            string location = "location",
+            Hashtable tags = null,
+            string storageId = null,
+            bool dedicatedCoreQuotaPerVMFamilyEnforced = false,
+            IList<VirtualMachineFamilyCoreQuota> machineFamilyQuotas = null)
         {
             string tenantUrlEnding = "batch-test.windows-int.net";
             string endpoint = string.Format("{0}.{1}", accountName, tenantUrlEnding);
@@ -58,6 +64,8 @@ public static BatchAccount CreateAccountResource(string accountName, string reso
 
             string id = string.Format("id/subscriptions/{0}/resourceGroups/{1}/providers/Microsoft.Batch/batchAccounts/abc", subscription, resourceGroup);
 
+            machineFamilyQuotas = machineFamilyQuotas ?? new List<VirtualMachineFamilyCoreQuota> { new VirtualMachineFamilyCoreQuota("foo", 55 ) };
+
             BatchAccount resource = new BatchAccount(
                 dedicatedCoreQuota: DefaultQuotaCount,
                 lowPriorityCoreQuota: DefaultQuotaCount,
@@ -69,7 +77,9 @@ public static BatchAccount CreateAccountResource(string accountName, string reso
                 location: location,
                 provisioningState: ProvisioningState.Succeeded,
                 autoStorage: new AutoStorageProperties() { StorageAccountId = storageId },
-                tags: tags == null ? null : TagsConversionHelper.CreateTagDictionary(tags, true));
+                tags: tags == null ? null : TagsConversionHelper.CreateTagDictionary(tags, true),
+                dedicatedCoreQuotaPerVMFamilyEnforced: dedicatedCoreQuotaPerVMFamilyEnforced,
+                dedicatedCoreQuotaPerVMFamily: machineFamilyQuotas);
 
             return resource;
         }
@@ -796,15 +806,15 @@ public static AzureOperationResponse<
         /// <summary>
         /// Builds a NodeAgentSKUResponse object
         /// </summary>
-        public static AzureOperationResponse<IPage<ProxyModels.NodeAgentSku>, ProxyModels.AccountListNodeAgentSkusHeaders> CreateNodeAgentSkuResponse(IEnumerable<string> skuIds)
+        public static AzureOperationResponse<IPage<ProxyModels.ImageInformation>, ProxyModels.AccountListSupportedImagesHeaders> CreateSupportedImagesResponse(IEnumerable<string> skuIds)
         {
-            IEnumerable<ProxyModels.NodeAgentSku> nodeAgents =
-                skuIds.Select(id => new ProxyModels.NodeAgentSku() { Id = id });
+            IEnumerable<ProxyModels.ImageInformation> imageInfo =
+                skuIds.Select(id => new ProxyModels.ImageInformation() { NodeAgentSKUId = id });
 
-            var response = new AzureOperationResponse<IPage<ProxyModels.NodeAgentSku>, ProxyModels.AccountListNodeAgentSkusHeaders>()
+            var response = new AzureOperationResponse<IPage<ProxyModels.ImageInformation>, ProxyModels.AccountListSupportedImagesHeaders>()
             {
                 Response = new HttpResponseMessage(HttpStatusCode.OK),
-                Body = new MockPagedEnumerable<ProxyModels.NodeAgentSku>(nodeAgents)
+                Body = new MockPagedEnumerable<ProxyModels.ImageInformation>(imageInfo)
             };
 
             return response;

src/Batch/Batch.Test/Pools/NewBatchPoolCommandTests.cs

@@ -103,6 +103,7 @@ public void NewBatchPoolParametersGetPassedToRequestTest()
             cmdlet.TaskSchedulingPolicy = new PSTaskSchedulingPolicy(Azure.Batch.Common.ComputeNodeFillType.Spread);
             cmdlet.VirtualMachineConfiguration = new PSVirtualMachineConfiguration(new PSImageReference("offer", "publisher", "sku"), "node agent");
             cmdlet.VirtualMachineSize = "small";
+            cmdlet.MountConfiguration = new[] { new PSMountConfiguration(new PSAzureBlobFileSystemConfiguration("foo", "bar", "baz", AzureStorageAuthenticationKey.FromAccountKey("abc"))) };
 
             PoolAddParameter requestParameters = null;
 
@@ -142,6 +143,10 @@ public void NewBatchPoolParametersGetPassedToRequestTest()
             Assert.Equal(cmdlet.VirtualMachineConfiguration.ImageReference.Offer, requestParameters.VirtualMachineConfiguration.ImageReference.Offer);
             Assert.Equal(cmdlet.VirtualMachineConfiguration.ImageReference.Sku, requestParameters.VirtualMachineConfiguration.ImageReference.Sku);
             Assert.Equal(cmdlet.VirtualMachineSize, requestParameters.VmSize);
+            Assert.Equal(cmdlet.MountConfiguration[0].AzureBlobFileSystemConfiguration.AccountName, requestParameters.MountConfiguration[0].AzureBlobFileSystemConfiguration.AccountName);
+            Assert.Equal(cmdlet.MountConfiguration[0].AzureBlobFileSystemConfiguration.AccountKey, requestParameters.MountConfiguration[0].AzureBlobFileSystemConfiguration.AccountKey);
+            Assert.Equal(cmdlet.MountConfiguration[0].AzureBlobFileSystemConfiguration.ContainerName, requestParameters.MountConfiguration[0].AzureBlobFileSystemConfiguration.ContainerName);
+            Assert.Equal(cmdlet.MountConfiguration[0].AzureBlobFileSystemConfiguration.RelativeMountPath, requestParameters.MountConfiguration[0].AzureBlobFileSystemConfiguration.RelativeMountPath);
         }
 
         [Fact]

src/Batch/Batch/Az.Batch.psd1

@@ -127,7 +127,7 @@ CmdletsToExport = 'Remove-AzBatchAccount',
                'Get-AzBatchPoolStatistic',
                'Get-AzBatchPoolUsageMetric', 
                'Get-AzBatchPool',
-               'Get-AzBatchNodeAgentSku',
+               'Get-AzBatchSupportedImages',
                'New-AzBatchPool', 
                'Remove-AzBatchPool',
                'Set-AzBatchPool',

src/Batch/Batch/Batch.csproj

@@ -12,8 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Batch" Version="10.1.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Batch" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Azure.Batch" Version="12.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Batch" Version="9.0.0" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
   </ItemGroup>
 

src/Batch/Batch/BatchAccounts/GetBatchAccountNodeAgentSkuCommand.cs renamed to src/Batch/Batch/BatchAccounts/GetBatchAccountSupportedImagesCommand.cs

@@ -19,8 +19,8 @@
 
 namespace Microsoft.Azure.Commands.Batch
 {
-    [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzurePrefix + "BatchNodeAgentSku"),OutputType(typeof(PSNodeAgentSku))]
-    public class GetBatchAccountNodeAgentSkuCommand : BatchObjectModelCmdletBase
+    [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzurePrefix + "BatchSupportedImages"),OutputType(typeof(PSImageInformation))]
+    public class GetBatchAccountSupportedImagesCommand : BatchObjectModelCmdletBase
     {
         private int maxCount = Constants.DefaultMaxCount;
 
@@ -38,7 +38,7 @@ public int MaxCount
 
         protected override void ExecuteCmdletImpl()
         {
-            foreach (PSNodeAgentSku nodeAgentSku in BatchClient.ListNodeAgentSkus(this.BatchContext, this.Filter, this.MaxCount, this.AdditionalBehaviors))
+            foreach (PSImageInformation nodeAgentSku in BatchClient.ListSupportedImages(this.BatchContext, this.Filter, this.MaxCount, this.AdditionalBehaviors))
             {
                 WriteObject(nodeAgentSku);
             }

src/Batch/Batch/ChangeLog.md

@@ -39,6 +39,18 @@
 * Renamed `CurrentOSVersion` to `OSVersion` on `PSCloudServiceConfiguration`.
 * Removed `DataEgressGiB` and `DataIngressGiB` from `PSPoolUsageMetrics`.
 
+* Removed **Get-AzBatchNodeAgentSku** and replaced it with  **Get-AzBatchSupportedImages**. 
+  - **Get-AzBatchSupportedImages** returns the same data as **Get-AzBatchNodeAgentSku** but in a more friendly format.
+  - New non-verified images are also now returned. Additional information about `Capabilities` and `BatchSupportEndOfLife` for each image is also included.
+* Added ability to mount remote file-systems on each node of a pool via the new `MountConfiguration` parameter of **New-AzBatchPool**.
+* Now support network security rules blocking network access to a pool based on the source port of the traffic. This is done via the `SourcePortRanges` property on `PSNetworkSecurityGroupRule`.
+* When running a container, Batch now supports executing the task in the container working directory or in the Batch task working directory. This is controlled by the `WorkingDirectory` property on `PSTaskContainerSettings`.
+* Added ability to specify a collection of public IPs on `PSNetworkConfiguration` via the new `PublicIPs` property. This guarantees nodes in the Pool will have an IP from the list user provided IPs.
+* When not specified, the default value of `WaitForSuccess` on `PSSTartTask` is now `$True` (was `$False`).
+* When not specified, the default value of `Scope` on `PSAutoUserSpecification` is now `Pool` (was `Task` on Windows and `Pool` on Linux).
+
+
+
 ## Version 1.1.1
 * Fixed typo in help message and documentation to capitalize Windows
 * Fixed miscellaneous typos across module

src/Batch/Batch/Models.Generated/PSAzureBlobFileSystemConfiguration.cs

@@ -0,0 +1,99 @@
+// -----------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// -----------------------------------------------------------------------------
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace Microsoft.Azure.Commands.Batch.Models
+{
+    using System;
+    using System.Collections;
+    using System.Collections.Generic;
+    using Microsoft.Azure.Batch;
+    
+    
+    public partial class PSAzureBlobFileSystemConfiguration
+    {
+        
+        internal Microsoft.Azure.Batch.AzureBlobFileSystemConfiguration omObject;
+        
+        public PSAzureBlobFileSystemConfiguration(string accountName, string containerName, string relativeMountPath, Microsoft.Azure.Batch.AzureStorageAuthenticationKey key, string blobfuseOptions = null)
+        {
+            this.omObject = new Microsoft.Azure.Batch.AzureBlobFileSystemConfiguration(accountName, containerName, relativeMountPath, key, blobfuseOptions);
+        }
+        
+        internal PSAzureBlobFileSystemConfiguration(Microsoft.Azure.Batch.AzureBlobFileSystemConfiguration omObject)
+        {
+            if ((omObject == null))
+            {
+                throw new System.ArgumentNullException("omObject");
+            }
+            this.omObject = omObject;
+        }
+        
+        public string AccountKey
+        {
+            get
+            {
+                return this.omObject.AccountKey;
+            }
+        }
+        
+        public string AccountName
+        {
+            get
+            {
+                return this.omObject.AccountName;
+            }
+        }
+        
+        public string BlobfuseOptions
+        {
+            get
+            {
+                return this.omObject.BlobfuseOptions;
+            }
+        }
+        
+        public string ContainerName
+        {
+            get
+            {
+                return this.omObject.ContainerName;
+            }
+        }
+        
+        public string RelativeMountPath
+        {
+            get
+            {
+                return this.omObject.RelativeMountPath;
+            }
+        }
+        
+        public string SasKey
+        {
+            get
+            {
+                return this.omObject.SasKey;
+            }
+        }
+    }
+}