Merge pull request #618 from Azure/dev

huangpf PR: dev <- Azure:dev

Author: huangpf

src/ResourceManager/AzureBatch/AzureBatch.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}"
 EndProject

src/ResourceManager/AzureBatch/AzureRM.Batch.psd1

@@ -76,7 +76,7 @@ CmdletsToExport = '*'
 VariablesToExport = '*'  
 
 # Aliases to export from this module  
-AliasesToExport = @()
+AliasesToExport = @('Reactivate-AzureBatchTask')
 
 # List of all modules packaged with this module  
 ModuleList = @()  

src/ResourceManager/AzureBatch/BatchModelGenerator/BatchModelGenerator.sln

@@ -1,6 +1,6 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.40629.0
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BatchModelGenerator", "BatchModelGenerator.csproj", "{374701E4-539A-459A-9A00-B04E51652997}"
 EndProject

src/ResourceManager/AzureBatch/BatchModelGenerator/Program.cs

@@ -31,11 +31,11 @@ public class Program
 
         private static readonly Dictionary<string, string> OMtoPSClassMappings = new Dictionary<string, string>()
         {
-            {"Microsoft.Azure.Batch.NodeAgentSku", "PSNodeAgentSku"},
-            {"Microsoft.Azure.Batch.ImageReference", "PSImageReference"},
+            {"Microsoft.Azure.Batch.AffinityInformation", "PSAffinityInformation"},
             {"Microsoft.Azure.Batch.AutoPoolSpecification", "PSAutoPoolSpecification"},
             {"Microsoft.Azure.Batch.AutoScaleRun", "PSAutoScaleRun"},
             {"Microsoft.Azure.Batch.AutoScaleRunError", "PSAutoScaleRunError"},
+            {"Microsoft.Azure.Batch.ApplicationPackageReference", "PSApplicationPackageReference"},
             {"Microsoft.Azure.Batch.Certificate", "PSCertificate"},
             {"Microsoft.Azure.Batch.CertificateReference", "PSCertificateReference"},
             {"Microsoft.Azure.Batch.CloudJob", "PSCloudJob"},
@@ -49,7 +49,12 @@ public class Program
             {"Microsoft.Azure.Batch.ComputeNodeUser", "PSComputeNodeUser"},
             {"Microsoft.Azure.Batch.DeleteCertificateError", "PSDeleteCertificateError"},
             {"Microsoft.Azure.Batch.EnvironmentSetting", "PSEnvironmentSetting"},
+            {"Microsoft.Azure.Batch.ExitConditions", "PSExitConditions"},
+            {"Microsoft.Azure.Batch.ExitCodeRangeMapping", "PSExitCodeRangeMapping"},
+            {"Microsoft.Azure.Batch.ExitCodeMapping", "PSExitCodeMapping"},
+            {"Microsoft.Azure.Batch.ExitOptions", "PSExitOptions"},
             {"Microsoft.Azure.Batch.FileProperties", "PSFileProperties"},
+            {"Microsoft.Azure.Batch.ImageReference", "PSImageReference"},
             {"Microsoft.Azure.Batch.RemoteLoginSettings", "PSRemoteLoginSettings"},
             {"Microsoft.Azure.Batch.JobConstraints", "PSJobConstraints"},
             {"Microsoft.Azure.Batch.JobExecutionInformation", "PSJobExecutionInformation"},
@@ -67,6 +72,8 @@ public class Program
             {"Microsoft.Azure.Batch.MetadataItem", "PSMetadataItem"},
             {"Microsoft.Azure.Batch.MultiInstanceSettings", "PSMultiInstanceSettings"},
             {"Microsoft.Azure.Batch.NameValuePair", "PSNameValuePair"},
+            {"Microsoft.Azure.Batch.NetworkConfiguration", "PSNetworkConfiguration"},
+            {"Microsoft.Azure.Batch.NodeAgentSku", "PSNodeAgentSku"},
             {"Microsoft.Azure.Batch.NodeFile", "PSNodeFile"},
             {"Microsoft.Azure.Batch.PoolInformation", "PSPoolInformation"},
             {"Microsoft.Azure.Batch.PoolSpecification", "PSPoolSpecification"},
@@ -81,23 +88,16 @@ public class Program
             {"Microsoft.Azure.Batch.StartTaskInformation", "PSStartTaskInformation"},
             {"Microsoft.Azure.Batch.SubtaskInformation", "PSSubtaskInformation"},
             {"Microsoft.Azure.Batch.TaskConstraints", "PSTaskConstraints"},
+            {"Microsoft.Azure.Batch.TaskDependencies", "PSTaskDependencies"},
             {"Microsoft.Azure.Batch.TaskExecutionInformation", "PSTaskExecutionInformation"},
             {"Microsoft.Azure.Batch.TaskInformation", "PSTaskInformation"},
             {"Microsoft.Azure.Batch.TaskIdRange", "PSTaskIdRange"},
             {"Microsoft.Azure.Batch.TaskSchedulingError", "PSTaskSchedulingError"},
             {"Microsoft.Azure.Batch.TaskSchedulingPolicy", "PSTaskSchedulingPolicy"},
             {"Microsoft.Azure.Batch.TaskStatistics", "PSTaskStatistics"},
             {"Microsoft.Azure.Batch.UsageStatistics", "PSUsageStatistics"},
-            {"Microsoft.Azure.Batch.AffinityInformation", "PSAffinityInformation"},
             {"Microsoft.Azure.Batch.VirtualMachineConfiguration", "PSVirtualMachineConfiguration"},
             {"Microsoft.Azure.Batch.WindowsConfiguration", "PSWindowsConfiguration"},
-            {"Microsoft.Azure.Batch.ApplicationPackageReference", "PSApplicationPackageReference"},
-            {"Microsoft.Azure.Batch.TaskDependencies", "PSTaskDependencies"},
-            {"Microsoft.Azure.Batch.NetworkConfiguration", "PSNetworkConfiguration"},
-            {"Microsoft.Azure.Batch.ExitConditions", "PSExitConditions"},
-            {"Microsoft.Azure.Batch.ExitOptions", "PSExitOptions"},
-            {"Microsoft.Azure.Batch.ExitCodeRangeMapping", "PSExitCodeRangeMapping"},
-            {"Microsoft.Azure.Batch.ExitCodeMapping", "PSExitCodeMapping"},
         };
 
 

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

@@ -583,6 +583,19 @@ public static RequestInterceptor CreateFakeGetFileAndPropertiesFromComputeNodeRe
             return response;
         }
 
+        /// <summary>
+        /// Builds a CloudJobGetResponse object
+        /// </summary>
+        public static AzureOperationResponse<ProxyModels.CloudJob, ProxyModels.JobGetHeaders> CreateCloudJobGetResponse(ProxyModels.CloudJob job)
+        {
+            var response = new AzureOperationResponse<ProxyModels.CloudJob, ProxyModels.JobGetHeaders>
+            {
+                Response = new HttpResponseMessage(HttpStatusCode.OK),
+                Body = job
+            };
+            return response;
+        }
+
         /// <summary>
         /// Builds a CloudJobListResponse object
         /// </summary>
@@ -620,6 +633,16 @@ public static RequestInterceptor CreateFakeGetFileAndPropertiesFromComputeNodeRe
 
             return response;
         }
+        /// <summary>
+        /// Builds a CloudTaskGetResponse object
+        /// </summary>
+        public static AzureOperationResponse<ProxyModels.CloudTask, ProxyModels.TaskGetHeaders> CreateCloudTaskGetResponse(ProxyModels.CloudTask task)
+        {
+            var response = new AzureOperationResponse<ProxyModels.CloudTask, ProxyModels.TaskGetHeaders>();
+            response.Response = new HttpResponseMessage(HttpStatusCode.OK);
+            response.Body = task;
+            return response;
+        }
 
         /// <summary>
         /// Builds a CloudTaskListResponse object
@@ -798,25 +821,22 @@ public static RequestInterceptor CreateFakeGetFileAndPropertiesFromComputeNodeRe
         /// <summary>
         /// Fabricates a CloudJob that's in the bound state
         /// </summary>
-        public static CloudJob CreateFakeBoundJob(BatchAccountContext context)
+        public static CloudJob CreateFakeBoundJob(BatchAccountContext context, ProxyModels.CloudJob cloudJob)
         {
-            string jobId = "testJob";
-
             RequestInterceptor interceptor = new RequestInterceptor((baseRequest) =>
             {
                 JobGetBatchRequest request = (JobGetBatchRequest)baseRequest;
 
                 request.ServiceRequestFunc = (cancellationToken) =>
                 {
-                    var response = new AzureOperationResponse<ProxyModels.CloudJob, ProxyModels.JobGetHeaders>();
-                    response.Body = new ProxyModels.CloudJob(id: jobId, poolInfo: new ProxyModels.PoolInformation());
+                    var response = new AzureOperationResponse<ProxyModels.CloudJob, ProxyModels.JobGetHeaders> { Body = cloudJob };
 
                     Task<AzureOperationResponse<ProxyModels.CloudJob, ProxyModels.JobGetHeaders>> task = Task.FromResult(response);
                     return task;
                 };
             });
 
-            return context.BatchOMClient.JobOperations.GetJob(jobId, additionalBehaviors: new BatchClientBehavior[] { interceptor });
+            return context.BatchOMClient.JobOperations.GetJob(cloudJob.Id, additionalBehaviors: new BatchClientBehavior[] { interceptor });
         }
 
         /// <summary>

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

@@ -44,8 +44,10 @@
     <Reference Include="Hyak.Common">
       <HintPath>..\..\..\packages\Hyak.Common.1.0.3\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Azure.Batch, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Azure.Batch.5.0.0\lib\net45\Microsoft.Azure.Batch.dll</HintPath>
+    <Reference Include="Microsoft.Azure.Batch, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Azure.Batch.5.1.0\lib\net45\Microsoft.Azure.Batch.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Common">
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
@@ -270,6 +272,7 @@
     <Compile Include="JobSchedules\NewBatchJobScheduleCommandTests.cs" />
     <Compile Include="JobSchedules\RemoveBatchJobScheduleCommandTests.cs" />
     <Compile Include="Tasks\SetBatchTaskCommandTests.cs" />
+    <Compile Include="Tasks\EnableBatchTaskCommandTests.cs" />
     <Compile Include="Tasks\StopBatchTaskCommandTests.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -526,6 +529,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.JobScheduleTests\TestUpdateJobSchedule.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.JobTests\IfJobSetsAutoFailure_ItCompletesWhenAnyTaskFails.json" >
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.JobTests\TestDeleteJob.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -713,4 +719,4 @@
     <WCFMetadata Include="Service References\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
+</Project>

src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/GetBatchJobCommandTests.cs

@@ -23,6 +23,7 @@
 using System.Linq;
 using System.Management.Automation;
 using System.Threading.Tasks;
+using Microsoft.Azure.Batch.Common;
 using Xunit;
 using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient;
 using ProxyModels = Microsoft.Azure.Batch.Protocol.Models;
@@ -58,7 +59,15 @@ public void GetBatchJobTest()
             cmdlet.Filter = null;
 
             // Build a CloudJob instead of querying the service on a Get CloudJob call
-            AzureOperationResponse<ProxyModels.CloudJob, ProxyModels.JobGetHeaders> response = BatchTestHelpers.CreateCloudJobGetResponse(cmdlet.Id);
+            ProxyModels.CloudJob job = new ProxyModels.CloudJob
+            {
+                Id = cmdlet.Id,
+                OnAllTasksComplete = ProxyModels.OnAllTasksComplete.TerminateJob,
+                OnTaskFailure = ProxyModels.OnTaskFailure.PerformExitOptionsJobAction
+            };
+
+            AzureOperationResponse<ProxyModels.CloudJob, ProxyModels.JobGetHeaders> response = BatchTestHelpers.CreateCloudJobGetResponse(job);
+
             RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor<
                 ProxyModels.JobGetOptions,
                 AzureOperationResponse<ProxyModels.CloudJob, ProxyModels.JobGetHeaders>>(response);
@@ -74,6 +83,8 @@ public void GetBatchJobTest()
             // Verify that the cmdlet wrote the job returned from the OM to the pipeline
             Assert.Equal(1, pipeline.Count);
             Assert.Equal(cmdlet.Id, pipeline[0].Id);
+            Assert.Equal(OnTaskFailure.PerformExitOptionsJobAction, pipeline[0].OnTaskFailure);
+            Assert.Equal(OnAllTasksComplete.TerminateJob, pipeline[0].OnAllTasksComplete);
         }
 
         [Fact]
@@ -229,5 +240,53 @@ public void ListJobsMaxCountTest()
 
             Assert.Equal(idsOfConstructedJobs.Length, pipeline.Count);
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void WhenGettingAJobFromTheService_ApplicationPackageReferencesAreMapped()
+        {
+            // Setup cmdlet to get a Job by id
+
+            BatchAccountContext context = BatchTestHelpers.CreateBatchContextWithKeys();
+            cmdlet.BatchContext = context;
+            cmdlet.Id = "job-1";
+            cmdlet.Filter = null;
+
+            // Build a CloudJob instead of querying the service on a Get CloudJob call
+            string applicationId = "foo";
+            string applicationVersion = "beta";
+            ProxyModels.CloudJob cloudTask = new ProxyModels.CloudJob
+            {
+                Id = "job-1",
+                JobManagerTask = new ProxyModels.JobManagerTask
+                {
+                    ApplicationPackageReferences = new[]
+                    {
+                        new ProxyModels.ApplicationPackageReference(applicationId, applicationVersion)
+                    }
+                }
+            };
+
+            AzureOperationResponse<ProxyModels.CloudJob, ProxyModels.JobGetHeaders> response = BatchTestHelpers.CreateCloudJobGetResponse(cloudTask);
+
+            RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor<ProxyModels.JobGetOptions,
+                AzureOperationResponse<ProxyModels.CloudJob, ProxyModels.JobGetHeaders>>(response);
+
+            cmdlet.AdditionalBehaviors = new List<BatchClientBehavior> { interceptor };
+
+            // Setup the cmdlet to write pipeline output to a list that can be examined later
+            var pipeline = new List<PSCloudJob>();
+            commandRuntimeMock.Setup(r => r.WriteObject(It.IsAny<PSCloudJob>())).Callback<object>(t => pipeline.Add((PSCloudJob)t));
+
+            cmdlet.ExecuteCmdlet();
+
+            // Verify that the cmdlet wrote the task returned from the OM to the pipeline
+            Assert.Equal(1, pipeline.Count);
+            Assert.Equal(cmdlet.Id, pipeline[0].Id);
+
+            var psApplicationPackageReference = pipeline[0].JobManagerTask.ApplicationPackageReferences.First();
+            Assert.Equal(applicationId, psApplicationPackageReference.ApplicationId);
+            Assert.Equal(applicationVersion, psApplicationPackageReference.Version);
+        }
     }
 }

src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/NewBatchJobCommandTests.cs

@@ -15,11 +15,13 @@
 using Microsoft.Azure.Batch;
 using Microsoft.Azure.Batch.Protocol;
 using Microsoft.Azure.Batch.Protocol.Models;
+using Microsoft.Azure.Commands.Batch.Models;
 using Microsoft.Rest.Azure;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Moq;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Management.Automation;
 using Xunit;
 using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient;
@@ -55,9 +57,49 @@ public void NewBatchJobParametersTest()
             Assert.Throws<ArgumentNullException>(() => cmdlet.ExecuteCmdlet());
 
             cmdlet.Id = "testJob";
+            cmdlet.OnAllTasksComplete = Azure.Batch.Common.OnAllTasksComplete.TerminateJob;
+            cmdlet.OnTaskFailure = Azure.Batch.Common.OnTaskFailure.PerformExitOptionsJobAction;
 
             // Don't go to the service on an Add CloudJob call
-            RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor<JobAddParameter, JobAddOptions, AzureOperationHeaderResponse<JobAddHeaders>>();
+            var interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor<JobAddParameter, JobAddOptions, AzureOperationHeaderResponse<JobAddHeaders>>(
+                    new AzureOperationHeaderResponse<JobAddHeaders>(),
+                    request =>
+                        {
+                            Assert.Equal(request.Parameters.OnAllTasksComplete, OnAllTasksComplete.TerminateJob);
+                            Assert.Equal(request.Parameters.OnTaskFailure, OnTaskFailure.PerformExitOptionsJobAction);
+                        });
+
+            cmdlet.AdditionalBehaviors = new List<BatchClientBehavior>() { interceptor };
+
+            // Verify no exceptions when required parameters are set
+            cmdlet.ExecuteCmdlet();
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void ApplicationPackageReferencesAreSentToService()
+        {
+            BatchAccountContext context = BatchTestHelpers.CreateBatchContextWithKeys();
+            cmdlet.BatchContext = context;
+            cmdlet.Id = "job-id";
+            string applicationId = "foo";
+            string applicationVersion = "beta";
+
+            cmdlet.JobManagerTask = new PSJobManagerTask { ApplicationPackageReferences = new[] 
+            {
+                new PSApplicationPackageReference { ApplicationId = applicationId, Version = applicationVersion} ,
+            }};
+            
+            // Don't go to the service on an Add CloudJob call
+            RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor<JobAddParameter, JobAddOptions, AzureOperationHeaderResponse<JobAddHeaders>>(
+                new AzureOperationHeaderResponse<JobAddHeaders>(),
+                request =>
+                    {
+                        var applicationPackageReference = request.Parameters.JobManagerTask.ApplicationPackageReferences.First();
+                        Assert.Equal(applicationId, applicationPackageReference.ApplicationId);
+                        Assert.Equal(applicationVersion, applicationPackageReference.Version);
+                    });
+
             cmdlet.AdditionalBehaviors = new List<BatchClientBehavior>() { interceptor };
 
             // Verify no exceptions when required parameters are set