Cleaned up9 a few files and added the recordings to the csproj

Author: matthew-rollitt

src/ResourceManager/AzureBatch/Commands.Batch.Test/Applications/UploadBatchApplicationCommandTests.cs

@@ -45,7 +45,7 @@ public void UploadBatchApplicationPackageTest()
 
             PSApplicationPackage applicationPackageResponse = new PSApplicationPackage();
 
-            batchClientMock.Setup(b => b.AddAndUploadApplicationPackage(resourceGroup, accountName, applicationId, version, filePath, format)).Returns(applicationPackageResponse);
+            batchClientMock.Setup(b => b.UploadApplicationPackage(resourceGroup, accountName, applicationId, version, filePath, format)).Returns(applicationPackageResponse);
 
             cmdlet.AccountName = accountName;
             cmdlet.ResourceGroupName = resourceGroup;
@@ -54,10 +54,11 @@ public void UploadBatchApplicationPackageTest()
             cmdlet.ApplicationVersion = version;
             cmdlet.Format = format;
 
+
             commandRuntimeMock.Setup(f => f.ShouldProcess(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
             cmdlet.ExecuteCmdlet();
 
-            batchClientMock.Verify(b => b.AddAndUploadApplicationPackage(resourceGroup, accountName, applicationId, version, filePath, format), Times.Once());
+            batchClientMock.Verify(b => b.UploadApplicationPackage(resourceGroup, accountName, applicationId, version, filePath, format), Times.Once());
         }
     }
 }

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

@@ -344,6 +344,11 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.BatchAccountTests\TestUpdatesExistingBatchAccount.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.BatchApplicationTests\TestCreatePoolWithApplicationPackage.json" />
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.BatchApplicationTests\TestUpdateApplicationPackage.json" />
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.BatchApplicationTests\TestUpdatePoolWithApplicationPackage.json" />
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.BatchApplicationTests\TestUploadApplication.json" />
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.BatchApplicationTests\TestUploadApplicationPackage.json" />
     <None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.CertificateTests\TestAddCertificate.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
@@ -542,6 +547,7 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.JobTests\TestGetJobById.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.JobTests\TestJobWithTaskDependencies.json" />
     <None Include="SessionRecords\Microsoft.Azure.Commands.Batch.Test.ScenarioTests.JobTests\TestListAllJobs.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/AzureBatch/Commands.Batch/Applications/GetBatchApplicationCommand.cs

@@ -24,7 +24,6 @@ namespace Microsoft.Azure.Commands.Batch
     [Cmdlet(VerbsCommon.Get, Constants.AzureRmBatchApplication), OutputType(typeof(PSApplication))]
     public class GetBatchApplicationCommand : BatchCmdletBase
     {
-        [Alias("Name")]
         [Parameter(Position = 0, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "TODO")]
         [ValidateNotNullOrEmpty]
         public string AccountName { get; set; }

src/ResourceManager/AzureBatch/Commands.Batch/Applications/RemoveBatchApplicationCommand.cs

@@ -21,9 +21,8 @@ namespace Microsoft.Azure.Commands.Batch
     [Cmdlet(VerbsCommon.Remove, Constants.AzureRmBatchApplication)]
     public class RemoveBatchApplicationCommand : BatchCmdletBase
     {
-        private static string mamlCall = "DeleteApplication";
+        private static string mamlCall = "RemoveApplication";
 
-        [Alias("Name")]
         [Parameter(Position = 0, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "TODO")]
         [ValidateNotNullOrEmpty]
         public string AccountName { get; set; }

src/ResourceManager/AzureBatch/Commands.Batch/Applications/RemoveBatchApplicationPackageCommand.cs

@@ -21,9 +21,9 @@ namespace Microsoft.Azure.Commands.Batch
     [Cmdlet(VerbsCommon.Remove, Constants.AzureRmBatchApplicationPackage)]
     public class RemoveBatchApplicationPackageCommand : BatchCmdletBase
     {
-        private static string mamlCall = "DeleteApplicationPackage";
+        private static string mamlCall = "RemoveApplicationPackage";
+
 
-        [Alias("Name")]
         [Parameter(Position = 0, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "TODO")]
         [ValidateNotNullOrEmpty]
         public string AccountName { get; set; }

src/ResourceManager/AzureBatch/Commands.Batch/Applications/SetBatchApplicationCommand.cs

@@ -21,9 +21,8 @@ namespace Microsoft.Azure.Commands.Batch
     [Cmdlet(VerbsCommon.Set, Constants.AzureRmBatchApplication)]
     public class SetBatchApplicationCommand : BatchCmdletBase
     {
-        private static string mamlCall = "UpdateApplication";
+        private static string mamlCall = "SetApplication";
 
-        [Alias("Name")]
         [Parameter(Position = 0, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "TODO")]
         [ValidateNotNullOrEmpty]
         public string AccountName { get; set; }

src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchAccountContext.cs

@@ -215,7 +215,6 @@ internal void ConvertAccountResourceToAccountContext(AccountResource resource)
             this.ResourceGroupName = idParts[4];
         }
 
-
         /// <summary>
         /// Create a new BAC and fill it in
         /// </summary>

src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.Applications.cs

@@ -104,9 +104,7 @@ public virtual PSApplicationPackage GetApplicationPackage(string resourceGroupNa
                 applicationId,
                 version);
 
-
-            PSApplicationPackage applicationPackage = this.ConvertGetApplicationPackageResponseToApplicationPackage(response);
-            return applicationPackage;
+            return this.ConvertGetApplicationPackageResponseToApplicationPackage(response);
         }
 
         public virtual IEnumerable<PSApplication> ListApplications(string resourceGroupName, string accountName)
@@ -164,56 +162,6 @@ public virtual AzureOperationResponse UpdateApplication(
                 uap);
         }
 
-        public virtual PSApplicationPackage AddAndUploadApplicationPackage(
-            string resourceGroupName,
-            string accountName,
-            string applicationId,
-            string version,
-            string filePath,
-            string format)
-        {
-            if (!File.Exists(filePath))
-            {
-                throw new FileNotFoundException("File not found: " + filePath);
-            }
-
-            if (string.IsNullOrEmpty(resourceGroupName))
-            {
-                // use resource mgr to see if account exists and then use resource group name to do the actual lookup
-                resourceGroupName = GetGroupForAccount(accountName);
-            }
-
-            AddApplicationPackageResponse response = BatchManagementClient.Applications.AddApplicationPackage(
-                resourceGroupName,
-                accountName,
-                applicationId,
-                version);
-
-            CloudBlockBlob blob = new CloudBlockBlob(new Uri(response.StorageUrl));
-
-            try
-            {
-                blob.UploadFromFile(filePath, FileMode.Open);
-
-                BatchManagementClient.Applications.ActivateApplicationPackage(
-                    resourceGroupName,
-                    accountName,
-                    applicationId,
-                    version,
-                    new ActivateApplicationPackageParameters { Format = format });
-            }
-            catch
-            {
-                this.DeleteApplicationPackage(resourceGroupName, accountName, applicationId, version);
-                throw;
-            }
-
-            PSApplicationPackage getResponse = this.GetApplicationPackage(resourceGroupName, accountName, applicationId, version);
-
-            return getResponse;
-        }
-
-
         public virtual PSApplicationPackage UploadApplicationPackage(
             string resourceGroupName,
             string accountName,
@@ -232,7 +180,7 @@ public virtual PSApplicationPackage UploadApplicationPackage(
                 // use resource mgr to see if account exists and then use resource group name to do the actual lookup
                 resourceGroupName = GetGroupForAccount(accountName);
             }
-            
+
             bool needToCreateAnApplicationPackage;
             var storageUrl = GetStorageUrl(resourceGroupName, accountName, applicationId, version, out needToCreateAnApplicationPackage);