Made it so file path isn't needed when only activate is on

Author: matthew-rollitt

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

@@ -68,23 +68,21 @@ public void UploadBatchApplicationPackageTest()
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void ActivateApplicationPackage()
+        public void ActivateApplicationPackageOnly()
         {
             string accountName = "account01";
             string resourceGroup = "resourceGroup";
             string applicationId = "applicationId";
-            string filePath = "~/fake/filepath";
             string version = "version";
             string format = "zip";
 
             PSApplicationPackage applicationPackageResponse = new PSApplicationPackage();
 
-            batchClientMock.Setup(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationId, version, filePath, format, true)).Returns(applicationPackageResponse);
+            batchClientMock.Setup(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationId, version, null, format, true)).Returns(applicationPackageResponse);
 
             cmdlet.AccountName = accountName;
             cmdlet.ResourceGroupName = resourceGroup;
             cmdlet.ApplicationId = applicationId;
-            cmdlet.FilePath = filePath;
             cmdlet.ApplicationVersion = version;
             cmdlet.Format = format;
             cmdlet.ActivateOnly = true;
@@ -93,7 +91,7 @@ public void ActivateApplicationPackage()
             commandRuntimeMock.Setup(f => f.ShouldProcess(It.IsAny<string>(), It.IsAny<string>())).Returns(true);
             cmdlet.ExecuteCmdlet();
 
-            batchClientMock.Verify(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationId, version, filePath, format, true), Times.Once());
+            batchClientMock.Verify(b => b.UploadAndActivateApplicationPackage(resourceGroup, accountName, applicationId, version, null, format, true), Times.Once());
         }
     }
 }

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

@@ -38,15 +38,15 @@ public class NewBatchApplicationPackageCommand : BatchCmdletBase
         [ValidateNotNullOrEmpty]
         public string ApplicationVersion { get; set; }
 
-        [Parameter(Position = 4, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Specifies the file to be uploaded as the application package binary file.")]
+        [Parameter(Position = 4, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Specifies the format of the application package binary file.")]
         [ValidateNotNullOrEmpty]
-        public string FilePath { get; set; }
+        public string Format { get; set; }
 
-        [Parameter(Position = 5, ValueFromPipelineByPropertyName = true, Mandatory = true, HelpMessage = "Specifies the format of the application package binary file.")]
+        [Parameter(ValueFromPipelineByPropertyName = true)]
         [ValidateNotNullOrEmpty]
-        public string Format { get; set; }
+        public string FilePath { get; set; }
 
-        [Parameter(Position = 6, ValueFromPipelineByPropertyName = true)]
+        [Parameter(ValueFromPipelineByPropertyName = true)]
         [ValidateNotNullOrEmpty]
         public SwitchParameter ActivateOnly { get; set; }
 

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

@@ -171,25 +171,24 @@ public virtual PSApplicationPackage UploadAndActivateApplicationPackage(
             string format,
             bool activateOnly)
         {
-            // Checks File path and resourceGroupName is valid
-            if (!File.Exists(filePath))
-            {
-                throw new FileNotFoundException(string.Format(Resources.FileNotFound, filePath), 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);
             }
-
-            // If the package has already been uploaded but wasn't activated.
             if (activateOnly)
             {
+                // If the package has already been uploaded but wasn't activated.
                 ActivateApplicationPackage(resourceGroupName, accountName, applicationId, version, format, Resources.FailedToActivate);
             }
             else
             {
+                // Checks File path and resourceGroupName is valid
+                if (!File.Exists(filePath))
+                {
+                    throw new FileNotFoundException(string.Format(Resources.FileNotFound, filePath), filePath);
+                }
+
                 // Else create Application Package and upload.
                 bool appPackageAlreadyExists;