From 6da04f19b6edc2387bb6aa62b21422dce7c85b9e Mon Sep 17 00:00:00 2001 From: Matthew Christopher Date: Fri, 17 Nov 2017 11:52:21 -0800 Subject: [PATCH] Fix build issue and enum casing bug for Azure Batch (#3861) * 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 --- .../Azure.Batch.IntegrationTests.csproj | 9 +- .../ComputeNodeIntegrationTests.cs | 4 +- .../Azure.Batch/AssemblyAttributes.cs | 2 +- .../DataPlane/Azure.Batch/Azure.Batch.csproj | 16 +++- .../ComputeNodeOperations.cs | 44 +--------- .../ComputeNodeOperationsExtensions.cs | 88 ++----------------- .../IComputeNodeOperations.cs | 54 ++---------- .../GeneratedProtocol/IJobOperations.cs | 9 +- .../GeneratedProtocol/JobOperations.cs | 21 +---- .../JobOperationsExtensions.cs | 18 +--- .../JobScheduleOperations.cs | 12 --- .../GeneratedProtocol/Models/AccessScope.cs | 4 + .../Models/AllocationState.cs | 14 +++ .../Models/AutoPoolSpecification.cs | 10 +-- .../GeneratedProtocol/Models/AutoUserScope.cs | 7 ++ .../Models/AutoUserSpecification.cs | 6 -- .../Models/BatchErrorException.cs | 2 +- .../GeneratedProtocol/Models/CachingType.cs | 21 +++-- .../Models/CertificateFormat.cs | 7 ++ .../Models/CertificateReference.cs | 9 +- .../Models/CertificateState.cs | 24 ++++- .../Models/CertificateStoreLocation.cs | 20 +++-- .../Models/CertificateVisibility.cs | 24 +++-- .../GeneratedProtocol/Models/CloudPool.cs | 26 +----- .../GeneratedProtocol/Models/ComputeNode.cs | 73 +++++---------- .../Models/ComputeNodeDeallocationOption.cs | 31 +++++-- .../Models/ComputeNodeFillType.cs | 8 ++ .../Models/ComputeNodeRebootOption.cs | 32 +++++-- .../Models/ComputeNodeReimageOption.cs | 32 +++++-- .../Models/ComputeNodeState.cs | 60 +++++++++++-- .../Models/ContainerConfiguration.cs | 3 - .../GeneratedProtocol/Models/DataDisk.cs | 14 +-- .../Models/DependencyAction.cs | 6 ++ .../DisableComputeNodeSchedulingOption.cs | 21 ++++- .../Models/DisableJobOption.cs | 12 +++ .../Models/ElevationLevel.cs | 13 ++- .../GeneratedProtocol/Models/ErrorCategory.cs | 18 ++-- .../GeneratedProtocol/Models/ExitOptions.cs | 27 ++---- .../Models/InboundEndpointProtocol.cs | 6 ++ .../Models/InboundNatPool.cs | 11 +-- .../GeneratedProtocol/Models/JobAction.cs | 11 +++ .../Models/JobAddParameter.cs | 17 +--- .../Models/JobDisableParameter.cs | 8 +- .../JobPreparationTaskExecutionInformation.cs | 8 +- .../Models/JobPreparationTaskState.cs | 9 ++ .../JobReleaseTaskExecutionInformation.cs | 8 +- .../Models/JobReleaseTaskState.cs | 9 ++ .../Models/JobScheduleAddParameter.cs | 1 - .../Models/JobScheduleState.cs | 27 ++++++ .../Models/JobScheduleUpdateParameter.cs | 1 - .../Models/JobSpecification.cs | 1 - .../GeneratedProtocol/Models/JobState.cs | 31 +++++++ .../Models/JobUpdateParameter.cs | 1 - .../Models/NetworkSecurityGroupRuleAccess.cs | 6 ++ .../Models/NodeDisableSchedulingParameter.cs | 12 --- .../Models/NodeRebootParameter.cs | 15 ---- .../Models/NodeReimageParameter.cs | 15 ---- .../GeneratedProtocol/Models/OSDisk.cs | 6 -- .../GeneratedProtocol/Models/OSType.cs | 6 ++ .../Models/OnAllTasksComplete.cs | 20 +++-- .../GeneratedProtocol/Models/OnTaskFailure.cs | 21 +++-- .../Models/OutputFileUploadCondition.cs | 30 +++++-- .../Models/PoolLifetimeOption.cs | 19 +++- .../GeneratedProtocol/Models/PoolState.cs | 15 ++++ .../Models/SchedulingState.cs | 8 ++ .../Models/StartTaskInformation.cs | 9 +- .../Models/StartTaskState.cs | 9 ++ .../Models/StorageAccountType.cs | 18 ++-- .../GeneratedProtocol/Models/SubtaskState.cs | 20 +++++ .../GeneratedProtocol/Models/TaskAddResult.cs | 9 +- .../GeneratedProtocol/Models/TaskAddStatus.cs | 23 +++-- .../Models/TaskCountValidationStatus.cs | 10 +++ .../GeneratedProtocol/Models/TaskCounts.cs | 6 +- .../Models/TaskExecutionResult.cs | 8 ++ .../Models/TaskSchedulingPolicy.cs | 14 +-- .../GeneratedProtocol/Models/TaskState.cs | 26 ++++++ .../Models/VirtualMachineConfiguration.cs | 10 ++- .../GeneratedProtocol/PoolOperations.cs | 4 - .../DataPlane/TestCommon/Common/Common.csproj | 3 + .../IntegrationTestCommon.csproj | 7 ++ .../Properties/AssemblyInfo.cs | 19 ---- .../ConfigureAwaitAnalyzer.Tests.csproj | 4 +- src/SDKs/Batch/DataPlane/changelog.md | 7 ++ src/SDKs/_metadata/batch_data-plane.txt | 12 +-- 84 files changed, 727 insertions(+), 614 deletions(-) delete mode 100644 src/SDKs/Batch/DataPlane/TestCommon/IntegrationTestCommon/Properties/AssemblyInfo.cs diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch.IntegrationTests/Azure.Batch.IntegrationTests.csproj b/src/SDKs/Batch/DataPlane/Azure.Batch.IntegrationTests/Azure.Batch.IntegrationTests.csproj index a8474107626b2..6a04560427ae8 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch.IntegrationTests/Azure.Batch.IntegrationTests.csproj +++ b/src/SDKs/Batch/DataPlane/Azure.Batch.IntegrationTests/Azure.Batch.IntegrationTests.csproj @@ -11,12 +11,13 @@ true $(LibraryToolsFolder)\MSSharedLibKey.snk true + 1591 FullNetFx bin\$(Configuration)\ - bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml + @@ -39,9 +40,9 @@ bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml --> - - - + + + diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch.IntegrationTests/ComputeNodeIntegrationTests.cs b/src/SDKs/Batch/DataPlane/Azure.Batch.IntegrationTests/ComputeNodeIntegrationTests.cs index 931e0bdb1ce80..2a14097450574 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch.IntegrationTests/ComputeNodeIntegrationTests.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch.IntegrationTests/ComputeNodeIntegrationTests.cs @@ -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) diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/AssemblyAttributes.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/AssemblyAttributes.cs index a13d849978f03..6f9d7130da313 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/AssemblyAttributes.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/AssemblyAttributes.cs @@ -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.")] diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/Azure.Batch.csproj b/src/SDKs/Batch/DataPlane/Azure.Batch/Azure.Batch.csproj index b316661d60a81..39f975c4cef8f 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/Azure.Batch.csproj +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/Azure.Batch.csproj @@ -1,17 +1,31 @@  + false + false + false + false + false + false + false Azure.Batch This client library provides access to the Microsoft Azure Batch service. - 8.0.0 + 8.0.1 $(DefineConstants);CODESIGN true Microsoft.Azure.Batch Microsoft;Azure;Batch;windowsazureofficial bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml + 1591 + true + true + $(LibraryToolsFolder)\MSSharedLibKey.snk + + + net452;netstandard1.4 True For detailed release notes, see: https://aka.ms/batch-net-dataplane-changelog diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/ComputeNodeOperations.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/ComputeNodeOperations.cs index c5b64775c065b..e9600e13e7dd5 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/ComputeNodeOperations.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/ComputeNodeOperations.cs @@ -1094,20 +1094,7 @@ internal ComputeNodeOperations(BatchServiceClient client) /// /// /// 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' /// /// @@ -1363,20 +1350,7 @@ internal ComputeNodeOperations(BatchServiceClient client) /// /// /// 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' /// /// @@ -1631,18 +1605,8 @@ internal ComputeNodeOperations(BatchServiceClient client) /// /// /// 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' /// /// /// Additional parameters for the operation diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/ComputeNodeOperationsExtensions.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/ComputeNodeOperationsExtensions.cs index cd10362bb4d6c..cb0675321f28c 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/ComputeNodeOperationsExtensions.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/ComputeNodeOperationsExtensions.cs @@ -277,20 +277,7 @@ public static partial class ComputeNodeOperationsExtensions /// /// /// 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' /// /// @@ -318,20 +305,7 @@ public static partial class ComputeNodeOperationsExtensions /// /// /// 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' /// /// @@ -367,20 +341,7 @@ public static partial class ComputeNodeOperationsExtensions /// /// /// 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' /// /// @@ -410,20 +371,7 @@ public static partial class ComputeNodeOperationsExtensions /// /// /// 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' /// /// @@ -458,18 +406,8 @@ public static partial class ComputeNodeOperationsExtensions /// /// /// 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' /// /// /// Additional parameters for the operation @@ -497,18 +435,8 @@ public static partial class ComputeNodeOperationsExtensions /// /// /// 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' /// /// /// Additional parameters for the operation diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/IComputeNodeOperations.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/IComputeNodeOperations.cs index 85393c72da708..9c956f7f9e5d8 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/IComputeNodeOperations.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/IComputeNodeOperations.cs @@ -169,23 +169,8 @@ public partial interface IComputeNodeOperations /// /// /// 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', - /// 'terminate', 'taskCompletion', 'retainedData' + /// running tasks. The default value is requeue. Possible values + /// include: 'requeue', 'terminate', 'taskCompletion', 'retainedData' /// /// /// Additional parameters for the operation @@ -219,23 +204,8 @@ public partial interface IComputeNodeOperations /// /// /// 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', - /// 'terminate', 'taskCompletion', 'retainedData' + /// running tasks. The default value is requeue. Possible values + /// include: 'requeue', 'terminate', 'taskCompletion', 'retainedData' /// /// /// Additional parameters for the operation @@ -269,20 +239,8 @@ public partial interface IComputeNodeOperations /// /// /// 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' + /// scheduling on the compute node. The default value is requeue. + /// Possible values include: 'requeue', 'terminate', 'taskCompletion' /// /// /// Additional parameters for the operation diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/IJobOperations.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/IJobOperations.cs index cef3d5ca363b1..5562dd7575b02 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/IJobOperations.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/IJobOperations.cs @@ -189,13 +189,8 @@ public partial interface IJobOperations /// The ID of the job to disable. /// /// - /// What to do with active tasks associated with the job. Values are: - /// - /// requeue - Terminate running tasks and requeue them. The tasks will - /// run again when the job is enabled. - /// terminate - Terminate running tasks. The tasks will not run again. - /// wait - Allow currently running tasks to complete. Possible values - /// include: 'requeue', 'terminate', 'wait' + /// What to do with active tasks associated with the job. Possible + /// values include: 'requeue', 'terminate', 'wait' /// /// /// Additional parameters for the operation diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/JobOperations.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/JobOperations.cs index 31e2186294a5b..4b84044821fac 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/JobOperations.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/JobOperations.cs @@ -952,10 +952,6 @@ internal JobOperations(BatchServiceClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); } - if (jobPatchParameter == null) - { - jobPatchParameter = new JobPatchParameter(); - } int? timeout = default(int?); if (jobPatchOptions != null) { @@ -1260,10 +1256,6 @@ internal JobOperations(BatchServiceClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); } - if (jobUpdateParameter == null) - { - jobUpdateParameter = new JobUpdateParameter(); - } int? timeout = default(int?); if (jobUpdateOptions != null) { @@ -1531,13 +1523,8 @@ internal JobOperations(BatchServiceClient client) /// The ID of the job to disable. /// /// - /// What to do with active tasks associated with the job. Values are: - /// - /// requeue - Terminate running tasks and requeue them. The tasks will run - /// again when the job is enabled. - /// terminate - Terminate running tasks. The tasks will not run again. - /// wait - Allow currently running tasks to complete. Possible values include: - /// 'requeue', 'terminate', 'wait' + /// What to do with active tasks associated with the job. Possible values + /// include: 'requeue', 'terminate', 'wait' /// /// /// Additional parameters for the operation @@ -2465,10 +2452,6 @@ internal JobOperations(BatchServiceClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); } - if (job == null) - { - job = new JobAddParameter(); - } int? timeout = default(int?); if (jobAddOptions != null) { diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/JobOperationsExtensions.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/JobOperationsExtensions.cs index 6319186627a18..3e90c5cf6c854 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/JobOperationsExtensions.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/JobOperationsExtensions.cs @@ -299,13 +299,8 @@ public static partial class JobOperationsExtensions /// The ID of the job to disable. /// /// - /// What to do with active tasks associated with the job. Values are: - /// - /// requeue - Terminate running tasks and requeue them. The tasks will run - /// again when the job is enabled. - /// terminate - Terminate running tasks. The tasks will not run again. - /// wait - Allow currently running tasks to complete. Possible values include: - /// 'requeue', 'terminate', 'wait' + /// What to do with active tasks associated with the job. Possible values + /// include: 'requeue', 'terminate', 'wait' /// /// /// Additional parameters for the operation @@ -335,13 +330,8 @@ public static partial class JobOperationsExtensions /// The ID of the job to disable. /// /// - /// What to do with active tasks associated with the job. Values are: - /// - /// requeue - Terminate running tasks and requeue them. The tasks will run - /// again when the job is enabled. - /// terminate - Terminate running tasks. The tasks will not run again. - /// wait - Allow currently running tasks to complete. Possible values include: - /// 'requeue', 'terminate', 'wait' + /// What to do with active tasks associated with the job. Possible values + /// include: 'requeue', 'terminate', 'wait' /// /// /// Additional parameters for the operation diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/JobScheduleOperations.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/JobScheduleOperations.cs index 0a2aa349244d4..073a9d6e12e3f 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/JobScheduleOperations.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/JobScheduleOperations.cs @@ -992,10 +992,6 @@ internal JobScheduleOperations(BatchServiceClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); } - if (jobSchedulePatchParameter == null) - { - jobSchedulePatchParameter = new JobSchedulePatchParameter(); - } int? timeout = default(int?); if (jobSchedulePatchOptions != null) { @@ -1301,10 +1297,6 @@ internal JobScheduleOperations(BatchServiceClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); } - if (jobScheduleUpdateParameter == null) - { - jobScheduleUpdateParameter = new JobScheduleUpdateParameter(); - } int? timeout = default(int?); if (jobScheduleUpdateOptions != null) { @@ -2439,10 +2431,6 @@ internal JobScheduleOperations(BatchServiceClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); } - if (cloudJobSchedule == null) - { - cloudJobSchedule = new JobScheduleAddParameter(); - } int? timeout = default(int?); if (jobScheduleAddOptions != null) { diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AccessScope.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AccessScope.cs index c89caeb6516d4..04a7a82f2c64c 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AccessScope.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AccessScope.cs @@ -21,6 +21,10 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum AccessScope { + /// + /// Grants access to perform all operations on the job containing the + /// task. + /// [EnumMember(Value = "job")] Job } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AllocationState.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AllocationState.cs index 61f98476d95b0..e8b67e438eb26 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AllocationState.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AllocationState.cs @@ -21,10 +21,24 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum AllocationState { + /// + /// The pool is not resizing. There are no changes to the number of + /// nodes in the pool in progress. A pool enters this state when it is + /// created and when no operations are being performed on the pool to + /// change the number of nodes. + /// [EnumMember(Value = "steady")] Steady, + /// + /// The pool is resizing; that is, compute nodes are being added to or + /// removed from the pool. + /// [EnumMember(Value = "resizing")] Resizing, + /// + /// The pool was resizing, but the user has requested that the resize + /// be stopped, but the stop request has not yet been completed. + /// [EnumMember(Value = "stopping")] Stopping } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AutoPoolSpecification.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AutoPoolSpecification.cs index 5c34a8c3c7363..f8b6ba84871ee 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AutoPoolSpecification.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AutoPoolSpecification.cs @@ -71,15 +71,7 @@ public AutoPoolSpecification() /// multiple jobs on a schedule are assigned to pools. /// /// - /// When the pool lifetime is jobSchedule the pool exists for the - /// lifetime of the job schedule. The Batch Service creates the pool - /// when it creates the first job on the schedule. You may apply this - /// option only to job schedules, not to jobs. When the pool lifetime - /// is job the pool exists for the lifetime of the job to which it is - /// dedicated. The Batch service creates the pool when it creates the - /// job. If the 'job' option is applied to a job schedule, the Batch - /// service creates a new auto pool for every job created on the - /// schedule. Possible values include: 'jobSchedule', 'job' + /// Possible values include: 'jobSchedule', 'job' /// [JsonProperty(PropertyName = "poolLifetimeOption")] public PoolLifetimeOption PoolLifetimeOption { get; set; } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AutoUserScope.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AutoUserScope.cs index 0fad8943da676..cac6212328a0c 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AutoUserScope.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AutoUserScope.cs @@ -21,8 +21,15 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum AutoUserScope { + /// + /// Specifies that the service should create a new user for the task. + /// [EnumMember(Value = "task")] Task, + /// + /// Specifies that the task runs as the common auto user account which + /// is created on every node in a pool. + /// [EnumMember(Value = "pool")] Pool } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AutoUserSpecification.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AutoUserSpecification.cs index 14d350818bf79..42cacb34b0540 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AutoUserSpecification.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/AutoUserSpecification.cs @@ -49,12 +49,6 @@ public AutoUserSpecification() /// Gets or sets the scope for the auto user /// /// - /// Values are: - /// - /// pool - specifies that the task runs as the common auto user account - /// which is created on every node in a pool. - /// task - specifies that the service should create a new user for the - /// task. /// The default value is task. Possible values include: 'task', 'pool' /// [JsonProperty(PropertyName = "scope")] diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/BatchErrorException.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/BatchErrorException.cs index 03b1d26ebbf60..d13a92aa4204b 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/BatchErrorException.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/BatchErrorException.cs @@ -15,7 +15,7 @@ namespace Microsoft.Azure.Batch.Protocol.Models /// /// Exception thrown for an invalid response with BatchError information. /// - public class BatchErrorException : RestException + public partial class BatchErrorException : RestException { /// /// Gets information about the associated HTTP request. diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CachingType.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CachingType.cs index e50a89d220fc3..c951c62e0b381 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CachingType.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CachingType.cs @@ -21,11 +21,20 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum CachingType { + /// + /// The caching mode for the disk is not enabled. + /// [EnumMember(Value = "none")] None, - [EnumMember(Value = "readOnly")] + /// + /// The caching mode for the disk is read only. + /// + [EnumMember(Value = "readonly")] ReadOnly, - [EnumMember(Value = "readWrite")] + /// + /// The caching mode for the disk is read and write. + /// + [EnumMember(Value = "readwrite")] ReadWrite } internal static class CachingTypeEnumExtension @@ -42,9 +51,9 @@ internal static string ToSerializedValue(this CachingType value) case CachingType.None: return "none"; case CachingType.ReadOnly: - return "readOnly"; + return "readonly"; case CachingType.ReadWrite: - return "readWrite"; + return "readwrite"; } return null; } @@ -55,9 +64,9 @@ internal static string ToSerializedValue(this CachingType value) { case "none": return CachingType.None; - case "readOnly": + case "readonly": return CachingType.ReadOnly; - case "readWrite": + case "readwrite": return CachingType.ReadWrite; } return null; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateFormat.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateFormat.cs index 79ea2cfdf2aa4..884c026f83ea4 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateFormat.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateFormat.cs @@ -21,8 +21,15 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum CertificateFormat { + /// + /// The certificate is a PFX (PKCS#12) formatted certificate or + /// certificate chain. + /// [EnumMember(Value = "pfx")] Pfx, + /// + /// The certificate is a base64-encoded X.509 certificate. + /// [EnumMember(Value = "cer")] Cer } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateReference.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateReference.cs index 09f0964066051..ba4fa003c7ffb 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateReference.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateReference.cs @@ -75,7 +75,7 @@ public CertificateReference() /// node into which to install the certificate. /// /// - /// The default value is currentUser. This property is applicable only + /// The default value is currentuser. This property is applicable only /// for pools configured with Windows nodes (that is, created with /// cloudServiceConfiguration, or with virtualMachineConfiguration /// using a Windows image reference). For Linux compute nodes, the @@ -110,13 +110,6 @@ public CertificateReference() /// access to the private data of the certificate. /// /// - /// Values are: - /// - /// starttask - The user account under which the start task is run. - /// task - The accounts under which job tasks are run. - /// remoteuser - The accounts under which users remotely access the - /// node. - /// /// You can specify more than one visibility in this collection. The /// default is all accounts. /// diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateState.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateState.cs index 2353e96a35e2a..9fe2ef9970941 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateState.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateState.cs @@ -21,11 +21,29 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum CertificateState { + /// + /// The certificate is available for use in pools. + /// [EnumMember(Value = "active")] Active, + /// + /// The user has requested that the certificate be deleted, but the + /// delete operation has not yet completed. You may not reference the + /// certificate when creating or updating pools. + /// [EnumMember(Value = "deleting")] Deleting, - [EnumMember(Value = "deleteFailed")] + /// + /// The user requested that the certificate be deleted, but there are + /// pools that still have references to the certificate, or it is still + /// installed on one or more compute nodes. (The latter can occur if + /// the certificate has been removed from the pool, but the node has + /// not yet restarted. Nodes refresh their certificates only when they + /// restart.) You may use the cancel certificate delete operation to + /// cancel the delete, or the delete certificate operation to retry the + /// delete. + /// + [EnumMember(Value = "deletefailed")] DeleteFailed } internal static class CertificateStateEnumExtension @@ -44,7 +62,7 @@ internal static string ToSerializedValue(this CertificateState value) case CertificateState.Deleting: return "deleting"; case CertificateState.DeleteFailed: - return "deleteFailed"; + return "deletefailed"; } return null; } @@ -57,7 +75,7 @@ internal static string ToSerializedValue(this CertificateState value) return CertificateState.Active; case "deleting": return CertificateState.Deleting; - case "deleteFailed": + case "deletefailed": return CertificateState.DeleteFailed; } return null; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateStoreLocation.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateStoreLocation.cs index 068deeb388ed8..65a925db7971b 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateStoreLocation.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateStoreLocation.cs @@ -21,9 +21,17 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum CertificateStoreLocation { - [EnumMember(Value = "currentUser")] + /// + /// Certificates should be installed to the CurrentUser certificate + /// store. + /// + [EnumMember(Value = "currentuser")] CurrentUser, - [EnumMember(Value = "localMachine")] + /// + /// Certificates should be installed to the LocalMachine certificate + /// store. + /// + [EnumMember(Value = "localmachine")] LocalMachine } internal static class CertificateStoreLocationEnumExtension @@ -38,9 +46,9 @@ internal static string ToSerializedValue(this CertificateStoreLocation value) switch( value ) { case CertificateStoreLocation.CurrentUser: - return "currentUser"; + return "currentuser"; case CertificateStoreLocation.LocalMachine: - return "localMachine"; + return "localmachine"; } return null; } @@ -49,9 +57,9 @@ internal static string ToSerializedValue(this CertificateStoreLocation value) { switch( value ) { - case "currentUser": + case "currentuser": return CertificateStoreLocation.CurrentUser; - case "localMachine": + case "localmachine": return CertificateStoreLocation.LocalMachine; } return null; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateVisibility.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateVisibility.cs index 722a2764f3451..cb663dda0c31b 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateVisibility.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CertificateVisibility.cs @@ -21,11 +21,23 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum CertificateVisibility { - [EnumMember(Value = "startTask")] + /// + /// The certificate should be visible to the user account under which + /// the start task is run. + /// + [EnumMember(Value = "starttask")] StartTask, + /// + /// The certificate should be visibile to the user accounts under which + /// job tasks are run. + /// [EnumMember(Value = "task")] Task, - [EnumMember(Value = "remoteUser")] + /// + /// The certificate should be visibile to the user accounts under which + /// users remotely access the node. + /// + [EnumMember(Value = "remoteuser")] RemoteUser } internal static class CertificateVisibilityEnumExtension @@ -40,11 +52,11 @@ internal static string ToSerializedValue(this CertificateVisibility value) switch( value ) { case CertificateVisibility.StartTask: - return "startTask"; + return "starttask"; case CertificateVisibility.Task: return "task"; case CertificateVisibility.RemoteUser: - return "remoteUser"; + return "remoteuser"; } return null; } @@ -53,11 +65,11 @@ internal static string ToSerializedValue(this CertificateVisibility value) { switch( value ) { - case "startTask": + case "starttask": return CertificateVisibility.StartTask; case "task": return CertificateVisibility.Task; - case "remoteUser": + case "remoteuser": return CertificateVisibility.RemoteUser; } return null; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CloudPool.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CloudPool.cs index 35b93fdf63aea..fbfced03b6d94 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CloudPool.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/CloudPool.cs @@ -203,18 +203,7 @@ public CloudPool() /// Gets or sets the current state of the pool. /// /// - /// Values are: - /// - /// active - The pool is available to run tasks subject to the - /// availability of compute nodes. - /// deleting - The user has requested that the pool be deleted, but the - /// delete operation has not yet completed. - /// upgrading - The user has requested that the operating system of the - /// pool's nodes be upgraded, but the upgrade operation has not yet - /// completed (that is, some nodes in the pool have not yet been - /// upgraded). While upgrading, the pool may be able to run tasks (with - /// reduced capacity) but this is not guaranteed. Possible values - /// include: 'active', 'deleting', 'upgrading' + /// Possible values include: 'active', 'deleting', 'upgrading' /// [JsonProperty(PropertyName = "state")] public PoolState? State { get; set; } @@ -229,18 +218,7 @@ public CloudPool() /// Gets or sets whether the pool is resizing. /// /// - /// Values are: - /// - /// steady - The pool is not resizing. There are no changes to the - /// number of nodes in the pool in progress. A pool enters this state - /// when it is created and when no operations are being performed on - /// the pool to change the number of dedicated nodes. - /// resizing - The pool is resizing; that is, compute nodes are being - /// added to or removed from the pool. - /// stopping - The pool was resizing, but the user has requested that - /// the resize be stopped, but the stop request has not yet been - /// completed. Possible values include: 'steady', 'resizing', - /// 'stopping' + /// Possible values include: 'steady', 'resizing', 'stopping' /// [JsonProperty(PropertyName = "allocationState")] public AllocationState? AllocationState { get; set; } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNode.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNode.cs index 5763d3a6dc494..7f636007aaca7 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNode.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNode.cs @@ -50,16 +50,16 @@ public ComputeNode() /// The size of the virtual machine hosting the /// compute node. /// The total number of job tasks completed - /// on the compute node. This includes Job Preparation, Job Release and - /// Job Manager tasks, but not the pool start task. + /// on the compute node. This includes Job Manager tasks and normal + /// tasks, but not Job Preparation, Job Release or Start tasks. /// The total number of currently - /// running job tasks on the compute node. This includes Job - /// Preparation, Job Release, and Job Manager tasks, but not the pool - /// start task. + /// running job tasks on the compute node. This includes Job Manager + /// tasks and normal tasks, but not Job Preparation, Job Release or + /// Start tasks. /// The total number of job tasks /// which completed successfully (with exitCode 0) on the compute node. - /// This includes Job Preparation, Job Release, and Job Manager tasks, - /// but not the pool start task. + /// This includes Job Manager tasks and normal tasks, but not Job + /// Preparation, Job Release or Start tasks. /// A list of tasks whose state has recently /// changed. /// The task specified to run on the compute @@ -125,39 +125,12 @@ public ComputeNode() /// Gets or sets the current state of the compute node. /// /// - /// Values are: - /// - /// idle - The node is not currently running a task. - /// rebooting - The node is rebooting. - /// reimaging - The node is reimaging. - /// running - The node is running one or more tasks (other than a start - /// task). - /// unusable - The node cannot be used for task execution due to - /// errors. - /// creating - The Batch service has obtained the underlying virtual - /// machine from Azure Compute, but it has not yet started to join the - /// pool. - /// starting - the Batch service is starting on the underlying virtual - /// machine. - /// waitingforstarttask - The start task has started running on the - /// compute node, but waitForSuccess is set and the start task has not - /// yet completed. - /// starttaskfailed - The start task has failed on the compute node - /// (and exhausted all retries), and waitForSuccess is set. The node is - /// not usable for running tasks. - /// unknown - The Batch service has lost contact with the node, and - /// does not know its true state. - /// leavingpool - The node is leaving the pool, either because the user - /// explicitly removed it or because the pool is resizing or - /// autoscaling down. - /// offline - The node is not currently running a task, and scheduling - /// of new tasks to the node is disabled. - /// preempted - The low-priority node has been preempted. Tasks which - /// were running on the node when it was pre-empted will be rescheduled - /// when another node becomes available. Possible values include: - /// 'idle', 'rebooting', 'reimaging', 'running', 'unusable', - /// 'creating', 'starting', 'waitingForStartTask', 'startTaskFailed', - /// 'unknown', 'leavingPool', 'offline', 'preempted' + /// The low-priority node has been preempted. Tasks which were running + /// on the node when it was pre-empted will be rescheduled when another + /// node becomes available. Possible values include: 'idle', + /// 'rebooting', 'reimaging', 'running', 'unusable', 'creating', + /// 'starting', 'waitingForStartTask', 'startTaskFailed', 'unknown', + /// 'leavingPool', 'offline', 'preempted' /// [JsonProperty(PropertyName = "state")] public ComputeNodeState? State { get; set; } @@ -167,13 +140,7 @@ public ComputeNode() /// scheduling. /// /// - /// Values are: - /// - /// enabled - Tasks can be scheduled on the node. - /// disabled - No new tasks will be scheduled on the node. Tasks - /// already running on the node may still run to completion. All nodes - /// start with scheduling enabled. Possible values include: 'enabled', - /// 'disabled' + /// Possible values include: 'enabled', 'disabled' /// [JsonProperty(PropertyName = "schedulingState")] public SchedulingState? SchedulingState { get; set; } @@ -251,16 +218,16 @@ public ComputeNode() /// /// Gets or sets the total number of job tasks completed on the compute - /// node. This includes Job Preparation, Job Release and Job Manager - /// tasks, but not the pool start task. + /// node. This includes Job Manager tasks and normal tasks, but not Job + /// Preparation, Job Release or Start tasks. /// [JsonProperty(PropertyName = "totalTasksRun")] public int? TotalTasksRun { get; set; } /// /// Gets or sets the total number of currently running job tasks on the - /// compute node. This includes Job Preparation, Job Release, and Job - /// Manager tasks, but not the pool start task. + /// compute node. This includes Job Manager tasks and normal tasks, but + /// not Job Preparation, Job Release or Start tasks. /// [JsonProperty(PropertyName = "runningTasksCount")] public int? RunningTasksCount { get; set; } @@ -268,8 +235,8 @@ public ComputeNode() /// /// Gets or sets the total number of job tasks which completed /// successfully (with exitCode 0) on the compute node. This includes - /// Job Preparation, Job Release, and Job Manager tasks, but not the - /// pool start task. + /// Job Manager tasks and normal tasks, but not Job Preparation, Job + /// Release or Start tasks. /// [JsonProperty(PropertyName = "totalTasksSucceeded")] public int? TotalTasksSucceeded { get; set; } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeDeallocationOption.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeDeallocationOption.cs index 4454170fa09bf..77afa4647b9e6 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeDeallocationOption.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeDeallocationOption.cs @@ -21,13 +21,32 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum ComputeNodeDeallocationOption { + /// + /// Terminate running task processes and requeue the tasks. The tasks + /// will run again when a node is available. Remove nodes as soon as + /// tasks have been terminated. + /// [EnumMember(Value = "requeue")] Requeue, + /// + /// Terminate running tasks. The tasks will be completed with + /// failureInfo indicating that they were terminated, and will not run + /// again. Remove nodes as soon as tasks have been terminated. + /// [EnumMember(Value = "terminate")] Terminate, - [EnumMember(Value = "taskCompletion")] + /// + /// Allow currently running tasks to complete. Schedule no new tasks + /// while waiting. Remove nodes when all tasks have completed. + /// + [EnumMember(Value = "taskcompletion")] TaskCompletion, - [EnumMember(Value = "retainedData")] + /// + /// Allow currently running tasks to complete, then wait for all task + /// data retention periods to expire. Schedule no new tasks while + /// waiting. Remove nodes when all task retention periods have expired. + /// + [EnumMember(Value = "retaineddata")] RetainedData } internal static class ComputeNodeDeallocationOptionEnumExtension @@ -46,9 +65,9 @@ internal static string ToSerializedValue(this ComputeNodeDeallocationOption valu case ComputeNodeDeallocationOption.Terminate: return "terminate"; case ComputeNodeDeallocationOption.TaskCompletion: - return "taskCompletion"; + return "taskcompletion"; case ComputeNodeDeallocationOption.RetainedData: - return "retainedData"; + return "retaineddata"; } return null; } @@ -61,9 +80,9 @@ internal static string ToSerializedValue(this ComputeNodeDeallocationOption valu return ComputeNodeDeallocationOption.Requeue; case "terminate": return ComputeNodeDeallocationOption.Terminate; - case "taskCompletion": + case "taskcompletion": return ComputeNodeDeallocationOption.TaskCompletion; - case "retainedData": + case "retaineddata": return ComputeNodeDeallocationOption.RetainedData; } return null; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeFillType.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeFillType.cs index 879eceb495698..ca1fc3c700836 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeFillType.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeFillType.cs @@ -21,8 +21,16 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum ComputeNodeFillType { + /// + /// Tasks should be assigned evenly across all nodes in the pool. + /// [EnumMember(Value = "spread")] Spread, + /// + /// As many tasks as possible (maxTasksPerNode) should be assigned to + /// each node in the pool before any tasks are assigned to the next + /// node in the pool. + /// [EnumMember(Value = "pack")] Pack } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeRebootOption.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeRebootOption.cs index d38c7672b11f4..894b0d028da9f 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeRebootOption.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeRebootOption.cs @@ -21,13 +21,33 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum ComputeNodeRebootOption { + /// + /// 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. + /// [EnumMember(Value = "requeue")] Requeue, + /// + /// Terminate running tasks. The tasks will be completed with + /// failureInfo indicating that they were terminated, and will not run + /// again. Restart the node as soon as tasks have been terminated. + /// [EnumMember(Value = "terminate")] Terminate, - [EnumMember(Value = "taskCompletion")] + /// + /// Allow currently running tasks to complete. Schedule no new tasks + /// while waiting. Restart the node when all tasks have completed. + /// + [EnumMember(Value = "taskcompletion")] TaskCompletion, - [EnumMember(Value = "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. + /// + [EnumMember(Value = "retaineddata")] RetainedData } internal static class ComputeNodeRebootOptionEnumExtension @@ -46,9 +66,9 @@ internal static string ToSerializedValue(this ComputeNodeRebootOption value) case ComputeNodeRebootOption.Terminate: return "terminate"; case ComputeNodeRebootOption.TaskCompletion: - return "taskCompletion"; + return "taskcompletion"; case ComputeNodeRebootOption.RetainedData: - return "retainedData"; + return "retaineddata"; } return null; } @@ -61,9 +81,9 @@ internal static string ToSerializedValue(this ComputeNodeRebootOption value) return ComputeNodeRebootOption.Requeue; case "terminate": return ComputeNodeRebootOption.Terminate; - case "taskCompletion": + case "taskcompletion": return ComputeNodeRebootOption.TaskCompletion; - case "retainedData": + case "retaineddata": return ComputeNodeRebootOption.RetainedData; } return null; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeReimageOption.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeReimageOption.cs index 34b73bc561ad8..930e8505a91a9 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeReimageOption.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeReimageOption.cs @@ -21,13 +21,33 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum ComputeNodeReimageOption { + /// + /// 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. + /// [EnumMember(Value = "requeue")] Requeue, + /// + /// Terminate running tasks. The tasks will be completed with + /// failureInfo indicating that they were terminated, and will not run + /// again. Reimage the node as soon as tasks have been terminated. + /// [EnumMember(Value = "terminate")] Terminate, - [EnumMember(Value = "taskCompletion")] + /// + /// Allow currently running tasks to complete. Schedule no new tasks + /// while waiting. Reimage the node when all tasks have completed. + /// + [EnumMember(Value = "taskcompletion")] TaskCompletion, - [EnumMember(Value = "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. + /// + [EnumMember(Value = "retaineddata")] RetainedData } internal static class ComputeNodeReimageOptionEnumExtension @@ -46,9 +66,9 @@ internal static string ToSerializedValue(this ComputeNodeReimageOption value) case ComputeNodeReimageOption.Terminate: return "terminate"; case ComputeNodeReimageOption.TaskCompletion: - return "taskCompletion"; + return "taskcompletion"; case ComputeNodeReimageOption.RetainedData: - return "retainedData"; + return "retaineddata"; } return null; } @@ -61,9 +81,9 @@ internal static string ToSerializedValue(this ComputeNodeReimageOption value) return ComputeNodeReimageOption.Requeue; case "terminate": return ComputeNodeReimageOption.Terminate; - case "taskCompletion": + case "taskcompletion": return ComputeNodeReimageOption.TaskCompletion; - case "retainedData": + case "retaineddata": return ComputeNodeReimageOption.RetainedData; } return null; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeState.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeState.cs index 128ac698a2372..7d1b9e7b47b4e 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeState.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ComputeNodeState.cs @@ -21,30 +21,78 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum ComputeNodeState { + /// + /// The node is not currently running a task. + /// [EnumMember(Value = "idle")] Idle, + /// + /// The node is rebooting. + /// [EnumMember(Value = "rebooting")] Rebooting, + /// + /// The node is reimaging. + /// [EnumMember(Value = "reimaging")] Reimaging, + /// + /// The node is running one or more tasks (other than a start task). + /// [EnumMember(Value = "running")] Running, + /// + /// The node cannot be used for task execution due to errors. + /// [EnumMember(Value = "unusable")] Unusable, + /// + /// The Batch service has obtained the underlying virtual machine from + /// Azure Compute, but it has not yet started to join the pool. + /// [EnumMember(Value = "creating")] Creating, + /// + /// The Batch service is starting on the underlying virtual machine. + /// [EnumMember(Value = "starting")] Starting, + /// + /// The start task has started running on the compute node, but + /// waitForSuccess is set and the start task has not yet completed. + /// [EnumMember(Value = "waitingForStartTask")] WaitingForStartTask, - [EnumMember(Value = "startTaskFailed")] + /// + /// The start task has failed on the compute node (and exhausted all + /// retries), and waitForSuccess is set. The node is not usable for + /// running tasks. + /// + [EnumMember(Value = "starttaskfailed")] StartTaskFailed, + /// + /// The Batch service has lost contact with the node, and does not know + /// its true state. + /// [EnumMember(Value = "unknown")] Unknown, - [EnumMember(Value = "leavingPool")] + /// + /// The node is leaving the pool, either because the user explicitly + /// removed it or because the pool is resizing or autoscaling down. + /// + [EnumMember(Value = "leavingpool")] LeavingPool, + /// + /// The node is not currently running a task, and scheduling of new + /// tasks to the node is disabled. + /// [EnumMember(Value = "offline")] Offline, + /// + /// The low-priority node has been preempted. Tasks which were running + /// on the node when it was pre-empted will be rescheduled when another + /// node becomes available. + /// [EnumMember(Value = "preempted")] Preempted } @@ -76,11 +124,11 @@ internal static string ToSerializedValue(this ComputeNodeState value) case ComputeNodeState.WaitingForStartTask: return "waitingForStartTask"; case ComputeNodeState.StartTaskFailed: - return "startTaskFailed"; + return "starttaskfailed"; case ComputeNodeState.Unknown: return "unknown"; case ComputeNodeState.LeavingPool: - return "leavingPool"; + return "leavingpool"; case ComputeNodeState.Offline: return "offline"; case ComputeNodeState.Preempted: @@ -109,11 +157,11 @@ internal static string ToSerializedValue(this ComputeNodeState value) return ComputeNodeState.Starting; case "waitingForStartTask": return ComputeNodeState.WaitingForStartTask; - case "startTaskFailed": + case "starttaskfailed": return ComputeNodeState.StartTaskFailed; case "unknown": return ComputeNodeState.Unknown; - case "leavingPool": + case "leavingpool": return ComputeNodeState.LeavingPool; case "offline": return ComputeNodeState.Offline; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ContainerConfiguration.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ContainerConfiguration.cs index bf52ff3883980..8af71b5116c11 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ContainerConfiguration.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ContainerConfiguration.cs @@ -77,9 +77,6 @@ static ContainerConfiguration() public IList ContainerRegistries { get; set; } /// - /// Values are: - /// - /// docker - Docker will be used to launch the containers. /// [JsonProperty(PropertyName = "type")] public static string Type { get; private set; } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/DataDisk.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/DataDisk.cs index 25067d3950614..3847756757655 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/DataDisk.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/DataDisk.cs @@ -65,12 +65,6 @@ public DataDisk() /// Gets or sets the type of caching to be enabled for the data disks. /// /// - /// Values are: - /// - /// none - The caching mode for the disk is not enabled. - /// readOnly - The caching mode for the disk is read only. - /// readWrite - The caching mode for the disk is read and write. - /// /// The default value for caching is none. For information about the /// caching options see: /// https://blogs.msdn.microsoft.com/windowsazurestorage/2012/06/27/exploring-windows-azure-drives-disks-and-images/. @@ -89,12 +83,8 @@ public DataDisk() /// Gets or sets the storage account type to be used for the data disk. /// /// - /// If omitted, the default is "Standard_LRS". Values are: - /// - /// Standard_LRS - The data disk should use standard locally redundant - /// storage. - /// Premium_LRS - The data disk should use premium locally redundant - /// storage. Possible values include: 'Standard_LRS', 'Premium_LRS' + /// If omitted, the default is "standard_lrs". Possible values include: + /// 'StandardLRS', 'PremiumLRS' /// [JsonProperty(PropertyName = "storageAccountType")] public StorageAccountType? StorageAccountType { get; set; } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/DependencyAction.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/DependencyAction.cs index 7cf2f6d787ea3..0f54828c7d0af 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/DependencyAction.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/DependencyAction.cs @@ -21,8 +21,14 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum DependencyAction { + /// + /// Satisfy the task's dependencies. + /// [EnumMember(Value = "satisfy")] Satisfy, + /// + /// Block the task's dependencies. + /// [EnumMember(Value = "block")] Block } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/DisableComputeNodeSchedulingOption.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/DisableComputeNodeSchedulingOption.cs index eb9e1cba4f72d..0b022d7f1dad7 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/DisableComputeNodeSchedulingOption.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/DisableComputeNodeSchedulingOption.cs @@ -21,11 +21,26 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum DisableComputeNodeSchedulingOption { + /// + /// 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. + /// [EnumMember(Value = "requeue")] Requeue, + /// + /// Terminate running tasks. The tasks will be completed with + /// failureInfo indicating that they were terminated, and will not run + /// again. Enter offline state as soon as tasks have been terminated. + /// [EnumMember(Value = "terminate")] Terminate, - [EnumMember(Value = "taskCompletion")] + /// + /// Allow currently running tasks to complete. Schedule no new tasks + /// while waiting. Enter offline state when all tasks have completed. + /// + [EnumMember(Value = "taskcompletion")] TaskCompletion } internal static class DisableComputeNodeSchedulingOptionEnumExtension @@ -44,7 +59,7 @@ internal static string ToSerializedValue(this DisableComputeNodeSchedulingOption case DisableComputeNodeSchedulingOption.Terminate: return "terminate"; case DisableComputeNodeSchedulingOption.TaskCompletion: - return "taskCompletion"; + return "taskcompletion"; } return null; } @@ -57,7 +72,7 @@ internal static string ToSerializedValue(this DisableComputeNodeSchedulingOption return DisableComputeNodeSchedulingOption.Requeue; case "terminate": return DisableComputeNodeSchedulingOption.Terminate; - case "taskCompletion": + case "taskcompletion": return DisableComputeNodeSchedulingOption.TaskCompletion; } return null; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/DisableJobOption.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/DisableJobOption.cs index d874b7043f614..c135f263eac1e 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/DisableJobOption.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/DisableJobOption.cs @@ -21,10 +21,22 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum DisableJobOption { + /// + /// Terminate running tasks and requeue them. The tasks will run again + /// when the job is enabled. + /// [EnumMember(Value = "requeue")] Requeue, + /// + /// Terminate running tasks. The tasks will be completed with + /// failureInfo indicating that they were terminated, and will not run + /// again. + /// [EnumMember(Value = "terminate")] Terminate, + /// + /// Allow currently running tasks to complete. + /// [EnumMember(Value = "wait")] Wait } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ElevationLevel.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ElevationLevel.cs index 0edd7d3b86df5..c3df28a582db3 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ElevationLevel.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ElevationLevel.cs @@ -21,8 +21,15 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum ElevationLevel { - [EnumMember(Value = "nonAdmin")] + /// + /// The user is a standard user without elevated access. + /// + [EnumMember(Value = "nonadmin")] NonAdmin, + /// + /// The user is a user with elevated access and operates with full + /// Administrator permissions. + /// [EnumMember(Value = "admin")] Admin } @@ -38,7 +45,7 @@ internal static string ToSerializedValue(this ElevationLevel value) switch( value ) { case ElevationLevel.NonAdmin: - return "nonAdmin"; + return "nonadmin"; case ElevationLevel.Admin: return "admin"; } @@ -49,7 +56,7 @@ internal static string ToSerializedValue(this ElevationLevel value) { switch( value ) { - case "nonAdmin": + case "nonadmin": return ElevationLevel.NonAdmin; case "admin": return ElevationLevel.Admin; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ErrorCategory.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ErrorCategory.cs index ea3db271d8f2f..6c0a64ce5bb7c 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ErrorCategory.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ErrorCategory.cs @@ -21,9 +21,15 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum ErrorCategory { - [EnumMember(Value = "userError")] + /// + /// The error is due to a user issue, such as misconfiguration. + /// + [EnumMember(Value = "usererror")] UserError, - [EnumMember(Value = "serverError")] + /// + /// The error is due to an internal server issue. + /// + [EnumMember(Value = "servererror")] ServerError } internal static class ErrorCategoryEnumExtension @@ -38,9 +44,9 @@ internal static string ToSerializedValue(this ErrorCategory value) switch( value ) { case ErrorCategory.UserError: - return "userError"; + return "usererror"; case ErrorCategory.ServerError: - return "serverError"; + return "servererror"; } return null; } @@ -49,9 +55,9 @@ internal static string ToSerializedValue(this ErrorCategory value) { switch( value ) { - case "userError": + case "usererror": return ErrorCategory.UserError; - case "serverError": + case "servererror": return ErrorCategory.ServerError; } return null; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ExitOptions.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ExitOptions.cs index 5351175af4bfa..44eae07a7a099 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ExitOptions.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/ExitOptions.cs @@ -54,20 +54,12 @@ public ExitOptions() /// onTaskFailed property is 'performExitOptionsJobAction'. /// /// - /// Values are: - /// - /// none - Take no action. - /// disable - Disable the job. This is equivalent to calling the - /// disable job API, with a disableTasks value of requeue. - /// terminate - Terminate the job. The terminateReason in the job's - /// executionInfo is set to "TaskFailed". The default is none for exit - /// code 0 and terminate for all other exit conditions. - /// - /// If the job's onTaskFailed property is noAction, then specifying - /// this property returns an error and the add task request fails with - /// an invalid property value error; if you are calling the REST API - /// directly, the HTTP status code is 400 (Bad Request). Possible - /// values include: 'none', 'disable', 'terminate' + /// The default is none for exit code 0 and terminate for all other + /// exit conditions. If the job's onTaskFailed property is noAction, + /// then specifying this property returns an error and the add task + /// request fails with an invalid property value error; if you are + /// calling the REST API directly, the HTTP status code is 400 (Bad + /// Request). Possible values include: 'none', 'disable', 'terminate' /// [JsonProperty(PropertyName = "jobAction")] public JobAction? JobAction { get; set; } @@ -77,15 +69,10 @@ public ExitOptions() /// that depend on this task. /// /// - /// Values are: - /// - /// satisfy - Satisfy the task's dependencies. - /// block - Block the task's dependencies. - /// /// The default is 'satisfy' for exit code 0, and 'block' for all other /// exit conditions. If the job's usesTaskDependencies property is set /// to false, then specifying the dependencyAction property returns an - /// erro and the add task request fails with an invalid property value + /// error and the add task request fails with an invalid property value /// error; if you are calling the REST API directly, the HTTP status /// code is 400 (Bad Request). Possible values include: 'satisfy', /// 'block' diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/InboundEndpointProtocol.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/InboundEndpointProtocol.cs index 10d8cc33dd2d2..ef351ce6af26c 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/InboundEndpointProtocol.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/InboundEndpointProtocol.cs @@ -21,8 +21,14 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum InboundEndpointProtocol { + /// + /// Use TCP for the endpoint. + /// [EnumMember(Value = "tcp")] Tcp, + /// + /// Use UDP for the endpoint. + /// [EnumMember(Value = "udp")] Udp } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/InboundNatPool.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/InboundNatPool.cs index c51f0a72adb7c..196ac95db4057 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/InboundNatPool.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/InboundNatPool.cs @@ -103,8 +103,9 @@ public InboundNATPool() /// /// Acceptable values range between 1 and 65534 except ports from 50000 /// to 55000 which are reserved. All ranges within a pool must be - /// distinct and cannot overlap. If any reserved or overlapping values - /// are provided the request fails with HTTP status code 400. + /// distinct and cannot overlap. Each range must contain at least 40 + /// ports. If any reserved or overlapping values are provided the + /// request fails with HTTP status code 400. /// [JsonProperty(PropertyName = "frontendPortRangeStart")] public int FrontendPortRangeStart { get; set; } @@ -117,9 +118,9 @@ public InboundNATPool() /// /// Acceptable values range between 1 and 65534 except ports from 50000 /// to 55000 which are reserved by the Batch service. All ranges within - /// a pool must be distinct and cannot overlap. If any reserved or - /// overlapping values are provided the request fails with HTTP status - /// code 400. + /// a pool must be distinct and cannot overlap. Each range must contain + /// at least 40 ports. If any reserved or overlapping values are + /// provided the request fails with HTTP status code 400. /// [JsonProperty(PropertyName = "frontendPortRangeEnd")] public int FrontendPortRangeEnd { get; set; } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobAction.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobAction.cs index 4915cbe254aea..c75cceada9d17 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobAction.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobAction.cs @@ -21,10 +21,21 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum JobAction { + /// + /// Take no action. + /// [EnumMember(Value = "none")] None, + /// + /// Disable the job. This is equivalent to calling the disable job API, + /// with a disableTasks value of requeue. + /// [EnumMember(Value = "disable")] Disable, + /// + /// Terminate the job. The terminateReason in the job's executionInfo + /// is set to "TaskFailed". + /// [EnumMember(Value = "terminate")] Terminate } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobAddParameter.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobAddParameter.cs index ed1489bed49b0..b2aab1a178af1 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobAddParameter.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobAddParameter.cs @@ -60,7 +60,6 @@ public JobAddParameter() /// define dependencies on each other. The default is false. public JobAddParameter(string id, PoolInformation poolInfo, string displayName = default(string), int? priority = default(int?), JobConstraints constraints = default(JobConstraints), JobManagerTask jobManagerTask = default(JobManagerTask), JobPreparationTask jobPreparationTask = default(JobPreparationTask), JobReleaseTask jobReleaseTask = default(JobReleaseTask), IList commonEnvironmentSettings = default(IList), OnAllTasksComplete? onAllTasksComplete = default(OnAllTasksComplete?), OnTaskFailure? onTaskFailure = default(OnTaskFailure?), IList metadata = default(IList), bool? usesTaskDependencies = default(bool?)) { - PoolInfo = new PoolInformation(); Id = id; DisplayName = displayName; Priority = priority; @@ -200,12 +199,8 @@ public JobAddParameter() /// Manager task; if you want to use automatic job termination without /// a Job Manager, you should initially set onAllTasksComplete to /// noAction and update the job properties to set onAllTasksComplete to - /// terminateJob once you have finished adding tasks. Permitted values - /// are: noAction - do nothing. The job remains active unless - /// terminated or disabled by some other means. terminateJob - - /// terminate the job. The job's terminateReason is set to - /// 'AllTasksComplete'. The default is noAction. Possible values - /// include: 'noAction', 'terminateJob' + /// terminateJob once you have finished adding tasks. The default is + /// noAction. Possible values include: 'noAction', 'terminateJob' /// [JsonProperty(PropertyName = "onAllTasksComplete")] public OnAllTasksComplete? OnAllTasksComplete { get; set; } @@ -218,12 +213,8 @@ public JobAddParameter() /// A task is considered to have failed if has a failureInfo. A /// failureInfo is set if the task completes with a non-zero exit code /// after exhausting its retry count, or if there was an error starting - /// the task, for example due to a resource file download error. - /// noAction - do nothing. performExitOptionsJobAction - take the - /// action associated with the task exit condition in the task's - /// exitConditions collection. (This may still result in no action - /// being taken, if that is what the task specifies.) The default is - /// noAction. Possible values include: 'noAction', + /// the task, for example due to a resource file download error. The + /// default is noAction. Possible values include: 'noAction', /// 'performExitOptionsJobAction' /// [JsonProperty(PropertyName = "onTaskFailure")] diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobDisableParameter.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobDisableParameter.cs index 9c0be746ac2e5..afd529969dce6 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobDisableParameter.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobDisableParameter.cs @@ -46,13 +46,7 @@ public JobDisableParameter(DisableJobOption disableTasks) /// Gets or sets what to do with active tasks associated with the job. /// /// - /// Values are: - /// - /// requeue - Terminate running tasks and requeue them. The tasks will - /// run again when the job is enabled. - /// terminate - Terminate running tasks. The tasks will not run again. - /// wait - Allow currently running tasks to complete. Possible values - /// include: 'requeue', 'terminate', 'wait' + /// Possible values include: 'requeue', 'terminate', 'wait' /// [JsonProperty(PropertyName = "disableTasks")] public DisableJobOption DisableTasks { get; set; } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobPreparationTaskExecutionInformation.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobPreparationTaskExecutionInformation.cs index 1eeaf45c98b89..a37e1fe8f0525 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobPreparationTaskExecutionInformation.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobPreparationTaskExecutionInformation.cs @@ -103,13 +103,7 @@ public JobPreparationTaskExecutionInformation() /// compute node. /// /// - /// Values are: - /// - /// running - the task is currently running (including retrying). - /// completed - the task has exited with exit code 0, or the task has - /// exhausted its retry limit, or the Batch service was unable to start - /// the task due to task preparation errors (such as resource file - /// download failures). Possible values include: 'running', 'completed' + /// Possible values include: 'running', 'completed' /// [JsonProperty(PropertyName = "state")] public JobPreparationTaskState State { get; set; } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobPreparationTaskState.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobPreparationTaskState.cs index 7b8f651ee194e..36411697d574e 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobPreparationTaskState.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobPreparationTaskState.cs @@ -21,8 +21,17 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum JobPreparationTaskState { + /// + /// The task is currently running (including retrying). + /// [EnumMember(Value = "running")] Running, + /// + /// The task has exited with exit code 0, or the task has exhausted its + /// retry limit, or the Batch service was unable to start the task due + /// to task preparation errors (such as resource file download + /// failures). + /// [EnumMember(Value = "completed")] Completed } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobReleaseTaskExecutionInformation.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobReleaseTaskExecutionInformation.cs index a186196114a2c..d83f6442db517 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobReleaseTaskExecutionInformation.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobReleaseTaskExecutionInformation.cs @@ -93,13 +93,7 @@ public JobReleaseTaskExecutionInformation() /// compute node. /// /// - /// Values are: - /// - /// running - the task is currently running (including retrying). - /// completed - the task has exited, or the Batch service was unable to - /// start the task due to task preparation errors (such as resource - /// file download failures). Possible values include: 'running', - /// 'completed' + /// Possible values include: 'running', 'completed' /// [JsonProperty(PropertyName = "state")] public JobReleaseTaskState State { get; set; } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobReleaseTaskState.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobReleaseTaskState.cs index 866b81993e73b..c7466e921311c 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobReleaseTaskState.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobReleaseTaskState.cs @@ -21,8 +21,17 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum JobReleaseTaskState { + /// + /// The task is currently running (including retrying). + /// [EnumMember(Value = "running")] Running, + /// + /// The task has exited with exit code 0, or the task has exhausted its + /// retry limit, or the Batch service was unable to start the task due + /// to task preparation errors (such as resource file download + /// failures). + /// [EnumMember(Value = "completed")] Completed } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobScheduleAddParameter.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobScheduleAddParameter.cs index 2396c52650f54..0938f3b1a1635 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobScheduleAddParameter.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobScheduleAddParameter.cs @@ -46,7 +46,6 @@ public JobScheduleAddParameter() /// the schedule as metadata. public JobScheduleAddParameter(string id, Schedule schedule, JobSpecification jobSpecification, string displayName = default(string), IList metadata = default(IList)) { - JobSpecification = new JobSpecification(); Id = id; DisplayName = displayName; Schedule = schedule; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobScheduleState.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobScheduleState.cs index 2f990cde6fc13..99abcdc351250 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobScheduleState.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobScheduleState.cs @@ -21,14 +21,41 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum JobScheduleState { + /// + /// The job schedule is active and will create jobs as per its + /// schedule. + /// [EnumMember(Value = "active")] Active, + /// + /// The schedule has terminated, either by reaching its end time or by + /// the user terminating it explicitly. + /// [EnumMember(Value = "completed")] Completed, + /// + /// The user has disabled the schedule. The scheduler will not initiate + /// any new jobs will on this schedule, but any existing active job + /// will continue to run. + /// [EnumMember(Value = "disabled")] Disabled, + /// + /// The schedule has no more work to do, or has been explicitly + /// terminated by the user, but the termination operation is still in + /// progress. The scheduler will not initiate any new jobs for this + /// schedule, nor is any existing job active. + /// [EnumMember(Value = "terminating")] Terminating, + /// + /// The user has requested that the schedule be deleted, but the delete + /// operation is still in progress. The scheduler will not initiate any + /// new jobs for this schedule, and will delete any existing jobs and + /// tasks under the schedule, including any active job. The schedule + /// will be deleted when all jobs and tasks under the schedule have + /// been deleted. + /// [EnumMember(Value = "deleting")] Deleting } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobScheduleUpdateParameter.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobScheduleUpdateParameter.cs index 3d2a205359384..19f461563af54 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobScheduleUpdateParameter.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobScheduleUpdateParameter.cs @@ -41,7 +41,6 @@ public JobScheduleUpdateParameter() /// the job schedule as metadata. public JobScheduleUpdateParameter(Schedule schedule, JobSpecification jobSpecification, IList metadata = default(IList)) { - JobSpecification = new JobSpecification(); Schedule = schedule; JobSpecification = jobSpecification; Metadata = metadata; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobSpecification.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobSpecification.cs index e90bb0f7a2d86..93d060d0d0c8e 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobSpecification.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobSpecification.cs @@ -67,7 +67,6 @@ public JobSpecification() /// each job created under this schedule as metadata. public JobSpecification(PoolInformation poolInfo, int? priority = default(int?), string displayName = default(string), bool? usesTaskDependencies = default(bool?), OnAllTasksComplete? onAllTasksComplete = default(OnAllTasksComplete?), OnTaskFailure? onTaskFailure = default(OnTaskFailure?), JobConstraints constraints = default(JobConstraints), JobManagerTask jobManagerTask = default(JobManagerTask), JobPreparationTask jobPreparationTask = default(JobPreparationTask), JobReleaseTask jobReleaseTask = default(JobReleaseTask), IList commonEnvironmentSettings = default(IList), IList metadata = default(IList)) { - PoolInfo = new PoolInformation(); Priority = priority; DisplayName = displayName; UsesTaskDependencies = usesTaskDependencies; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobState.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobState.cs index 48c0b62e20b6d..3474b84c24ba4 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobState.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobState.cs @@ -21,18 +21,49 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum JobState { + /// + /// The job is available to have tasks scheduled. + /// [EnumMember(Value = "active")] Active, + /// + /// A user has requested that the job be disabled, but the disable + /// operation is still in progress (for example, waiting for tasks to + /// terminate). + /// [EnumMember(Value = "disabling")] Disabling, + /// + /// A user has disabled the job. No tasks are running, and no new tasks + /// will be scheduled. + /// [EnumMember(Value = "disabled")] Disabled, + /// + /// A user has requested that the job be enabled, but the enable + /// operation is still in progress. + /// [EnumMember(Value = "enabling")] Enabling, + /// + /// The job is about to complete, either because a Job Manager task has + /// completed or because the user has terminated the job, but the + /// terminate operation is still in progress (for example, because Job + /// Release tasks are running). + /// [EnumMember(Value = "terminating")] Terminating, + /// + /// All tasks have terminated, and the system will not accept any more + /// tasks or any further changes to the job. + /// [EnumMember(Value = "completed")] Completed, + /// + /// A user has requested that the job be deleted, but the delete + /// operation is still in progress (for example, because the system is + /// still terminating running tasks). + /// [EnumMember(Value = "deleting")] Deleting } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobUpdateParameter.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobUpdateParameter.cs index 4aba4e23c3b4f..f45b3306fc027 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobUpdateParameter.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/JobUpdateParameter.cs @@ -45,7 +45,6 @@ public JobUpdateParameter() /// state. public JobUpdateParameter(PoolInformation poolInfo, int? priority = default(int?), JobConstraints constraints = default(JobConstraints), IList metadata = default(IList), OnAllTasksComplete? onAllTasksComplete = default(OnAllTasksComplete?)) { - PoolInfo = new PoolInformation(); Priority = priority; Constraints = constraints; PoolInfo = poolInfo; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/NetworkSecurityGroupRuleAccess.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/NetworkSecurityGroupRuleAccess.cs index 6767205b3db50..35db49ae33139 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/NetworkSecurityGroupRuleAccess.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/NetworkSecurityGroupRuleAccess.cs @@ -21,8 +21,14 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum NetworkSecurityGroupRuleAccess { + /// + /// Allow access. + /// [EnumMember(Value = "allow")] Allow, + /// + /// Deny access. + /// [EnumMember(Value = "deny")] Deny } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/NodeDisableSchedulingParameter.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/NodeDisableSchedulingParameter.cs index 3c1500c9aaa9a..a08d24cca557c 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/NodeDisableSchedulingParameter.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/NodeDisableSchedulingParameter.cs @@ -50,18 +50,6 @@ public NodeDisableSchedulingParameter() /// 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' /// diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/NodeRebootParameter.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/NodeRebootParameter.cs index 5fe82881972ab..e28c381446d11 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/NodeRebootParameter.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/NodeRebootParameter.cs @@ -47,21 +47,6 @@ public NodeRebootParameter() /// 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', /// 'terminate', 'taskCompletion', 'retainedData' /// diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/NodeReimageParameter.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/NodeReimageParameter.cs index f9bfa0e033e69..ad51693b37f38 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/NodeReimageParameter.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/NodeReimageParameter.cs @@ -47,21 +47,6 @@ public NodeReimageParameter() /// 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', /// 'terminate', 'taskCompletion', 'retainedData' /// diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OSDisk.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OSDisk.cs index 6c540579079b9..7f9b7f52d46a9 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OSDisk.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OSDisk.cs @@ -46,12 +46,6 @@ public OSDisk() /// Gets or sets the type of caching to enable for the OS disk. /// /// - /// Values are: - /// - /// none - The caching mode for the disk is not enabled. - /// readOnly - The caching mode for the disk is read only. - /// readWrite - The caching mode for the disk is read and write. - /// /// The default value for caching is none. For information about the /// caching options see: /// https://blogs.msdn.microsoft.com/windowsazurestorage/2012/06/27/exploring-windows-azure-drives-disks-and-images/. diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OSType.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OSType.cs index 523ef555376b7..c6f39e846aab3 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OSType.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OSType.cs @@ -21,8 +21,14 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum OSType { + /// + /// The Linux operating system. + /// [EnumMember(Value = "linux")] Linux, + /// + /// The Windows operating system. + /// [EnumMember(Value = "windows")] Windows } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OnAllTasksComplete.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OnAllTasksComplete.cs index dd57beffa41b6..9a8b0341c27f2 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OnAllTasksComplete.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OnAllTasksComplete.cs @@ -21,9 +21,17 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum OnAllTasksComplete { - [EnumMember(Value = "noAction")] + /// + /// Do nothing. The job remains active unless terminated or disabled by + /// some other means. + /// + [EnumMember(Value = "noaction")] NoAction, - [EnumMember(Value = "terminateJob")] + /// + /// Terminate the job. The job's terminateReason is set to + /// 'AllTasksComplete'. + /// + [EnumMember(Value = "terminatejob")] TerminateJob } internal static class OnAllTasksCompleteEnumExtension @@ -38,9 +46,9 @@ internal static string ToSerializedValue(this OnAllTasksComplete value) switch( value ) { case OnAllTasksComplete.NoAction: - return "noAction"; + return "noaction"; case OnAllTasksComplete.TerminateJob: - return "terminateJob"; + return "terminatejob"; } return null; } @@ -49,9 +57,9 @@ internal static string ToSerializedValue(this OnAllTasksComplete value) { switch( value ) { - case "noAction": + case "noaction": return OnAllTasksComplete.NoAction; - case "terminateJob": + case "terminatejob": return OnAllTasksComplete.TerminateJob; } return null; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OnTaskFailure.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OnTaskFailure.cs index feac8709cd2c9..d38aa5dd175e5 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OnTaskFailure.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OnTaskFailure.cs @@ -21,9 +21,18 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum OnTaskFailure { - [EnumMember(Value = "noAction")] + /// + /// Do nothing. The job remains active unless terminated or disabled by + /// some other means. + /// + [EnumMember(Value = "noaction")] NoAction, - [EnumMember(Value = "performExitOptionsJobAction")] + /// + /// Take the action associated with the task exit condition in the + /// task's exitConditions collection. (This may still result in no + /// action being taken, if that is what the task specifies.) + /// + [EnumMember(Value = "performexitoptionsjobaction")] PerformExitOptionsJobAction } internal static class OnTaskFailureEnumExtension @@ -38,9 +47,9 @@ internal static string ToSerializedValue(this OnTaskFailure value) switch( value ) { case OnTaskFailure.NoAction: - return "noAction"; + return "noaction"; case OnTaskFailure.PerformExitOptionsJobAction: - return "performExitOptionsJobAction"; + return "performexitoptionsjobaction"; } return null; } @@ -49,9 +58,9 @@ internal static string ToSerializedValue(this OnTaskFailure value) { switch( value ) { - case "noAction": + case "noaction": return OnTaskFailure.NoAction; - case "performExitOptionsJobAction": + case "performexitoptionsjobaction": return OnTaskFailure.PerformExitOptionsJobAction; } return null; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OutputFileUploadCondition.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OutputFileUploadCondition.cs index ac14d3422ba32..4aa401e13cdfb 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OutputFileUploadCondition.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/OutputFileUploadCondition.cs @@ -21,11 +21,23 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum OutputFileUploadCondition { - [EnumMember(Value = "taskSuccess")] + /// + /// Upload the file(s) only after the task process exits with an exit + /// code of 0. + /// + [EnumMember(Value = "tasksuccess")] TaskSuccess, - [EnumMember(Value = "taskFailure")] + /// + /// Upload the file(s) only after the task process exits with a nonzero + /// exit code. + /// + [EnumMember(Value = "taskfailure")] TaskFailure, - [EnumMember(Value = "taskCompletion")] + /// + /// Upload the file(s) after the task process exits, no matter what the + /// exit code was. + /// + [EnumMember(Value = "taskcompletion")] TaskCompletion } internal static class OutputFileUploadConditionEnumExtension @@ -40,11 +52,11 @@ internal static string ToSerializedValue(this OutputFileUploadCondition value) switch( value ) { case OutputFileUploadCondition.TaskSuccess: - return "taskSuccess"; + return "tasksuccess"; case OutputFileUploadCondition.TaskFailure: - return "taskFailure"; + return "taskfailure"; case OutputFileUploadCondition.TaskCompletion: - return "taskCompletion"; + return "taskcompletion"; } return null; } @@ -53,11 +65,11 @@ internal static string ToSerializedValue(this OutputFileUploadCondition value) { switch( value ) { - case "taskSuccess": + case "tasksuccess": return OutputFileUploadCondition.TaskSuccess; - case "taskFailure": + case "taskfailure": return OutputFileUploadCondition.TaskFailure; - case "taskCompletion": + case "taskcompletion": return OutputFileUploadCondition.TaskCompletion; } return null; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/PoolLifetimeOption.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/PoolLifetimeOption.cs index 44580bed42f2e..66eebc860f956 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/PoolLifetimeOption.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/PoolLifetimeOption.cs @@ -21,8 +21,21 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum PoolLifetimeOption { - [EnumMember(Value = "jobSchedule")] + /// + /// The pool exists for the lifetime of the job schedule. The Batch + /// Service creates the pool when it creates the first job on the + /// schedule. You may apply this option only to job schedules, not to + /// jobs. + /// + [EnumMember(Value = "jobschedule")] JobSchedule, + /// + /// The pool exists for the lifetime of the job to which it is + /// dedicated. The Batch service creates the pool when it creates the + /// job. If the 'job' option is applied to a job schedule, the Batch + /// service creates a new auto pool for every job created on the + /// schedule. + /// [EnumMember(Value = "job")] Job } @@ -38,7 +51,7 @@ internal static string ToSerializedValue(this PoolLifetimeOption value) switch( value ) { case PoolLifetimeOption.JobSchedule: - return "jobSchedule"; + return "jobschedule"; case PoolLifetimeOption.Job: return "job"; } @@ -49,7 +62,7 @@ internal static string ToSerializedValue(this PoolLifetimeOption value) { switch( value ) { - case "jobSchedule": + case "jobschedule": return PoolLifetimeOption.JobSchedule; case "job": return PoolLifetimeOption.Job; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/PoolState.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/PoolState.cs index c9ff44975a6ab..05a329841682d 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/PoolState.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/PoolState.cs @@ -21,10 +21,25 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum PoolState { + /// + /// The pool is available to run tasks subject to the availability of + /// compute nodes. + /// [EnumMember(Value = "active")] Active, + /// + /// The user has requested that the pool be deleted, but the delete + /// operation has not yet completed. + /// [EnumMember(Value = "deleting")] Deleting, + /// + /// The user has requested that the operating system of the pool's + /// nodes be upgraded, but the upgrade operation has not yet completed + /// (that is, some nodes in the pool have not yet been upgraded). While + /// upgrading, the pool may be able to run tasks (with reduced + /// capacity) but this is not guaranteed. + /// [EnumMember(Value = "upgrading")] Upgrading } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/SchedulingState.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/SchedulingState.cs index ef0b7e21e9e78..f05ca9d4b22f9 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/SchedulingState.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/SchedulingState.cs @@ -21,8 +21,16 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum SchedulingState { + /// + /// Tasks can be scheduled on the node. + /// [EnumMember(Value = "enabled")] Enabled, + /// + /// No new tasks will be scheduled on the node. Tasks already running + /// on the node may still run to completion. All nodes start with + /// scheduling enabled. + /// [EnumMember(Value = "disabled")] Disabled } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/StartTaskInformation.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/StartTaskInformation.cs index d7f0cf27a3229..20b8b16484deb 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/StartTaskInformation.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/StartTaskInformation.cs @@ -69,14 +69,7 @@ public StartTaskInformation() /// Gets or sets the state of the start task on the compute node. /// /// - /// Values are: - /// - /// running - The start task is currently running. - /// completed - The start task has exited with exit code 0, or the - /// start task has failed and the retry limit has reached, or the start - /// task process did not run due to task preparation errors (such as - /// resource file download failures). Possible values include: - /// 'running', 'completed' + /// Possible values include: 'running', 'completed' /// [JsonProperty(PropertyName = "state")] public StartTaskState State { get; set; } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/StartTaskState.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/StartTaskState.cs index c5f488211d619..192c15e0b224a 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/StartTaskState.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/StartTaskState.cs @@ -21,8 +21,17 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum StartTaskState { + /// + /// The start task is currently running. + /// [EnumMember(Value = "running")] Running, + /// + /// The start task has exited with exit code 0, or the start task has + /// failed and the retry limit has reached, or the start task process + /// did not run due to task preparation errors (such as resource file + /// download failures). + /// [EnumMember(Value = "completed")] Completed } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/StorageAccountType.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/StorageAccountType.cs index 092aa1f2c55bf..767b7f80ad9ac 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/StorageAccountType.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/StorageAccountType.cs @@ -21,9 +21,15 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum StorageAccountType { - [EnumMember(Value = "Standard_LRS")] + /// + /// The data disk should use standard locally redundant storage. + /// + [EnumMember(Value = "standard_lrs")] StandardLRS, - [EnumMember(Value = "Premium_LRS")] + /// + /// The data disk should use premium locally redundant storage. + /// + [EnumMember(Value = "premium_lrs")] PremiumLRS } internal static class StorageAccountTypeEnumExtension @@ -38,9 +44,9 @@ internal static string ToSerializedValue(this StorageAccountType value) switch( value ) { case StorageAccountType.StandardLRS: - return "Standard_LRS"; + return "standard_lrs"; case StorageAccountType.PremiumLRS: - return "Premium_LRS"; + return "premium_lrs"; } return null; } @@ -49,9 +55,9 @@ internal static string ToSerializedValue(this StorageAccountType value) { switch( value ) { - case "Standard_LRS": + case "standard_lrs": return StorageAccountType.StandardLRS; - case "Premium_LRS": + case "premium_lrs": return StorageAccountType.PremiumLRS; } return null; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/SubtaskState.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/SubtaskState.cs index d3e3f44420283..20cdf546ca4ab 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/SubtaskState.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/SubtaskState.cs @@ -21,10 +21,30 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum SubtaskState { + /// + /// The task has been assigned to a compute node, but is waiting for a + /// required Job Preparation task to complete on the node. If the Job + /// Preparation task succeeds, the task will move to running. If the + /// Job Preparation task fails, the task will return to active and will + /// be eligible to be assigned to a different node. + /// [EnumMember(Value = "preparing")] Preparing, + /// + /// The task is running on a compute node. This includes task-level + /// preparation such as downloading resource files or deploying + /// application packages specified on the task - it does not + /// necessarily mean that the task command line has started executing. + /// [EnumMember(Value = "running")] Running, + /// + /// The task is no longer eligible to run, usually because the task has + /// finished successfully, or the task has finished unsuccessfully and + /// has exhausted its retry limit. A task is also marked as completed + /// if an error occurred launching the task, or when the task has been + /// terminated. + /// [EnumMember(Value = "completed")] Completed } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskAddResult.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskAddResult.cs index 860ded680d9c3..6c73cdb54590a 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskAddResult.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskAddResult.cs @@ -62,14 +62,7 @@ public TaskAddResult() /// Gets or sets the status of the add task request. /// /// - /// Values are: - /// - /// success - Task was added successfully. - /// clienterror - Task failed to add due to a client error and should - /// not be retried without modifying the request as appropriate. - /// servererror - Task failed to add due to a server error and can be - /// retried without modification. Possible values include: 'success', - /// 'clientError', 'serverError' + /// Possible values include: 'success', 'clientError', 'serverError' /// [JsonProperty(PropertyName = "status")] public TaskAddStatus Status { get; set; } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskAddStatus.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskAddStatus.cs index c2f80910b6c1e..eaa8c79241f22 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskAddStatus.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskAddStatus.cs @@ -21,11 +21,22 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum TaskAddStatus { + /// + /// The task was added successfully. + /// [EnumMember(Value = "success")] Success, - [EnumMember(Value = "clientError")] + /// + /// The task failed to add due to a client error and should not be + /// retried without modifying the request as appropriate. + /// + [EnumMember(Value = "clienterror")] ClientError, - [EnumMember(Value = "serverError")] + /// + /// Task failed to add due to a server error and can be retried without + /// modification. + /// + [EnumMember(Value = "servererror")] ServerError } internal static class TaskAddStatusEnumExtension @@ -42,9 +53,9 @@ internal static string ToSerializedValue(this TaskAddStatus value) case TaskAddStatus.Success: return "success"; case TaskAddStatus.ClientError: - return "clientError"; + return "clienterror"; case TaskAddStatus.ServerError: - return "serverError"; + return "servererror"; } return null; } @@ -55,9 +66,9 @@ internal static string ToSerializedValue(this TaskAddStatus value) { case "success": return TaskAddStatus.Success; - case "clientError": + case "clienterror": return TaskAddStatus.ClientError; - case "serverError": + case "servererror": return TaskAddStatus.ServerError; } return null; diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskCountValidationStatus.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskCountValidationStatus.cs index d18479807123c..b4e94575c4e05 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskCountValidationStatus.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskCountValidationStatus.cs @@ -21,8 +21,18 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum TaskCountValidationStatus { + /// + /// The Batch service has validated the state counts against the task + /// states as reported in the List Tasks API. + /// [EnumMember(Value = "validated")] Validated, + /// + /// The Batch service has not been able to check state counts against + /// the task states as reported in the List Tasks API. The + /// validationStatus may be unvalidated if the job contains more than + /// 200,000 tasks. + /// [EnumMember(Value = "unvalidated")] Unvalidated } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskCounts.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskCounts.cs index 51682144ed4fb..58156e24ae4ac 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskCounts.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskCounts.cs @@ -95,11 +95,7 @@ public TaskCounts(int active, int running, int completed, int succeeded, int fai /// Gets or sets whether the task counts have been validated. /// /// - /// If the validationStatus is unvalidated, then the Batch service has - /// not been able to check state counts against the task states as - /// reported in the List Tasks API. The validationStatus may be - /// unvalidated if the job contains more than 200,000 tasks. Possible - /// values include: 'validated', 'unvalidated' + /// Possible values include: 'validated', 'unvalidated' /// [JsonProperty(PropertyName = "validationStatus")] public TaskCountValidationStatus ValidationStatus { get; set; } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskExecutionResult.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskExecutionResult.cs index 5c1079468b7fd..f31df987675b3 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskExecutionResult.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskExecutionResult.cs @@ -21,8 +21,16 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum TaskExecutionResult { + /// + /// The task ran successfully. + /// [EnumMember(Value = "success")] Success, + /// + /// There was an error during processing of the task. The failure may + /// have occurred before the task process was launched, while the task + /// process was executing, or after the task process exited. + /// [EnumMember(Value = "failure")] Failure } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskSchedulingPolicy.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskSchedulingPolicy.cs index 09598e3e42fe8..b7338005b43bc 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskSchedulingPolicy.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskSchedulingPolicy.cs @@ -30,13 +30,7 @@ public TaskSchedulingPolicy() /// Initializes a new instance of the TaskSchedulingPolicy class. /// /// How tasks are distributed across compute - /// nodes in a pool. Values are: - /// - /// pack - As many tasks as possible (maxTasksPerNode) should be - /// assigned to each node in the pool before any tasks are assigned to - /// the next node in the pool. - /// spread - Tasks should be assigned evenly across all nodes in the - /// pool. + /// nodes in a pool. public TaskSchedulingPolicy(ComputeNodeFillType nodeFillType) { NodeFillType = nodeFillType; @@ -50,12 +44,6 @@ public TaskSchedulingPolicy(ComputeNodeFillType nodeFillType) /// /// Gets or sets how tasks are distributed across compute nodes in a - /// pool. Values are: - /// - /// pack - As many tasks as possible (maxTasksPerNode) should be - /// assigned to each node in the pool before any tasks are assigned to - /// the next node in the pool. - /// spread - Tasks should be assigned evenly across all nodes in the /// pool. /// /// diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskState.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskState.cs index 2075e431ad5a5..988a21463f751 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskState.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/TaskState.cs @@ -21,12 +21,38 @@ namespace Microsoft.Azure.Batch.Protocol.Models [JsonConverter(typeof(StringEnumConverter))] public enum TaskState { + /// + /// The task is queued and able to run, but is not currently assigned + /// to a compute node. A task enters this state when it is created, + /// when it is enabled after being disabled, or when it is awaiting a + /// retry after a failed run. + /// [EnumMember(Value = "active")] Active, + /// + /// The task has been assigned to a compute node, but is waiting for a + /// required Job Preparation task to complete on the node. If the Job + /// Preparation task succeeds, the task will move to running. If the + /// Job Preparation task fails, the task will return to active and will + /// be eligible to be assigned to a different node. + /// [EnumMember(Value = "preparing")] Preparing, + /// + /// The task is running on a compute node. This includes task-level + /// preparation such as downloading resource files or deploying + /// application packages specified on the task - it does not + /// necessarily mean that the task command line has started executing. + /// [EnumMember(Value = "running")] Running, + /// + /// The task is no longer eligible to run, usually because the task has + /// finished successfully, or the task has finished unsuccessfully and + /// has exhausted its retry limit. A task is also marked as completed + /// if an error occurred launching the task, or when the task has been + /// terminated. + /// [EnumMember(Value = "completed")] Completed } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/VirtualMachineConfiguration.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/VirtualMachineConfiguration.cs index f5fc27d9e304a..1933e49b5edd8 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/VirtualMachineConfiguration.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/Models/VirtualMachineConfiguration.cs @@ -116,7 +116,15 @@ public VirtualMachineConfiguration() /// /// This property must be specified if the compute nodes in the pool /// need to have empty data disks attached to them. This cannot be - /// updated. + /// updated. Each node gets its own disk (the disk is not a file + /// share). Existing disks cannot be attached, each attached disk is + /// empty. When the node is removed from the pool, the disk and all + /// data associated with it is also deleted. The disk is not formatted + /// after being attached, it must be formatted before use - for more + /// information see + /// https://docs.microsoft.com/en-us/azure/virtual-machines/linux/classic/attach-disk#initialize-a-new-data-disk-in-linux + /// and + /// https://docs.microsoft.com/en-us/azure/virtual-machines/windows/attach-disk-ps#add-an-empty-data-disk-to-a-virtual-machine. /// [JsonProperty(PropertyName = "dataDisks")] public IList DataDisks { get; set; } diff --git a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/PoolOperations.cs b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/PoolOperations.cs index 55822c3b309d9..5e45ea2045c9a 100644 --- a/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/PoolOperations.cs +++ b/src/SDKs/Batch/DataPlane/Azure.Batch/GeneratedProtocol/PoolOperations.cs @@ -623,10 +623,6 @@ internal PoolOperations(BatchServiceClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); } - if (pool == null) - { - pool = new PoolAddParameter(); - } int? timeout = default(int?); if (poolAddOptions != null) { diff --git a/src/SDKs/Batch/DataPlane/TestCommon/Common/Common.csproj b/src/SDKs/Batch/DataPlane/TestCommon/Common/Common.csproj index 1a76c65ab2485..5a6a9b64260df 100644 --- a/src/SDKs/Batch/DataPlane/TestCommon/Common/Common.csproj +++ b/src/SDKs/Batch/DataPlane/TestCommon/Common/Common.csproj @@ -7,6 +7,9 @@ Common $(LibraryNugetPackageFolder) true + true + true + $(LibraryToolsFolder)\MSSharedLibKey.snk diff --git a/src/SDKs/Batch/DataPlane/TestCommon/IntegrationTestCommon/IntegrationTestCommon.csproj b/src/SDKs/Batch/DataPlane/TestCommon/IntegrationTestCommon/IntegrationTestCommon.csproj index 73a9e5e81e6c4..038fbae4f7ebf 100644 --- a/src/SDKs/Batch/DataPlane/TestCommon/IntegrationTestCommon/IntegrationTestCommon.csproj +++ b/src/SDKs/Batch/DataPlane/TestCommon/IntegrationTestCommon/IntegrationTestCommon.csproj @@ -7,6 +7,9 @@ IntegrationTestCommon $(LibraryNugetPackageFolder) true + true + true + $(LibraryToolsFolder)\MSSharedLibKey.snk @@ -24,4 +27,8 @@ + + + + diff --git a/src/SDKs/Batch/DataPlane/TestCommon/IntegrationTestCommon/Properties/AssemblyInfo.cs b/src/SDKs/Batch/DataPlane/TestCommon/IntegrationTestCommon/Properties/AssemblyInfo.cs deleted file mode 100644 index d71f8ec7d6fba..0000000000000 --- a/src/SDKs/Batch/DataPlane/TestCommon/IntegrationTestCommon/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("IntegrationTestCommon")] -[assembly: AssemblyTrademark("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("71f7cd84-d760-425f-823b-def2eaae5dc1")] diff --git a/src/SDKs/Batch/DataPlane/Tools/ConfigureAwaitAnalyzer/ConfigureAwaitAnalyzer.Tests/ConfigureAwaitAnalyzer.Tests.csproj b/src/SDKs/Batch/DataPlane/Tools/ConfigureAwaitAnalyzer/ConfigureAwaitAnalyzer.Tests/ConfigureAwaitAnalyzer.Tests.csproj index f1517cff5fa65..0f2af22de7d1e 100644 --- a/src/SDKs/Batch/DataPlane/Tools/ConfigureAwaitAnalyzer/ConfigureAwaitAnalyzer.Tests/ConfigureAwaitAnalyzer.Tests.csproj +++ b/src/SDKs/Batch/DataPlane/Tools/ConfigureAwaitAnalyzer/ConfigureAwaitAnalyzer.Tests/ConfigureAwaitAnalyzer.Tests.csproj @@ -8,8 +8,8 @@ false true false - - + true + true $(LibraryToolsFolder)\MSSharedLibKey.snk diff --git a/src/SDKs/Batch/DataPlane/changelog.md b/src/SDKs/Batch/DataPlane/changelog.md index 793c52e8b6035..ba68ef2a86d08 100644 --- a/src/SDKs/Batch/DataPlane/changelog.md +++ b/src/SDKs/Batch/DataPlane/changelog.md @@ -1,5 +1,12 @@ # Azure.Batch release notes +## Changes in 8.0.1 +### Bug fixes +- Fixed a bug where deserializing some enum properties could fail if using Newtonsoft 10. + +### REST API version +This version of the Batch .NET client library targets version 2017-09-01.6.0 of the Azure Batch REST API. + ## Changes in 8.0.0 ### Features - Added the ability to get a discount on Windows VM pricing if you have on-premises licenses for the OS SKUs you are deploying, via `LicenseType` on `VirtualMachineConfiguration`. diff --git a/src/SDKs/_metadata/batch_data-plane.txt b/src/SDKs/_metadata/batch_data-plane.txt index dcd076b4a8a1d..e1365ba25011f 100644 --- a/src/SDKs/_metadata/batch_data-plane.txt +++ b/src/SDKs/_metadata/batch_data-plane.txt @@ -1,11 +1,11 @@ -2017-10-03 20:45:52 UTC +2017-11-15 17:05:24 UTC 1) azure-rest-api-specs repository information -GitHub user: Azure -Branch: current -Commit: cb55c3eab13ac1845037fb771b3e41f1b7f6295c +GitHub user: matthchr +Branch: feature/batch-enum-fixes +Commit: 9b56f851f9d33cdf831a172037dfdda1ad4f9351 2) AutoRest information Requested version: latest -Bootstrapper version: C:\Users\matthchr\AppData\Roaming\npm `-- autorest@2.0.4147 -Latest installed version: 2.0.4147 +Bootstrapper version: C:\Users\matthchr\AppData\Roaming\npm `-- autorest@2.0.4166 +Latest installed version: 2.0.4168