Merge pull request #663 from jasper-schneider/clientV2

Update Batch cmdlets to use general availability API

Author: yugangw-msft

ChangeLog.txt

@@ -1,3 +1,14 @@
+2015.08.07 version 0.9.6
+* Azure Batch cmdlets
+    * Cmdlets updated to use the general availability API. See http://blogs.technet.com/b/windowshpc/archive/2015/07/10/what-39-s-new-in-azure-batch-july-release-general-availability.aspx
+    * Breaking changes to cmdlets resulting from API update:
+        * Workitems have been removed. 
+            * If you were adding all tasks to a single job, use the New-AzureBatchJob cmdlet to directly create your job.
+            * If you were managing workitems with a recurring schedule defined, use the AzureBatchJobSchedule cmdlets instead.
+        * If you were using the AzureBatchVM cmdlets, use the AzureBatchComputeNode cmdlets instead.
+        * The AzureBatchTaskFile and AzureBatchVMFile cmdlets have been consolidated into the AzureBatchNodeFile cmdlets.
+        * The Name property on most entities has been replaced by an Id property.
+
 2015.07.17 version 0.9.5
 * Azure SQL cmdlets
   * Allowing to use of Storage V2 accounts in Auditing policies

src/ResourceManager/Batch/Commands.Batch.Test/BatchTestHelpers.cs

@@ -0,0 +1,85 @@
+// ----------------------------------------------------------------------------------
+//
+// 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.
+// ----------------------------------------------------------------------------------
+
+using System;
+using Microsoft.Azure.Batch;
+using Microsoft.Azure.Batch.Protocol;
+using Microsoft.Azure.Batch.Protocol.Models;
+using Microsoft.Azure.Commands.Batch.Models;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using Moq;
+using System.Collections.Generic;
+using System.Management.Automation;
+using System.Threading.Tasks;
+using Xunit;
+using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient;
+
+namespace Microsoft.Azure.Commands.Batch.Test.ComputeNodeUsers
+{
+    public class NewBatchComputeNodeUserCommandTests
+    {
+        private NewBatchComputeNodeUserCommand cmdlet;
+        private Mock<BatchClient> batchClientMock;
+        private Mock<ICommandRuntime> commandRuntimeMock;
+
+        public NewBatchComputeNodeUserCommandTests()
+        {
+            batchClientMock = new Mock<BatchClient>();
+            commandRuntimeMock = new Mock<ICommandRuntime>();
+            cmdlet = new NewBatchComputeNodeUserCommand()
+            {
+                CommandRuntime = commandRuntimeMock.Object,
+                BatchClient = batchClientMock.Object,
+            };
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void NewBatchComputeNodeUserParametersTest()
+        {
+            // Setup cmdlet without the required parameters
+            BatchAccountContext context = BatchTestHelpers.CreateBatchContextWithKeys();
+            cmdlet.BatchContext = context;
+
+            Assert.Throws<ArgumentNullException>(() => cmdlet.ExecuteCmdlet());
+
+            cmdlet.PoolId = "testPool";
+            cmdlet.ComputeNodeId = "computeNode1";
+
+            Assert.Throws<ArgumentNullException>(() => cmdlet.ExecuteCmdlet());
+            cmdlet.Name = "testUser";
+
+            Assert.Throws<ArgumentNullException>(() => cmdlet.ExecuteCmdlet());
+            cmdlet.Password = "Password1234";
+
+            // Don't go to the service on an Add ComputeNodeUser call
+            RequestInterceptor interceptor = new RequestInterceptor((baseRequest) =>
+            {
+                BatchRequest<ComputeNodeAddUserParameters, ComputeNodeAddUserResponse> request =
+                (BatchRequest<ComputeNodeAddUserParameters, ComputeNodeAddUserResponse>)baseRequest;
+
+                request.ServiceRequestFunc = (cancellationToken) =>
+                {
+                    ComputeNodeAddUserResponse response = new ComputeNodeAddUserResponse();
+                    Task<ComputeNodeAddUserResponse> task = Task.FromResult(response);
+                    return task;
+                };
+            });
+            cmdlet.AdditionalBehaviors = new List<BatchClientBehavior>() { interceptor };
+
+            // Verify no exceptions when required parameters are set
+            cmdlet.ExecuteCmdlet();
+        }
+    }
+}

src/ResourceManager/Batch/Commands.Batch.Test/Commands.Batch.Test.csproj

@@ -15,7 +15,7 @@
 using System;
 using Microsoft.Azure.Batch;
 using Microsoft.Azure.Batch.Protocol;
-using Microsoft.Azure.Batch.Protocol.Entities;
+using Microsoft.Azure.Batch.Protocol.Models;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Moq;
 using System.Collections.Generic;
@@ -24,19 +24,19 @@
 using Xunit;
 using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient;
 
-namespace Microsoft.Azure.Commands.Batch.Test.Users
+namespace Microsoft.Azure.Commands.Batch.Test.ComputeNodeUsers
 {
-    public class RemoveBatchVMUserCommandTests
+    public class RemoveBatchComputeNodeUserCommandTests
     {
-        private RemoveBatchVMUserCommand cmdlet;
+        private RemoveBatchComputeNodeUserCommand cmdlet;
         private Mock<BatchClient> batchClientMock;
         private Mock<ICommandRuntime> commandRuntimeMock;
 
-        public RemoveBatchVMUserCommandTests()
+        public RemoveBatchComputeNodeUserCommandTests()
         {
             batchClientMock = new Mock<BatchClient>();
             commandRuntimeMock = new Mock<ICommandRuntime>();
-            cmdlet = new RemoveBatchVMUserCommand()
+            cmdlet = new RemoveBatchComputeNodeUserCommand()
             {
                 CommandRuntime = commandRuntimeMock.Object,
                 BatchClient = batchClientMock.Object,
@@ -45,7 +45,7 @@ public RemoveBatchVMUserCommandTests()
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void RemoveBatchUserParametersTest()
+        public void RemoveBatchComputeNodeUserParametersTest()
         {
             // Setup cmdlet without the required parameters
             BatchAccountContext context = BatchTestHelpers.CreateBatchContextWithKeys();
@@ -57,20 +57,22 @@ public void RemoveBatchUserParametersTest()
 
             Assert.Throws<ArgumentNullException>(() => cmdlet.ExecuteCmdlet());
 
-            cmdlet.PoolName = "testPool";
-            cmdlet.VMName = "vm1";
+            cmdlet.PoolId = "testPool";
+            cmdlet.ComputeNodeId = "computeNode1";
             cmdlet.Name = "testUser";
 
             // Don't go to the service on a DeleteTVMUser call
-            YieldInjectionInterceptor interceptor = new YieldInjectionInterceptor((opContext, request) =>
+            RequestInterceptor interceptor = new RequestInterceptor((baseRequest) =>
             {
-                if (request is DeleteTVMUserRequest)
+                BatchRequest<ComputeNodeDeleteUserParameters, ComputeNodeDeleteUserResponse> request =
+                (BatchRequest<ComputeNodeDeleteUserParameters, ComputeNodeDeleteUserResponse>)baseRequest;
+
+                request.ServiceRequestFunc = (cancellationToken) =>
                 {
-                    DeleteTVMUserResponse response = new DeleteTVMUserResponse();
-                    Task<object> task = Task<object>.Factory.StartNew(() => { return response; });
+                    ComputeNodeDeleteUserResponse response = new ComputeNodeDeleteUserResponse();
+                    Task<ComputeNodeDeleteUserResponse> task = Task.FromResult(response);
                     return task;
-                }
-                return null;
+                };
             });
             cmdlet.AdditionalBehaviors = new List<BatchClientBehavior>() { interceptor };