Skip to content

Commit

Permalink
Fix build issue and enum casing bug for Azure Batch (#3861)
Browse files Browse the repository at this point in the history 
* Fix random build issues

* Regenerate SDK based on Swagger specification

* Batch integration test updates

 - Fix test failure.
 - Update xunit version.

* Update changelog and version number
  • Loading branch information
@matthchr @shahabhijeet
matthchr authored and shahabhijeet committed Nov 17, 2017
1 parent 32d63f4 commit 6da04f1
Show file tree
Hide file tree
Showing 84 changed files with 727 additions and 614 deletions.
9 changes: 5 additions & 4 deletions src/SDKs/Batch/DataPlane/Azure.Batch.IntegrationTests/Azure.Batch.IntegrationTests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>$(LibraryToolsFolder)\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<NoWarn>1591</NoWarn>
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)'=='net452' ">
<DefineConstants>FullNetFx</DefineConstants>
<OutputPath>bin\$(Configuration)\</OutputPath>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<DocumentationFile></DocumentationFile>
</PropertyGroup>

<ItemGroup>
Expand All @@ -39,9 +40,9 @@
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
</PropertyGroup>-->
<ItemGroup>
<PackageReference Include="xunit" Version="2.3.0-beta1-build3642" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta1-build1309" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0-preview-20170222-09" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="Microsoft.Azure.Management.Batch" Version="4.2.0" />
<PackageReference Include="WindowsAzure.Storage" Version="8.1.1" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/SDKs/Batch/DataPlane/Azure.Batch.IntegrationTests/ComputeNodeIntegrationTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -510,8 +510,8 @@ public void Bug2342986_StartTaskMissingOnComputeNode()

Assert.Equal(poolStartTask.CommandLine, computeNode.StartTask.CommandLine);
Assert.Equal(poolStartTask.MaxTaskRetryCount, computeNode.StartTask.MaxTaskRetryCount);
Assert.Null(poolStartTask.UserIdentity);
Assert.Null(computeNode.StartTask.UserIdentity);
Assert.Equal(AutoUserScope.Task, poolStartTask.UserIdentity.AutoUser.Scope);
Assert.Equal(AutoUserScope.Task, computeNode.StartTask.UserIdentity.AutoUser.Scope);
Assert.Equal(poolStartTask.WaitForSuccess, computeNode.StartTask.WaitForSuccess);

if (poolStartTask.EnvironmentSettings != null)
Expand Down
2 changes: 1 addition & 1 deletion src/SDKs/Batch/DataPlane/Azure.Batch/AssemblyAttributes.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyDescription("Client library for interacting with the Azure Batch service.")]

[assembly: AssemblyVersion("8.0.0.0")]
[assembly: AssemblyFileVersion("8.0.0.0")]
[assembly: AssemblyFileVersion("8.0.1.0")]
[assembly: AssemblyCompany("Microsoft Corporation")]
[assembly: AssemblyProduct("Microsoft Azure")]
[assembly: AssemblyCopyright("Copyright (c) Microsoft Corporation. All rights reserved.")]
Expand Down
16 changes: 15 additions & 1 deletion src/SDKs/Batch/DataPlane/Azure.Batch/Azure.Batch.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,31 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$([MSBuild]::GetPathOfFileAbove('AzSdk.reference.props'))" />
<PropertyGroup>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<PackageId>Azure.Batch</PackageId>
<Description>This client library provides access to the Microsoft Azure Batch service.</Description>
<VersionPrefix>8.0.0</VersionPrefix>
<VersionPrefix>8.0.1</VersionPrefix>
<DefineConstants>$(DefineConstants);CODESIGN</DefineConstants>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AssemblyName>Microsoft.Azure.Batch</AssemblyName>
<PackageTags>Microsoft;Azure;Batch;windowsazureofficial</PackageTags>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<NoWarn>1591</NoWarn>
</PropertyGroup>

<PropertyGroup>
<SignAssembly>true</SignAssembly>
<DelaySign>true</DelaySign>
<AssemblyOriginatorKeyFile>$(LibraryToolsFolder)\MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>net452;netstandard1.4</TargetFrameworks>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<PackageReleaseNotes>For detailed release notes, see: https://aka.ms/batch-net-dataplane-changelog</PackageReleaseNotes>
Expand Down
44 changes: 4 additions & 40 deletions src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/ComputeNodeOperations.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1094,20 +1094,7 @@ internal ComputeNodeOperations(BatchServiceClient client)
/// </param>
/// <param name='nodeRebootOption'>
/// When to reboot the compute node and what to do with currently running
/// tasks. Values are:
///
/// requeue - Terminate running task processes and requeue the tasks. The tasks
/// will run again when a node is available. Restart the node as soon as tasks
/// have been terminated.
/// terminate - Terminate running tasks. The tasks will not run again. Restart
/// the node as soon as tasks have been terminated.
/// taskcompletion - Allow currently running tasks to complete. Schedule no new
/// tasks while waiting. Restart the node when all tasks have completed.
/// retaineddata - Allow currently running tasks to complete, then wait for all
/// task data retention periods to expire. Schedule no new tasks while waiting.
/// Restart the node when all task retention periods have expired.
///
/// The default value is requeue. Possible values include: 'requeue',
/// tasks. The default value is requeue. Possible values include: 'requeue',
/// 'terminate', 'taskCompletion', 'retainedData'
/// </param>
/// <param name='computeNodeRebootOptions'>
Expand Down Expand Up @@ -1363,20 +1350,7 @@ internal ComputeNodeOperations(BatchServiceClient client)
/// </param>
/// <param name='nodeReimageOption'>
/// When to reimage the compute node and what to do with currently running
/// tasks. Values are:
///
/// requeue - Terminate running task processes and requeue the tasks. The tasks
/// will run again when a node is available. Reimage the node as soon as tasks
/// have been terminated.
/// terminate - Terminate running tasks. The tasks will not run again. Reimage
/// the node as soon as tasks have been terminated.
/// taskcompletion - Allow currently running tasks to complete. Schedule no new
/// tasks while waiting. Reimage the node when all tasks have completed.
/// retaineddata - Allow currently running tasks to complete, then wait for all
/// task data retention periods to expire. Schedule no new tasks while waiting.
/// Reimage the node when all task retention periods have expired.
///
/// The default value is requeue. Possible values include: 'requeue',
/// tasks. The default value is requeue. Possible values include: 'requeue',
/// 'terminate', 'taskCompletion', 'retainedData'
/// </param>
/// <param name='computeNodeReimageOptions'>
Expand Down Expand Up @@ -1631,18 +1605,8 @@ internal ComputeNodeOperations(BatchServiceClient client)
/// </param>
/// <param name='nodeDisableSchedulingOption'>
/// What to do with currently running tasks when disabling task scheduling on
/// the compute node. Values are:
///
/// requeue - Terminate running task processes and requeue the tasks. The tasks
/// may run again on other compute nodes, or when task scheduling is re-enabled
/// on this node. Enter offline state as soon as tasks have been terminated.
/// terminate - Terminate running tasks. The tasks will not run again. Enter
/// offline state as soon as tasks have been terminated.
/// taskcompletion - Allow currently running tasks to complete. Schedule no new
/// tasks while waiting. Enter offline state when all tasks have completed.
///
/// The default value is requeue. Possible values include: 'requeue',
/// 'terminate', 'taskCompletion'
/// the compute node. The default value is requeue. Possible values include:
/// 'requeue', 'terminate', 'taskCompletion'
/// </param>
/// <param name='computeNodeDisableSchedulingOptions'>
/// Additional parameters for the operation
Expand Down
88 changes: 8 additions & 80 deletions src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/ComputeNodeOperationsExtensions.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -277,20 +277,7 @@ public static partial class ComputeNodeOperationsExtensions
/// </param>
/// <param name='nodeRebootOption'>
/// When to reboot the compute node and what to do with currently running
/// tasks. Values are:
///
/// requeue - Terminate running task processes and requeue the tasks. The tasks
/// will run again when a node is available. Restart the node as soon as tasks
/// have been terminated.
/// terminate - Terminate running tasks. The tasks will not run again. Restart
/// the node as soon as tasks have been terminated.
/// taskcompletion - Allow currently running tasks to complete. Schedule no new
/// tasks while waiting. Restart the node when all tasks have completed.
/// retaineddata - Allow currently running tasks to complete, then wait for all
/// task data retention periods to expire. Schedule no new tasks while waiting.
/// Restart the node when all task retention periods have expired.
///
/// The default value is requeue. Possible values include: 'requeue',
/// tasks. The default value is requeue. Possible values include: 'requeue',
/// 'terminate', 'taskCompletion', 'retainedData'
/// </param>
/// <param name='computeNodeRebootOptions'>
Expand Down Expand Up @@ -318,20 +305,7 @@ public static partial class ComputeNodeOperationsExtensions
/// </param>
/// <param name='nodeRebootOption'>
/// When to reboot the compute node and what to do with currently running
/// tasks. Values are:
///
/// requeue - Terminate running task processes and requeue the tasks. The tasks
/// will run again when a node is available. Restart the node as soon as tasks
/// have been terminated.
/// terminate - Terminate running tasks. The tasks will not run again. Restart
/// the node as soon as tasks have been terminated.
/// taskcompletion - Allow currently running tasks to complete. Schedule no new
/// tasks while waiting. Restart the node when all tasks have completed.
/// retaineddata - Allow currently running tasks to complete, then wait for all
/// task data retention periods to expire. Schedule no new tasks while waiting.
/// Restart the node when all task retention periods have expired.
///
/// The default value is requeue. Possible values include: 'requeue',
/// tasks. The default value is requeue. Possible values include: 'requeue',
/// 'terminate', 'taskCompletion', 'retainedData'
/// </param>
/// <param name='computeNodeRebootOptions'>
Expand Down Expand Up @@ -367,20 +341,7 @@ public static partial class ComputeNodeOperationsExtensions
/// </param>
/// <param name='nodeReimageOption'>
/// When to reimage the compute node and what to do with currently running
/// tasks. Values are:
///
/// requeue - Terminate running task processes and requeue the tasks. The tasks
/// will run again when a node is available. Reimage the node as soon as tasks
/// have been terminated.
/// terminate - Terminate running tasks. The tasks will not run again. Reimage
/// the node as soon as tasks have been terminated.
/// taskcompletion - Allow currently running tasks to complete. Schedule no new
/// tasks while waiting. Reimage the node when all tasks have completed.
/// retaineddata - Allow currently running tasks to complete, then wait for all
/// task data retention periods to expire. Schedule no new tasks while waiting.
/// Reimage the node when all task retention periods have expired.
///
/// The default value is requeue. Possible values include: 'requeue',
/// tasks. The default value is requeue. Possible values include: 'requeue',
/// 'terminate', 'taskCompletion', 'retainedData'
/// </param>
/// <param name='computeNodeReimageOptions'>
Expand Down Expand Up @@ -410,20 +371,7 @@ public static partial class ComputeNodeOperationsExtensions
/// </param>
/// <param name='nodeReimageOption'>
/// When to reimage the compute node and what to do with currently running
/// tasks. Values are:
///
/// requeue - Terminate running task processes and requeue the tasks. The tasks
/// will run again when a node is available. Reimage the node as soon as tasks
/// have been terminated.
/// terminate - Terminate running tasks. The tasks will not run again. Reimage
/// the node as soon as tasks have been terminated.
/// taskcompletion - Allow currently running tasks to complete. Schedule no new
/// tasks while waiting. Reimage the node when all tasks have completed.
/// retaineddata - Allow currently running tasks to complete, then wait for all
/// task data retention periods to expire. Schedule no new tasks while waiting.
/// Reimage the node when all task retention periods have expired.
///
/// The default value is requeue. Possible values include: 'requeue',
/// tasks. The default value is requeue. Possible values include: 'requeue',
/// 'terminate', 'taskCompletion', 'retainedData'
/// </param>
/// <param name='computeNodeReimageOptions'>
Expand Down Expand Up @@ -458,18 +406,8 @@ public static partial class ComputeNodeOperationsExtensions
/// </param>
/// <param name='nodeDisableSchedulingOption'>
/// What to do with currently running tasks when disabling task scheduling on
/// the compute node. Values are:
///
/// requeue - Terminate running task processes and requeue the tasks. The tasks
/// may run again on other compute nodes, or when task scheduling is re-enabled
/// on this node. Enter offline state as soon as tasks have been terminated.
/// terminate - Terminate running tasks. The tasks will not run again. Enter
/// offline state as soon as tasks have been terminated.
/// taskcompletion - Allow currently running tasks to complete. Schedule no new
/// tasks while waiting. Enter offline state when all tasks have completed.
///
/// The default value is requeue. Possible values include: 'requeue',
/// 'terminate', 'taskCompletion'
/// the compute node. The default value is requeue. Possible values include:
/// 'requeue', 'terminate', 'taskCompletion'
/// </param>
/// <param name='computeNodeDisableSchedulingOptions'>
/// Additional parameters for the operation
Expand Down Expand Up @@ -497,18 +435,8 @@ public static partial class ComputeNodeOperationsExtensions
/// </param>
/// <param name='nodeDisableSchedulingOption'>
/// What to do with currently running tasks when disabling task scheduling on
/// the compute node. Values are:
///
/// requeue - Terminate running task processes and requeue the tasks. The tasks
/// may run again on other compute nodes, or when task scheduling is re-enabled
/// on this node. Enter offline state as soon as tasks have been terminated.
/// terminate - Terminate running tasks. The tasks will not run again. Enter
/// offline state as soon as tasks have been terminated.
/// taskcompletion - Allow currently running tasks to complete. Schedule no new
/// tasks while waiting. Enter offline state when all tasks have completed.
///
/// The default value is requeue. Possible values include: 'requeue',
/// 'terminate', 'taskCompletion'
/// the compute node. The default value is requeue. Possible values include:
/// 'requeue', 'terminate', 'taskCompletion'
/// </param>
/// <param name='computeNodeDisableSchedulingOptions'>
/// Additional parameters for the operation
Expand Down
Loading

0 comments on commit 6da04f1

Please sign in to comment.