Skip to content

Commit d686d89

Browse files
Pre code review changes
1 parent 1956843 commit d686d89

File tree

4 files changed

+22
-11
lines changed

4 files changed

+22
-11
lines changed

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchAccountTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15-
using System;
16-
1715
using Microsoft.WindowsAzure.Commands.ScenarioTest;
1816
using Xunit;
1917

src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ScenarioTestHelpers.cs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ public static class ScenarioTestHelpers
6161
internal const string MpiSetupFileLocalPath = "Resources\\MSMpiSetup.exe";
6262
internal const string StorageAccountEnvVar = "AZURE_STORAGE_ACCOUNT";
6363
internal const string StorageKeyEnvVar = "AZURE_STORAGE_ACCESS_KEY";
64-
public static string StorageResourceId = "AZURE_BATCH_STORAGE_ID";
6564

6665
internal const string BatchAccountName = "AZURE_BATCH_ACCOUNT";
6766
internal const string BatchAccountKey = "AZURE_BATCH_ACCESS_KEY";
@@ -99,9 +98,9 @@ public static string AddTestCertificate(BatchController controller, BatchAccount
9998
BatchClient client = new BatchClient(controller.BatchManagementClient, controller.ResourceManagementClient);
10099

101100
X509Certificate2 cert = new X509Certificate2(filePath);
102-
ListCertificateOptions getParameters = new ListCertificateOptions(context)
103-
{
104-
ThumbprintAlgorithm = BatchTestHelpers.TestCertificateAlgorithm,
101+
ListCertificateOptions getParameters = new ListCertificateOptions(context)
102+
{
103+
ThumbprintAlgorithm = BatchTestHelpers.TestCertificateAlgorithm,
105104
Thumbprint = cert.Thumbprint,
106105
Select = "thumbprint,state"
107106
};
@@ -182,7 +181,7 @@ public static void WaitForCertificateToFailDeletion(BatchController controller,
182181
/// <summary>
183182
/// Creates a test pool for use in Scenario tests.
184183
/// </summary>
185-
public static void CreateTestPool(BatchController controller, BatchAccountContext context, string poolId, int targetDedicated,
184+
public static void CreateTestPool(BatchController controller, BatchAccountContext context, string poolId, int targetDedicated,
186185
CertificateReference certReference = null, StartTask startTask = null)
187186
{
188187
BatchClient client = new BatchClient(controller.BatchManagementClient, controller.ResourceManagementClient);
@@ -199,7 +198,7 @@ public static void CreateTestPool(BatchController controller, BatchAccountContex
199198
}
200199

201200
PSCloudServiceConfiguration paasConfiguration = new PSCloudServiceConfiguration("4", "*");
202-
201+
203202
NewPoolParameters parameters = new NewPoolParameters(context, poolId)
204203
{
205204
VirtualMachineSize = "small",
@@ -462,7 +461,7 @@ public static void CreateTestTask(BatchController controller, BatchAccountContex
462461
MultiInstanceSettings = multiInstanceSettings,
463462
RunElevated = numInstances <= 1
464463
};
465-
464+
466465
client.CreateTask(parameters);
467466
}
468467

src/ResourceManager/AzureBatch/Commands.Batch/Accounts/NewBatchAccountCommand.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class NewBatchAccountCommand : BatchCmdletBase
3737
[ValidateNotNullOrEmpty]
3838
public string ResourceGroupName { get; set; }
3939

40-
[Parameter(Position = 4, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "TODO")]
40+
[Parameter(Position = 3, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "TODO")]
4141
public string StorageId { get; set; }
4242

4343
[Alias("Tags")]

src/ResourceManager/Tags/Commands.Tags/Model/PSApplication.cs

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,18 @@
1-
using System;
1+
// ----------------------------------------------------------------------------------
2+
//
3+
// Copyright Microsoft Corporation
4+
// Licensed under the Apache License, Version 2.0 (the "License");
5+
// you may not use this file except in compliance with the License.
6+
// You may obtain a copy of the License at
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
// Unless required by applicable law or agreed to in writing, software
9+
// distributed under the License is distributed on an "AS IS" BASIS,
10+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
11+
// See the License for the specific language governing permissions and
12+
// limitations under the License.
13+
// ----------------------------------------------------------------------------------
14+
15+
using System;
216
using System.Collections.Generic;
317
using System.Linq;
418
using System.Text;

0 commit comments

Comments
 (0)