diff --git a/specification/batch/Azure.Batch/client.tsp b/specification/batch/Azure.Batch/client.tsp index 6aa9f5d2a754..a3dae828451d 100644 --- a/specification/batch/Azure.Batch/client.tsp +++ b/specification/batch/Azure.Batch/client.tsp @@ -102,6 +102,49 @@ interface BatchClient { /* C SHARP OVERRIDES */ // Api overrides + +@@access(Azure.Batch.Pools.removeNodes, Access.internal, "csharp"); +@@clientName(BatchClient.removeNodes, "removeNodesInternal", "csharp"); +@@access(Azure.Batch.Pools.resizePool, Access.internal, "csharp"); +@@clientName(BatchClient.resizePool, "resizePoolInternal", "csharp"); +@@access(Azure.Batch.Pools.stopPoolResize, Access.internal, "csharp"); +@@clientName(BatchClient.stopPoolResize, "stopPoolResizeInternal", "csharp"); +@@access(Azure.Batch.Jobs.deleteJob, Access.internal, "csharp"); +@@clientName(BatchClient.deleteJob, "deleteJobInternal", "csharp"); +@@access(Azure.Batch.Jobs.terminateJob, Access.internal, "csharp"); +@@clientName(BatchClient.terminateJob, "terminateJobInternal", "csharp"); +@@access(Azure.Batch.JobSchedules.deleteJobSchedule, Access.internal, "csharp"); +@@clientName(BatchClient.deleteJobSchedule, + "deleteJobScheduleInternal", + "csharp" +); +@@access(Azure.Batch.JobSchedules.terminateJobSchedule, + Access.internal, + "csharp" +); +@@clientName(BatchClient.terminateJobSchedule, + "terminateJobScheduleInternal", + "csharp" +); +@@access(Azure.Batch.Pools.deletePool, Access.internal, "csharp"); +@@clientName(BatchClient.deletePool, "deletePoolInternal", "csharp"); +@@access(Azure.Batch.Certificates.deleteCertificate, Access.internal, "csharp"); +@@clientName(BatchClient.deleteCertificate, + "deleteCertificateInternal", + "csharp" +); +@@access(Azure.Batch.Nodes.deallocateNode, Access.internal, "csharp"); +@@clientName(BatchClient.deallocateNode, "deallocateNodeInternal", "csharp"); +@@access(Azure.Batch.Nodes.startNode, Access.internal, "csharp"); +@@clientName(BatchClient.startNode, "startNodeInternal", "csharp"); +@@access(Azure.Batch.Nodes.rebootNode, Access.internal, "csharp"); +@@clientName(BatchClient.rebootNode, "rebootNodeInternal", "csharp"); +@@access(Azure.Batch.Nodes.reimageNode, Access.internal, "csharp"); +@@clientName(BatchClient.reimageNode, "reimageNodeInternal", "csharp"); +@@access(Azure.Batch.Jobs.disableJob, Access.internal, "csharp"); +@@clientName(BatchClient.disableJob, "disableJobInternal", "csharp"); +@@access(Azure.Batch.Jobs.enableJob, Access.internal, "csharp"); +@@clientName(BatchClient.enableJob, "enableJobInternal", "csharp"); @@access(Azure.Batch.Pools.poolExists, Access.internal, "csharp"); @@access(Azure.Batch.JobSchedules.jobScheduleExists, Access.internal, "csharp"); @@access(Azure.Batch.Tasks.getTaskFileProperties, Access.internal, "csharp"); @@ -115,6 +158,18 @@ interface BatchClient { "csharp" ); +/* PYTHON OVERRIDES */ +@@access(Azure.Batch.Tasks.getTaskFileProperties, Access.internal, "python"); +@@clientName(BatchClient.getTaskFileProperties, + "getTaskFilePropertiesInternal", + "python" +); +@@access(Azure.Batch.Nodes.getNodeFileProperties, Access.internal, "python"); +@@clientName(BatchClient.getNodeFileProperties, + "getNodeFilePropertiesInternal", + "python" +); + /* GO OVERRIDES */ // don't export API for this operation because it retired before the first Go SDK release @@access(Azure.Batch.Pools.listPoolUsageMetrics, Access.internal, "go"); @@ -204,48 +259,47 @@ interface BatchClient { "go" ); @@clientName(Azure.Batch.CommonListParameters.maxresults, "MaxResults", "go"); -@@clientName(Azure.Batch.HttpHeader, "HTTPHeader", "go"); -@@clientName(Azure.Batch.InboundNatPool, "InboundNATPool", "go"); +@@clientName(Azure.Batch.BatchInboundNatPool, "InboundNATPool", "go"); @@clientName(Azure.Batch.IpAddressProvisioningType, "IPAddressProvisioningType", "go" ); @@clientName(Azure.Batch.LinuxUserConfiguration.gid, "GID", "go"); @@clientName(Azure.Batch.NfsMountConfiguration, "NFSMountConfiguration", "go"); -@@clientName(Azure.Batch.PublicIpAddressConfiguration, +@@clientName(Azure.Batch.BatchPublicIpAddressConfiguration, "PublicIPAddressConfiguration", "go" ); -@@clientName(Azure.Batch.UefiSettings, "UEFISettings", "go"); -@@clientName(Azure.Batch.UefiSettings.vTpmEnabled, "VTPMEnabled", "go"); +@@clientName(Azure.Batch.BatchUefiSettings, "UEFISettings", "go"); +@@clientName(Azure.Batch.BatchUefiSettings.vTpmEnabled, "VTPMEnabled", "go"); // align model names with method names -@@clientName(Azure.Batch.BatchJobCreateContent, "CreateJobContent", "go"); -@@clientName(Azure.Batch.BatchJobDisableContent, "DisableJobContent", "go"); -@@clientName(Azure.Batch.BatchJobScheduleCreateContent, - "CreateJobScheduleContent", +@@clientName(Azure.Batch.BatchJobCreateOptions, "CreateJobOptions", "go"); +@@clientName(Azure.Batch.BatchJobDisableOptions, "DisableJobOptions", "go"); +@@clientName(Azure.Batch.BatchJobScheduleCreateOptions, + "CreateJobScheduleOptions", "go" ); -@@clientName(Azure.Batch.BatchJobTerminateContent, "TerminateJobContent", "go"); -@@clientName(Azure.Batch.BatchJobUpdateContent, "UpdateJobContent", "go"); -@@clientName(Azure.Batch.BatchJobScheduleUpdateContent, - "UpdateJobScheduleContent", +@@clientName(Azure.Batch.BatchJobTerminateOptions, "TerminateJobOptions", "go"); +@@clientName(Azure.Batch.BatchJobUpdateOptions, "UpdateJobOptions", "go"); +@@clientName(Azure.Batch.BatchJobScheduleUpdateOptions, + "UpdateJobScheduleOptions", "go" ); -@@clientName(Azure.Batch.BatchNodeDeallocateContent, - "DeallocateNodeContent", +@@clientName(Azure.Batch.BatchNodeDeallocateOptions, + "DeallocateNodeOptions", "go" ); -@@clientName(Azure.Batch.BatchNodeDisableSchedulingContent, - "DisableNodeSchedulingContent", +@@clientName(Azure.Batch.BatchNodeDisableSchedulingOptions, + "DisableNodeSchedulingOptions", "go" ); -@@clientName(Azure.Batch.BatchPoolCreateContent, "CreatePoolContent", "go"); -@@clientName(Azure.Batch.BatchPoolEnableAutoScaleContent, - "EnablePoolAutoScaleContent", +@@clientName(Azure.Batch.BatchPoolCreateOptions, "CreatePoolOptions", "go"); +@@clientName(Azure.Batch.BatchPoolEnableAutoScaleOptions, + "EnablePoolAutoScaleOptions", "go" ); -@@clientName(Azure.Batch.BatchPoolEvaluateAutoScaleContent, - "EvaluatePoolAutoScaleContent", +@@clientName(Azure.Batch.BatchPoolEvaluateAutoScaleOptions, + "EvaluatePoolAutoScaleOptions", "go" ); @@clientName(Azure.Batch.BatchPoolListUsageMetricsResult, @@ -256,31 +310,31 @@ interface BatchClient { "ListPoolNodeCountsResult", "go" ); -@@clientName(Azure.Batch.BatchPoolReplaceContent, "ReplacePoolContent", "go"); -@@clientName(Azure.Batch.BatchPoolResizeContent, "ResizePoolContent", "go"); -@@clientName(Azure.Batch.BatchPoolUpdateContent, "UpdatePoolContent", "go"); -@@clientName(Azure.Batch.BatchTaskAddCollectionResult, - "AddTaskCollectionResult", +@@clientName(Azure.Batch.BatchPoolReplaceOptions, "ReplacePoolOptions", "go"); +@@clientName(Azure.Batch.BatchPoolResizeOptions, "ResizePoolOptions", "go"); +@@clientName(Azure.Batch.BatchPoolUpdateOptions, "UpdatePoolOptions", "go"); +@@clientName(Azure.Batch.BatchCreateTaskCollectionResult, + "CreateTaskCollectionResult", "go" ); -@@clientName(Azure.Batch.BatchTaskCreateContent, "CreateTaskContent", "go"); -@@clientName(Azure.Batch.BatchNodeRebootContent, "RebootNodeContent", "go"); -@@clientName(Azure.Batch.BatchNodeReimageContent, "ReimageNodeContent", "go"); -@@clientName(Azure.Batch.BatchNodeRemoveContent, "RemoveNodeContent", "go"); -@@clientName(Azure.Batch.BatchNodeUserCreateContent, - "CreateNodeUserContent", +@@clientName(Azure.Batch.BatchTaskCreateOptions, "CreateTaskOptions", "go"); +@@clientName(Azure.Batch.BatchNodeRebootOptions, "RebootNodeOptions", "go"); +@@clientName(Azure.Batch.BatchNodeReimageOptions, "ReimageNodeOptions", "go"); +@@clientName(Azure.Batch.BatchNodeRemoveOptions, "RemoveNodeOptions", "go"); +@@clientName(Azure.Batch.BatchNodeUserCreateOptions, + "CreateNodeUserOptions", "go" ); -@@clientName(Azure.Batch.BatchNodeUserUpdateContent, - "UpdateNodeUserContent", +@@clientName(Azure.Batch.BatchNodeUserUpdateOptions, + "UpdateNodeUserOptions", "go" ); -@@clientName(Azure.Batch.DeleteBatchCertificateError, +@@clientName(Azure.Batch.BatchCertificateDeleteError, "DeleteCertificateError", "go" ); -@@clientName(Azure.Batch.UploadBatchServiceLogsContent, - "UploadNodeLogsContent", +@@clientName(Azure.Batch.UploadBatchServiceLogsOptions, + "UploadNodeLogsOptions", "go" ); @@clientName(Azure.Batch.UploadBatchServiceLogsResult, @@ -293,6 +347,9 @@ interface BatchClient { "go" ); @@clientName(Azure.Batch.DisableBatchJobOption, "DisableJobOption", "go"); -@@clientName(Azure.Batch.OnAllBatchTasksComplete, "OnAllTasksComplete", "go"); -@@clientName(Azure.Batch.OnBatchTaskFailure, "OnTaskFailure", "go"); +@@clientName(Azure.Batch.BatchAllTasksCompleteMode, + "AllTasksCompleteMode", + "go" +); +@@clientName(Azure.Batch.BatchTaskFailureMode, "TaskFailureMode", "go"); @@clientName(Azure.Batch.RecentBatchJob, "RecentJob", "go"); diff --git a/specification/batch/Azure.Batch/common.tsp b/specification/batch/Azure.Batch/common.tsp index 42b41d5ea943..7d03256bcd51 100644 --- a/specification/batch/Azure.Batch/common.tsp +++ b/specification/batch/Azure.Batch/common.tsp @@ -394,7 +394,8 @@ alias CommonParameters = { @clientName("timeOutInSeconds", "csharp") @clientName("timeOutInSeconds", "javascript") @clientName("timeout", "go,python") - timeOut?: int32 = 30; + @encode("seconds", int32) + timeOut?: duration; @doc(""" The caller-generated request identity, in the form of a GUID with no decoration @@ -414,6 +415,7 @@ alias CommonParameters = { """) @header("ocp-date") @encode(DateTimeKnownEncoding.rfc7231) + @clientName("ocpDate", "csharp") ocpdate?: utcDateTime; }; @@ -457,7 +459,7 @@ alias ListPoolUsageMetricsOptionalParameters = { alias CreatePoolRequiredParameters = { @body @doc("The Pool to be created.") - pool: BatchPoolCreateContent; + pool: BatchPoolCreateOptions; }; alias ListPoolsOptionalParameters = { @@ -537,7 +539,7 @@ alias UpdatePoolRequiredParameters = { @doc("The pool properties to update.") @bodyRoot - pool: BatchPoolUpdateContent; + pool: BatchPoolUpdateOptions; }; alias EnablePoolAutoscaleRequiredParameters = { @@ -547,7 +549,7 @@ alias EnablePoolAutoscaleRequiredParameters = { @doc("The options to use for enabling automatic scaling.") @bodyRoot - content: BatchPoolEnableAutoScaleContent; + enableAutoScaleOptions: BatchPoolEnableAutoScaleOptions; }; alias EvaluatePoolAutoScaleRequiredParameters = { @@ -557,7 +559,7 @@ alias EvaluatePoolAutoScaleRequiredParameters = { @doc("The options to use for evaluating the automatic scaling formula.") @bodyRoot - content: BatchPoolEvaluateAutoScaleContent; + evaluateAutoScaleOptions: BatchPoolEvaluateAutoScaleOptions; }; alias ResizePoolRequiredParameters = { @@ -567,7 +569,7 @@ alias ResizePoolRequiredParameters = { @doc("The options to use for resizing the pool.") @bodyRoot - content: BatchPoolResizeContent; + resizeOptions: BatchPoolResizeOptions; }; alias StopPoolResizeRequiredParameters = { @@ -583,7 +585,7 @@ alias ReplacePoolPropertiesRequiredParameters = { @doc("The options to use for replacing properties on the pool.") @bodyRoot - pool: BatchPoolReplaceContent; + pool: BatchPoolReplaceOptions; }; alias PoolExistsRequiredParameters = { @@ -599,7 +601,7 @@ alias RemoveNodesRequiredParameters = { @doc("The options to use for removing the node.") @bodyRoot - content: BatchNodeRemoveContent; + removeOptions: BatchNodeRemoveOptions; }; // Job Aliases @@ -640,7 +642,7 @@ alias UpdateJobRequiredParameters = { @doc("The options to use for updating the Job.") @bodyRoot - job: BatchJobUpdateContent; + job: BatchJobUpdateOptions; }; alias ReplaceJobRequiredParameters = { @@ -660,7 +662,7 @@ alias DisableJobRequiredParameters = { @doc("The options to use for disabling the Job.") @bodyRoot - content: BatchJobDisableContent; + disableOptions: BatchJobDisableOptions; }; alias EnableJobRequiredParameters = { @@ -678,7 +680,7 @@ alias TerminateJobRequiredParameters = { alias TerminateJobOptionalParameters = { @doc("The options to use for terminating the Job.") @bodyRoot - parameters?: BatchJobTerminateContent; + options?: BatchJobTerminateOptions; @doc("If true, the server will terminate the Job even if the corresponding nodes have not fully processed the termination. The default value is false.") @query @@ -688,7 +690,7 @@ alias TerminateJobOptionalParameters = { alias CreateJobRequiredParameters = { @doc("The Job to be created.") @bodyRoot - job: BatchJobCreateContent; + job: BatchJobCreateOptions; }; alias ListJobsOptionalParameters = { @@ -873,7 +875,7 @@ alias UpdateJobScheduleRequiredParameters = { @doc("The options to use for updating the Job Schedule.") @bodyRoot - jobSchedule: BatchJobScheduleUpdateContent; + jobSchedule: BatchJobScheduleUpdateOptions; }; alias ReplaceJobScheduleRequiredParameters = { @@ -913,7 +915,7 @@ alias TerminateJobScheduleOptionalParameters = { alias CreateJobScheduleRequiredParameters = { @doc("The Job Schedule to be created.") @bodyRoot - jobSchedule: BatchJobScheduleCreateContent; + jobSchedule: BatchJobScheduleCreateOptions; }; alias ListJobSchedulesOptionalParameters = { @@ -944,7 +946,7 @@ alias CreateTaskRequiredParameters = { @doc("The Task to be created.") @bodyRoot - task: BatchTaskCreateContent; + task: BatchTaskCreateOptions; }; alias ListTasksRequiredParameters = { @@ -1148,7 +1150,7 @@ alias CreateNodeUserRequiredParameters = { @doc("The options to use for creating the user.") @bodyRoot - user: BatchNodeUserCreateContent; + user: BatchNodeUserCreateOptions; }; alias DeleteNodeUserRequiredParameters = { @@ -1186,7 +1188,7 @@ alias ReplaceNodeUserRequiredParameters = { @doc("The options to use for updating the user.") @bodyRoot - content: BatchNodeUserUpdateContent; + updateOptions: BatchNodeUserUpdateOptions; }; alias GetNodeRequiredParameters = { @@ -1229,7 +1231,7 @@ alias RebootNodeRequiredParameters = { alias RebootNodeOptionalParameters = { @doc("The options to use for rebooting the Compute Node.") @bodyRoot - parameters?: BatchNodeRebootContent; + options?: BatchNodeRebootOptions; }; alias DeallocateNodeRequiredParameters = { @@ -1245,7 +1247,7 @@ alias DeallocateNodeRequiredParameters = { alias DeallocateNodeOptionalParameters = { @doc("The options to use for deallocating the Compute Node.") @bodyRoot - parameters?: BatchNodeDeallocateContent; + options?: BatchNodeDeallocateOptions; }; alias ReimageNodeRequiredParameters = { @@ -1261,7 +1263,7 @@ alias ReimageNodeRequiredParameters = { alias ReimageNodeOptionalParameters = { @doc("The options to use for reimaging the Compute Node.") @body - parameters?: BatchNodeReimageContent; + options?: BatchNodeReimageOptions; }; alias DisableNodeSchedulingRequiredParameters = { @@ -1277,7 +1279,7 @@ alias DisableNodeSchedulingRequiredParameters = { alias DisableNodeSchedulingOptionalParameters = { @doc("The options to use for disabling scheduling on the Compute Node.") @bodyRoot - parameters?: BatchNodeDisableSchedulingContent; + options?: BatchNodeDisableSchedulingOptions; }; alias EnableNodeSchedulingRequiredParameters = { @@ -1314,7 +1316,7 @@ alias UploadNodeLogsRequiredParameters = { @doc("The Azure Batch service log files upload options.") @bodyRoot - content: UploadBatchServiceLogsContent; + uploadOptions: UploadBatchServiceLogsOptions; }; alias ListNodesRequiredParameters = { diff --git a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Certificates_CreateCertificate.json b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Certificates_CreateCertificate.json index 412695e63996..07ccef685677 100644 --- a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Certificates_CreateCertificate.json +++ b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Certificates_CreateCertificate.json @@ -9,7 +9,7 @@ "certificate": { "thumbprintAlgorithm": "sha1", "thumbprint": "0123456789abcdef0123456789abcdef01234567", - "data": "#####...", + "data": "U3dhZ2dlciByb2Nrcw==", "certificateFormat": "pfx", "password": "" } diff --git a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Jobs_DisableJob.json b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Jobs_DisableJob.json index 28510af741a6..94028fa357f3 100644 --- a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Jobs_DisableJob.json +++ b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Jobs_DisableJob.json @@ -7,7 +7,7 @@ "jobId": "jobId", "client-request-id": "00000000-0000-0000-0000-000000000000", "ocp-date": "Fri, 17 Feb 2017 00:00:00 GMT", - "content": { + "disableOptions": { "disableTasks": "terminate" } }, diff --git a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Nodes_ListNodeFiles.json b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Nodes_ListNodeFiles.json index b7dd7ef9b6db..d607a98ed9b6 100644 --- a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Nodes_ListNodeFiles.json +++ b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Nodes_ListNodeFiles.json @@ -21,7 +21,7 @@ }, { "name": "startup\\ProcessEnv.cmd", - "url": "https://account.region.batch.azure.com/pools/poolId/nodes/tvm-2167304207_2-20140919t215614z/files/startup\\ProcessEnv.cmd", + "url": "https://account.region.batch.azure.com/pools/poolId/nodes/tvm-2167304207_2-20140919t215614z/files/startup/ProcessEnv.cmd", "isDirectory": false, "properties": { "creationTime": "2014-09-19T21:56:17.679195Z", @@ -32,7 +32,7 @@ }, { "name": "startup\\stderr.txt", - "url": "https://account.region.batch.azure.com/pools/poolId/nodes/tvm-2167304207_2-20140919t215614z/files/startup\\stderr.txt", + "url": "https://account.region.batch.azure.com/pools/poolId/nodes/tvm-2167304207_2-20140919t215614z/files/startup/stderr.txt", "isDirectory": false, "properties": { "creationTime": "2014-09-19T21:56:17.5590855Z", diff --git a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Nodes_ReplaceNodeUser.json b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Nodes_ReplaceNodeUser.json index d93a7ffd93eb..84aadd20bd82 100644 --- a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Nodes_ReplaceNodeUser.json +++ b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Nodes_ReplaceNodeUser.json @@ -9,7 +9,7 @@ "userName": "userName", "client-request-id": "00000000-0000-0000-0000-000000000000", "ocp-date": "Fri, 17 Feb 2017 00:00:00 GMT", - "content": { + "updateOptions": { "password": "12345", "expiryTime": "2016-11-27T00:45:48.7320857Z" } diff --git a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Nodes_UploadNodeLogs.json b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Nodes_UploadNodeLogs.json index c4ce833ad67a..8d12d98a3a3e 100644 --- a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Nodes_UploadNodeLogs.json +++ b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Nodes_UploadNodeLogs.json @@ -8,7 +8,7 @@ "nodeId": "tvm-1695681911_1-20161121t182739z", "client-request-id": "00000000-0000-0000-0000-000000000000", "ocp-date": "Fri, 17 Feb 2017 00:00:00 GMT", - "content": { + "uploadOptions": { "containerUrl": "https://somestorageacct.blob.core.windows.net/batch-compute-node-logs?se=2017-12-09T18%3A51%3A00Z&sp=w&sv=2016-05-31&sr=c&sig", "startTime": "2017-11-27T00:00:00Z" } diff --git a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Pools_EnablePoolAutoscale.json b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Pools_EnablePoolAutoscale.json index c4ce7c23579d..bdb0fbd3329a 100644 --- a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Pools_EnablePoolAutoscale.json +++ b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Pools_EnablePoolAutoscale.json @@ -7,7 +7,7 @@ "poolId": "poolId", "client-request-id": "00000000-0000-0000-0000-000000000000", "ocp-date": "Fri, 17 Feb 2017 00:00:00 GMT", - "content": { + "enableAutoScaleOptions": { "autoScaleFormula": "$TargetDedicated=0", "autoScaleEvaluationInterval": "PT8M" } diff --git a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Pools_EvaluatePoolAutoscale.json b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Pools_EvaluatePoolAutoscale.json index 25ee2bbcf2f6..fbab2a0ff2ed 100644 --- a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Pools_EvaluatePoolAutoscale.json +++ b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Pools_EvaluatePoolAutoscale.json @@ -7,7 +7,7 @@ "poolId": "poolId", "client-request-id": "00000000-0000-0000-0000-000000000000", "ocp-date": "Fri, 17 Feb 2017 00:00:00 GMT", - "content": { + "evaluateAutoScaleOptions": { "autoScaleFormula": "$TargetDedicated=1" } }, diff --git a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Pools_RemoveNodes.json b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Pools_RemoveNodes.json index 2e68b4a5da9f..234c0f13bcc0 100644 --- a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Pools_RemoveNodes.json +++ b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Pools_RemoveNodes.json @@ -7,7 +7,7 @@ "poolId": "poolId", "client-request-id": "00000000-0000-0000-0000-000000000000", "ocp-date": "Fri, 17 Feb 2017 00:00:00 GMT", - "content": { + "removeOptions": { "nodeList": [ "tvm-1695681911_1-20161122t224741z", "tvm-1695681911_2-20161122t224741z" diff --git a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Pools_ResizePool.json b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Pools_ResizePool.json index 29ffedcbcfab..0cad4552bafe 100644 --- a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Pools_ResizePool.json +++ b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Pools_ResizePool.json @@ -7,7 +7,7 @@ "poolId": "resizePool", "client-request-id": "00000000-0000-0000-0000-000000000000", "ocp-date": "Fri, 17 Feb 2017 00:00:00 GMT", - "content": { + "resizeOptions": { "targetDedicatedNodes": 1, "targetLowPriorityNodes": 0 } diff --git a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Tasks_ListTaskFiles.json b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Tasks_ListTaskFiles.json index 494f14e3252d..a8481d3b1dd8 100644 --- a/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Tasks_ListTaskFiles.json +++ b/specification/batch/Azure.Batch/examples/2024-07-01.20.0/Tasks_ListTaskFiles.json @@ -16,7 +16,7 @@ "value": [ { "name": "startup\\ProcessEnv.cmd", - "url": "https://account.region.batch.azure.com/jobs/jobId/tasks/taskId/files/startup\\ProcessEnv.cmd", + "url": "https://account.region.batch.azure.com/jobs/jobId/tasks/taskId/files/startup/ProcessEnv.cmd", "isDirectory": false, "properties": { "creationTime": "2014-09-19T21:56:17.679195Z", @@ -27,7 +27,7 @@ }, { "name": "startup\\stderr.txt", - "url": "https://account.region.batch.azure.com/jobs/jobId/tasks/taskId/files/startup\\stderr.txt", + "url": "https://account.region.batch.azure.com/jobs/jobId/tasks/taskId/files/startup/stderr.txt", "isDirectory": false, "properties": { "creationTime": "2014-09-19T21:56:17.5590855Z", diff --git a/specification/batch/Azure.Batch/java-client.tsp b/specification/batch/Azure.Batch/java-client.tsp index 34338a25f165..7c87d3dfd456 100644 --- a/specification/batch/Azure.Batch/java-client.tsp +++ b/specification/batch/Azure.Batch/java-client.tsp @@ -13,7 +13,7 @@ namespace JavaClient; // Get Application Operation @doc("Optional parameters for Get Application operation.") -model GetBatchApplicationOptions { +model BatchApplicationGetOptions { ...Azure.Batch.CommonParameters; } @@ -25,7 +25,7 @@ op getApplicationCustomization is Azure.Batch.ReadOperation< ...Azure.Batch.GetApplicationRequiredParameters; @doc("Optional parameters for Get Application operation.") - options?: GetBatchApplicationOptions; + options?: BatchApplicationGetOptions; }, Azure.Batch.BatchApplication >; @@ -38,7 +38,7 @@ op getApplicationCustomization is Azure.Batch.ReadOperation< // List Applications Operation @doc("Optional parameters for List Applications operation.") -model ListBatchApplicationsOptions { +model BatchApplicationsListOptions { ...Azure.Batch.CommonListParameters; } @@ -48,7 +48,7 @@ model ListBatchApplicationsOptions { op listApplicationsCustomization is Azure.Batch.ListOperation< { @doc("Optional parameters for List Applications operation.") - options?: ListBatchApplicationsOptions; + options?: BatchApplicationsListOptions; }, Azure.Batch.BatchApplicationListResult >; @@ -60,7 +60,7 @@ op listApplicationsCustomization is Azure.Batch.ListOperation< // List Pool Usage Metrics Operation @doc("Optional parameters for List Pool Usage Metrics operation.") -model ListBatchPoolUsageMetricsOptions { +model BatchPoolUsageMetricsListOptions { ...Azure.Batch.CommonListParameters; ...Azure.Batch.ListPoolUsageMetricsOptionalParameters; } @@ -71,7 +71,7 @@ model ListBatchPoolUsageMetricsOptions { op listPoolUsageMetricsCustomization is Azure.Batch.ListOperation< { @doc("Optional parameters for List Pool Usage Metrics operation.") - options?: ListBatchPoolUsageMetricsOptions; + options?: BatchPoolUsageMetricsListOptions; }, Azure.Batch.BatchPoolListUsageMetricsResult >; @@ -83,7 +83,7 @@ op listPoolUsageMetricsCustomization is Azure.Batch.ListOperation< // Create Pool Operation @doc("Optional parameters for Create Pool operation.") -model CreateBatchPoolOptions { +model BatchPoolCreateOptions { ...Azure.Batch.CommonJsonParameters; } @@ -95,7 +95,7 @@ op createPoolCustomization is Azure.Batch.CreateOperation< ...Azure.Batch.CreatePoolRequiredParameters; @doc("Optional parameters for Create Pool operation.") - options?: CreateBatchPoolOptions; + options?: BatchPoolCreateOptions; }, void >; @@ -104,7 +104,7 @@ op createPoolCustomization is Azure.Batch.CreateOperation< // List Pools Operation @doc("Optional parameters for List Pools operation.") -model ListBatchPoolsOptions { +model BatchPoolsListOptions { ...Azure.Batch.CommonListParameters; ...Azure.Batch.ListPoolsOptionalParameters; } @@ -115,7 +115,7 @@ model ListBatchPoolsOptions { op listPoolsCustomization is Azure.Batch.ListOperation< { @doc("Optional parameters for List Pools operation.") - options?: ListBatchPoolsOptions; + options?: BatchPoolsListOptions; }, Azure.Batch.BatchPoolListResult >; @@ -124,7 +124,7 @@ op listPoolsCustomization is Azure.Batch.ListOperation< // Delete Pool Operation @doc("Optional parameters for Delete Pool operation.") -model DeleteBatchPoolOptions { +model BatchPoolDeleteOptions { ...Azure.Batch.CommonParameters; } @@ -136,7 +136,7 @@ op deletePoolCustomization is Azure.Batch.DeleteOperation< ...Azure.Batch.DeletePoolRequiredParameters; @doc("Optional parameters for Delete Pool operation.") - options?: DeleteBatchPoolOptions; + options?: BatchPoolDeleteOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -172,7 +172,7 @@ op poolExistsCustomization is Azure.Batch.ResourceInfoOperationWithAdditionalRes // Get Pool Operation @doc("Optional parameters for Get Pool operation.") -model GetBatchPoolOptions { +model BatchPoolGetOptions { ...Azure.Batch.CommonParameters; ...Azure.Batch.GetPoolOptionalParameters; } @@ -185,7 +185,7 @@ op getPoolCustomization is Azure.Batch.ReadOperation< ...Azure.Batch.GetPoolRequiredParameters; @doc("Optional parameters for Get Pool operation.") - options?: GetBatchPoolOptions; + options?: BatchPoolGetOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -196,7 +196,7 @@ op getPoolCustomization is Azure.Batch.ReadOperation< // Update Pool Operation @doc("Optional parameters for Update Pool operation.") -model UpdateBatchPoolOptions { +model BatchPoolUpdateOptions { ...Azure.Batch.CommonJsonParameters; } @@ -208,7 +208,7 @@ op updatePoolCustomization is Azure.Batch.UpdateOperation< ...Azure.Batch.UpdatePoolRequiredParameters; @doc("Optional parameters for Update Pool operation.") - options?: UpdateBatchPoolOptions; + options?: BatchPoolUpdateOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -219,7 +219,7 @@ op updatePoolCustomization is Azure.Batch.UpdateOperation< // Disable Pool Autoscale Operation @doc("Optional parameters for Disable Pool AutoScale operation.") -model DisableBatchPoolAutoScaleOptions { +model BatchPoolDisableAutoScaleOptions { ...Azure.Batch.CommonParameters; } @@ -231,7 +231,7 @@ op disablePoolAutoScaleCustomization is Azure.Batch.PostOperation< ...Azure.Batch.DisablePoolAutoscaleRequiredParameters; @doc("Optional parameters for Disable Pool AutoScale operation.") - options?: DisableBatchPoolAutoScaleOptions; + options?: BatchPoolDisableAutoScaleOptions; }, Azure.Batch.RequestSuccessResponseHeaders >; @@ -243,7 +243,7 @@ op disablePoolAutoScaleCustomization is Azure.Batch.PostOperation< // Enable Pool Autoscale Operation @doc("Optional parameters for Enable Pool AutoScale operation.") -model EnableBatchPoolAutoScaleOptions { +model BatchPoolEnableAutoScaleOptions { ...Azure.Batch.CommonJsonParameters; } @@ -255,7 +255,7 @@ op enablePoolAutoScaleCustomization is Azure.Batch.PostOperation< ...Azure.Batch.EnablePoolAutoscaleRequiredParameters; @doc("Optional parameters for Enable Pool AutoScale operation.") - options?: EnableBatchPoolAutoScaleOptions; + options?: BatchPoolEnableAutoScaleOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -269,7 +269,7 @@ op enablePoolAutoScaleCustomization is Azure.Batch.PostOperation< // Evaluate Pool Autoscale Operation @doc("Optional parameters for Evaluate Pool AutoScale operation.") -model EvaluateBatchPoolAutoScaleOptions { +model BatchPoolEvaluateAutoScaleOptions { ...Azure.Batch.CommonJsonParameters; } @@ -281,7 +281,7 @@ op evaluatePoolAutoScaleCustomization is Azure.Batch.PostOperation< ...Azure.Batch.EvaluatePoolAutoScaleRequiredParameters; @doc("Optional parameters for Evaluate Pool AutoScale operation.") - options?: EvaluateBatchPoolAutoScaleOptions; + options?: BatchPoolEvaluateAutoScaleOptions; }, Azure.Batch.AutoScaleRun & Azure.Batch.RequestSuccessResponseHeaders >; @@ -293,7 +293,7 @@ op evaluatePoolAutoScaleCustomization is Azure.Batch.PostOperation< // Resize Pool Operation @doc("Optional parameters for Resize Pool operation.") -model ResizeBatchPoolOptions { +model BatchPoolResizeOptions { ...Azure.Batch.CommonJsonParameters; } @@ -305,7 +305,7 @@ op resizePoolCustomization is Azure.Batch.PostOperation< ...Azure.Batch.ResizePoolRequiredParameters; @doc("Optional parameters for Resize Pool operation.") - options?: ResizeBatchPoolOptions; + options?: BatchPoolResizeOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -316,7 +316,7 @@ op resizePoolCustomization is Azure.Batch.PostOperation< // Stop Pool Resize Operation @doc("Optional parameters for Stop Pool Resize operation.") -model StopBatchPoolResizeOptions { +model BatchPoolResizeStopOptions { ...Azure.Batch.CommonParameters; } @@ -328,7 +328,7 @@ op stopPoolResizeCustomization is Azure.Batch.PostOperation< ...Azure.Batch.StopPoolResizeRequiredParameters; @doc("Optional parameters for Stop Pool Resize operation.") - options?: StopBatchPoolResizeOptions; + options?: BatchPoolResizeStopOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -342,7 +342,7 @@ op stopPoolResizeCustomization is Azure.Batch.PostOperation< // Replace Pool Properties Operation @doc("Optional parameters for Replace Pool Properties operation.") -model ReplaceBatchPoolPropertiesOptions { +model BatchPoolPropertiesReplaceOptions { ...Azure.Batch.CommonJsonParameters; } @@ -354,7 +354,7 @@ op replacePoolPropertiesCustomization is Azure.Batch.PostOperation< ...Azure.Batch.ReplacePoolPropertiesRequiredParameters; @doc("Optional parameters for Replace Pool Properties operation.") - options?: ReplaceBatchPoolPropertiesOptions; + options?: BatchPoolPropertiesReplaceOptions; }, Azure.Batch.NoContentSuccessResponseHeaders >; @@ -366,7 +366,7 @@ op replacePoolPropertiesCustomization is Azure.Batch.PostOperation< // Remove Nodes Operation @doc("Optional parameters for Remove Nodes operation.") -model RemoveBatchNodesOptions { +model BatchNodesRemoveOptions { ...Azure.Batch.CommonJsonParameters; } @@ -378,7 +378,7 @@ op removeNodesCustomization is Azure.Batch.PostOperation< ...Azure.Batch.RemoveNodesRequiredParameters; @doc("Optional parameters for Remove Nodes operation.") - options?: RemoveBatchNodesOptions; + options?: BatchNodesRemoveOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -389,7 +389,7 @@ op removeNodesCustomization is Azure.Batch.PostOperation< // List Supported Images Operation @doc("Optional parameters for List Supported Images operation.") -model ListSupportedBatchImagesOptions { +model SupportedBatchImagesListOptions { ...Azure.Batch.CommonListParameters; ...Azure.Batch.ListSupportedImagesOptionalParameters; } @@ -400,7 +400,7 @@ model ListSupportedBatchImagesOptions { op listSupportedImagesCustomization is Azure.Batch.ListOperation< { @doc("Optional parameters for List Supported Images operation.") - options?: ListSupportedBatchImagesOptions; + options?: SupportedBatchImagesListOptions; }, Azure.Batch.BatchAccountListSupportedImagesResult >; @@ -412,7 +412,7 @@ op listSupportedImagesCustomization is Azure.Batch.ListOperation< // List Pool Node Counts Operation @doc("Optional parameters for List Pool Node Counts operation.") -model ListBatchPoolNodeCountsOptions { +model BatchPoolNodeCountsListOptions { ...Azure.Batch.CommonListParameters; ...Azure.Batch.ListPoolNodeCountsOptionalParameters; } @@ -423,7 +423,7 @@ model ListBatchPoolNodeCountsOptions { op listPoolNodeCountsCustomization is Azure.Batch.ListOperation< { @doc("Optional parameters for List Pool Node Counts operation.") - options?: ListBatchPoolNodeCountsOptions; + options?: BatchPoolNodeCountsListOptions; }, Azure.Batch.BatchPoolNodeCountsListResult >; @@ -435,7 +435,7 @@ op listPoolNodeCountsCustomization is Azure.Batch.ListOperation< // Delete Job Operation @doc("Optional parameters for Delete Job operation.") -model DeleteBatchJobOptions { +model BatchJobDeleteOptions { ...Azure.Batch.CommonParameters; ...Azure.Batch.DeleteJobOptionalParameters; } @@ -448,7 +448,7 @@ op deleteJobCustomization is Azure.Batch.DeleteOperation< ...Azure.Batch.DeleteJobRequiredParameters; @doc("Optional parameters for Delete Job operation.") - options?: DeleteBatchJobOptions; + options?: BatchJobDeleteOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -459,7 +459,7 @@ op deleteJobCustomization is Azure.Batch.DeleteOperation< // Get Job Operation @doc("Optional parameters for Get Job operation.") -model GetBatchJobOptions { +model BatchJobGetOptions { ...Azure.Batch.CommonParameters; ...Azure.Batch.GetJobOptionalParameters; } @@ -472,7 +472,7 @@ op getJobCustomization is Azure.Batch.ReadOperation< ...Azure.Batch.GetJobRequiredParameters; @doc("Optional parameters for Get Job operation.") - options?: GetBatchJobOptions; + options?: BatchJobGetOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -483,7 +483,7 @@ op getJobCustomization is Azure.Batch.ReadOperation< // Update Job Operation @doc("Optional parameters for Update Job operation.") -model UpdateBatchJobOptions { +model BatchJobUpdateOptions { ...Azure.Batch.CommonJsonParameters; } @@ -495,7 +495,7 @@ op updateJobCustomization is Azure.Batch.UpdateOperation< ...Azure.Batch.UpdateJobRequiredParameters; @doc("Optional parameters for Update Job operation.") - options?: UpdateBatchJobOptions; + options?: BatchJobUpdateOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -506,7 +506,7 @@ op updateJobCustomization is Azure.Batch.UpdateOperation< // Replace Job Operation @doc("Optional parameters for Replace Job operation.") -model ReplaceBatchJobOptions { +model BatchJobReplaceOptions { ...Azure.Batch.CommonJsonParameters; } @@ -518,7 +518,7 @@ op replaceJobCustomization is Azure.Batch.ReplaceOperation< ...Azure.Batch.ReplaceJobRequiredParameters; @doc("Optional parameters for Replace Job operation.") - options?: ReplaceBatchJobOptions; + options?: BatchJobReplaceOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -529,7 +529,7 @@ op replaceJobCustomization is Azure.Batch.ReplaceOperation< // Disable Job Operation @doc("Optional parameters for Disable Job operation.") -model DisableBatchJobOptions { +model BatchJobDisableOptions { ...Azure.Batch.CommonJsonParameters; } @@ -541,7 +541,7 @@ op disableJobCustomization is Azure.Batch.PostOperation< ...Azure.Batch.DisableJobRequiredParameters; @doc("Optional parameters for Disable Job operation.") - options?: DisableBatchJobOptions; + options?: BatchJobDisableOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -552,7 +552,7 @@ op disableJobCustomization is Azure.Batch.PostOperation< // Enable Job Operation @doc("Optional parameters for Enable Job operation.") -model EnableBatchJobOptions { +model BatchJobEnableOptions { ...Azure.Batch.CommonParameters; } @@ -564,7 +564,7 @@ op enableJobCustomization is Azure.Batch.PostOperation< ...Azure.Batch.EnableJobRequiredParameters; @doc("Optional parameters for Enable Job operation.") - options?: EnableBatchJobOptions; + options?: BatchJobEnableOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -575,7 +575,7 @@ op enableJobCustomization is Azure.Batch.PostOperation< // Terminate Job Operation @doc("Optional parameters for Terminate Job operation.") -model TerminateBatchJobOptions { +model BatchJobTerminateOptions { ...Azure.Batch.CommonJsonParameters; ...Azure.Batch.TerminateJobOptionalParameters; } @@ -588,7 +588,7 @@ op terminateJobCustomization is Azure.Batch.PostOperation< ...Azure.Batch.TerminateJobRequiredParameters; @doc("Optional parameters for Terminate Job operation.") - options?: TerminateBatchJobOptions; + options?: BatchJobTerminateOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -599,7 +599,7 @@ op terminateJobCustomization is Azure.Batch.PostOperation< // Create Job Operation @doc("Optional parameters for Create Job operation.") -model CreateBatchJobOptions { +model BatchJobCreateOptions { ...Azure.Batch.CommonJsonParameters; } @@ -611,7 +611,7 @@ op createJobCustomization is Azure.Batch.CreateOperation< ...Azure.Batch.CreateJobRequiredParameters; @doc("Optional parameters for Create Job operation.") - options?: CreateBatchJobOptions; + options?: BatchJobCreateOptions; }, void >; @@ -620,7 +620,7 @@ op createJobCustomization is Azure.Batch.CreateOperation< // List Jobs Operation @doc("Optional parameters for List Jobs operation.") -model ListBatchJobsOptions { +model BatchJobsListOptions { ...Azure.Batch.CommonListParameters; ...Azure.Batch.ListJobsOptionalParameters; } @@ -631,7 +631,7 @@ model ListBatchJobsOptions { op listJobsCustomization is Azure.Batch.ListOperation< { @doc("Optional parameters for List Jobs operation.") - options?: ListBatchJobsOptions; + options?: BatchJobsListOptions; }, Azure.Batch.BatchJobListResult >; @@ -640,7 +640,7 @@ op listJobsCustomization is Azure.Batch.ListOperation< // List Jobs From Schedule Operation @doc("Optional parameters for List Jobs From Schedule operation.") -model ListBatchJobsFromScheduleOptions { +model BatchJobsFromScheduleListOptions { ...Azure.Batch.CommonListParameters; ...Azure.Batch.ListJobsFromScheduleOptionalParameters; } @@ -653,7 +653,7 @@ op listJobsFromScheduleCustomization is Azure.Batch.ListOperation< ...Azure.Batch.ListJobsFromScheduleRequiredParameters; @doc("Optional parameters for List Jobs From Schedule operation.") - options?: ListBatchJobsFromScheduleOptions; + options?: BatchJobsFromScheduleListOptions; }, Azure.Batch.BatchJobListResult >; @@ -665,7 +665,7 @@ op listJobsFromScheduleCustomization is Azure.Batch.ListOperation< // List Jobs Preparation and Release Task Status Operation @doc("Optional parameters for List Jobs From Schedule operation.") -model ListBatchJobPreparationAndReleaseTaskStatusOptions { +model BatchJobPreparationAndReleaseTaskStatusListOptions { ...Azure.Batch.CommonListParameters; ...Azure.Batch.ListJobPreparationAndReleaseTaskStatusOptionalParameters; } @@ -678,7 +678,7 @@ op listJobPreparationAndReleaseTaskStatusCustomization is Azure.Batch.ListOperat ...Azure.Batch.ListJobPreparationAndReleaseTaskStatusRequiredParameters; @doc("Optional parameters for List Jobs Preparation and Release Task Status operation.") - options?: ListBatchJobPreparationAndReleaseTaskStatusOptions; + options?: BatchJobPreparationAndReleaseTaskStatusListOptions; }, Azure.Batch.BatchJobPreparationAndReleaseTaskStatusListResult >; @@ -690,7 +690,7 @@ op listJobPreparationAndReleaseTaskStatusCustomization is Azure.Batch.ListOperat // Get Job Task Counts Operation @doc("Optional parameters for Get Job Task Counts operation.") -model GetBatchJobTaskCountsOptions { +model BatchJobTaskCountsGetOptions { ...Azure.Batch.CommonParameters; } @@ -702,7 +702,7 @@ op getJobTaskCountsCustomization is Azure.Batch.ReadOperation< ...Azure.Batch.GetJobTaskCountsRequiredParameters; @doc("Optional parameters for Get Job Task Counts operation.") - options?: GetBatchJobTaskCountsOptions; + options?: BatchJobTaskCountsGetOptions; }, Azure.Batch.BatchTaskCountsResult >; @@ -714,7 +714,7 @@ op getJobTaskCountsCustomization is Azure.Batch.ReadOperation< // Create Certificate Operation @doc("Optional parameters for Create Certificate operation.") -model CreateBatchCertificateOptions { +model BatchCertificateCreateOptions { ...Azure.Batch.CommonJsonParameters; } @@ -726,7 +726,7 @@ op createCertificateCustomization is Azure.Batch.CreateOperation< ...Azure.Batch.CreateCertificateRequiredParameters; @doc("Optional parameters for Create Certificate operation.") - options?: CreateBatchCertificateOptions; + options?: BatchCertificateCreateOptions; }, void >; @@ -738,7 +738,7 @@ op createCertificateCustomization is Azure.Batch.CreateOperation< // List Certificates Operation @doc("Optional parameters for List Certificates operation.") -model ListBatchCertificatesOptions { +model BatchCertificatesListOptions { ...Azure.Batch.CommonListParameters; ...Azure.Batch.ListCertificatesOptionalParameters; } @@ -749,7 +749,7 @@ model ListBatchCertificatesOptions { op listCertificatesCustomization is Azure.Batch.ListOperation< { @doc("Optional parameters for List Certificates operation.") - options?: ListBatchCertificatesOptions; + options?: BatchCertificatesListOptions; }, Azure.Batch.BatchCertificateListResult >; @@ -761,7 +761,7 @@ op listCertificatesCustomization is Azure.Batch.ListOperation< // Cancel Certificate Deletion Operation @doc("Optional parameters for Cancel Certificate Deletion operation.") -model CancelBatchCertificateDeletionOptions { +model BatchCertificateCancelDeletionOptions { ...Azure.Batch.CommonParameters; } @@ -773,7 +773,7 @@ op cancelCertificateDeletionCustomization is Azure.Batch.PostOperation< ...Azure.Batch.CancelCertificateDeletionRequiredParameters; @doc("Optional parameters for Cancel Certificate Deletion operation.") - options?: CancelBatchCertificateDeletionOptions; + options?: BatchCertificateCancelDeletionOptions; }, Azure.Batch.NoContentSuccessResponseHeaders >; @@ -785,7 +785,7 @@ op cancelCertificateDeletionCustomization is Azure.Batch.PostOperation< // Delete Certificate Operation @doc("Optional parameters for Delete Certificate operation.") -model DeleteBatchCertificateOptions { +model BatchCertificateDeleteOptions { ...Azure.Batch.CommonParameters; } @@ -797,7 +797,7 @@ op deleteCertificateCustomization is Azure.Batch.DeleteOperation< ...Azure.Batch.DeleteCertificateRequiredParameters; @doc("Optional parameters for Delete Certificate operation.") - options?: DeleteBatchCertificateOptions; + options?: BatchCertificateDeleteOptions; }, Azure.Batch.DeleteCertificateResponse >; @@ -809,7 +809,7 @@ op deleteCertificateCustomization is Azure.Batch.DeleteOperation< // Get Certificate Operation @doc("Optional parameters for Get Certificate operation.") -model GetBatchCertificateOptions { +model BatchCertificateGetOptions { ...Azure.Batch.CommonParameters; ...Azure.Batch.GetCertificateOptionalParameters; } @@ -822,7 +822,7 @@ op getCertificateCustomization is Azure.Batch.ReadOperation< ...Azure.Batch.GetCertificateRequiredParameters; @doc("Optional parameters for Get Certificate operation.") - options?: GetBatchCertificateOptions; + options?: BatchCertificateGetOptions; }, Azure.Batch.BatchCertificate >; @@ -862,7 +862,7 @@ op jobScheduleExistsCustomization is Azure.Batch.ResourceInfoOperationWithAdditi // Delete Job Schedule Operation @doc("Optional parameters for Delete Job Schedule operation.") -model DeleteBatchJobScheduleOptions { +model BatchJobScheduleDeleteOptions { ...Azure.Batch.CommonParameters; ...Azure.Batch.DeleteJobScheduleOptionalParameters; } @@ -875,7 +875,7 @@ op deleteJobScheduleCustomization is Azure.Batch.DeleteOperation< ...Azure.Batch.DeleteJobScheduleRequiredParameters; @doc("Optional parameters for Delete Job Schedule operation.") - options?: DeleteBatchJobScheduleOptions; + options?: BatchJobScheduleDeleteOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -889,7 +889,7 @@ op deleteJobScheduleCustomization is Azure.Batch.DeleteOperation< // Get Job Schedule Operation @doc("Optional parameters for Get Job Schedule operation.") -model GetBatchJobScheduleOptions { +model BatchJobScheduleGetOptions { ...Azure.Batch.CommonParameters; ...Azure.Batch.GetJobScheduleOptionalParameters; } @@ -902,7 +902,7 @@ op getJobScheduleCustomization is Azure.Batch.ReadOperation< ...Azure.Batch.GetJobScheduleRequiredParameters; @doc("Optional parameters for Get Job Schedule operation.") - options?: GetBatchJobScheduleOptions; + options?: BatchJobScheduleGetOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -916,7 +916,7 @@ op getJobScheduleCustomization is Azure.Batch.ReadOperation< // Update Job Schedule Operation @doc("Optional parameters for Get Job Schedule operation.") -model UpdateBatchJobScheduleOptions { +model BatchJobScheduleUpdateOptions { ...Azure.Batch.CommonJsonParameters; } @@ -928,7 +928,7 @@ op updateJobScheduleCustomization is Azure.Batch.UpdateOperation< ...Azure.Batch.UpdateJobScheduleRequiredParameters; @doc("Optional parameters for Update Job Schedule operation.") - options?: UpdateBatchJobScheduleOptions; + options?: BatchJobScheduleUpdateOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -942,7 +942,7 @@ op updateJobScheduleCustomization is Azure.Batch.UpdateOperation< // Replace Job Schedule Operation @doc("Optional parameters for Replace Job Schedule operation.") -model ReplaceBatchJobScheduleOptions { +model BatchJobScheduleReplaceOptions { ...Azure.Batch.CommonJsonParameters; } @@ -954,7 +954,7 @@ op replaceJobScheduleCustomization is Azure.Batch.ReplaceOperation< ...Azure.Batch.ReplaceJobScheduleRequiredParameters; @doc("Optional parameters for Replace Job Schedule operation.") - options?: ReplaceBatchJobScheduleOptions; + options?: BatchJobScheduleReplaceOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -968,7 +968,7 @@ op replaceJobScheduleCustomization is Azure.Batch.ReplaceOperation< // Disable Job Schedule Operation @doc("Optional parameters for Disable Job Schedule operation.") -model DisableBatchJobScheduleOptions { +model BatchJobScheduleDisableOptions { ...Azure.Batch.CommonParameters; } @@ -980,7 +980,7 @@ op disableJobScheduleCustomization is Azure.Batch.PostOperation< ...Azure.Batch.DisableJobScheduleRequiredParameters; @doc("Optional parameters for Disable Job Schedule operation.") - options?: DisableBatchJobScheduleOptions; + options?: BatchJobScheduleDisableOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -994,7 +994,7 @@ op disableJobScheduleCustomization is Azure.Batch.PostOperation< // Enable Job Schedule Operation @doc("Optional parameters for Enable Job Schedule operation.") -model EnableBatchJobScheduleOptions { +model BatchJobScheduleEnableOptions { ...Azure.Batch.CommonParameters; } @@ -1006,7 +1006,7 @@ op enableJobScheduleCustomization is Azure.Batch.PostOperation< ...Azure.Batch.EnableJobScheduleRequiredParameters; @doc("Optional parameters for Enable Job Schedule operation.") - options?: EnableBatchJobScheduleOptions; + options?: BatchJobScheduleEnableOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -1020,7 +1020,7 @@ op enableJobScheduleCustomization is Azure.Batch.PostOperation< // Terminate Job Schedule Operation @doc("Optional parameters for Terminate Job Schedule operation.") -model TerminateBatchJobScheduleOptions { +model BatchJobScheduleTerminateOptions { ...Azure.Batch.CommonParameters; ...Azure.Batch.TerminateJobScheduleOptionalParameters; } @@ -1033,7 +1033,7 @@ op terminateJobScheduleCustomization is Azure.Batch.PostOperation< ...Azure.Batch.TerminateJobScheduleRequiredParameters; @doc("Optional parameters for Terminate Job Schedule operation.") - options?: TerminateBatchJobScheduleOptions; + options?: BatchJobScheduleTerminateOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -1047,7 +1047,7 @@ op terminateJobScheduleCustomization is Azure.Batch.PostOperation< // Create Job Schedule Operation @doc("Optional parameters for Create Job Schedule operation.") -model CreateBatchJobScheduleOptions { +model BatchJobScheduleCreateOptions { ...Azure.Batch.CommonJsonParameters; } @@ -1059,7 +1059,7 @@ op createJobScheduleCustomization is Azure.Batch.CreateOperation< ...Azure.Batch.CreateJobScheduleRequiredParameters; @doc("Optional parameters for Create Job Schedule operation.") - options?: CreateBatchJobScheduleOptions; + options?: BatchJobScheduleCreateOptions; }, void >; @@ -1071,7 +1071,7 @@ op createJobScheduleCustomization is Azure.Batch.CreateOperation< // List Job Schedules Operation @doc("Optional parameters for List Job Schedules operation.") -model ListBatchJobSchedulesOptions { +model BatchJobSchedulesListOptions { ...Azure.Batch.CommonListParameters; ...Azure.Batch.ListJobSchedulesOptionalParameters; } @@ -1082,7 +1082,7 @@ model ListBatchJobSchedulesOptions { op listJobSchedulesCustomization is Azure.Batch.ListOperation< { @doc("Optional parameters for List Job Schedules operation.") - options?: ListBatchJobSchedulesOptions; + options?: BatchJobSchedulesListOptions; }, Azure.Batch.BatchJobScheduleListResult >; @@ -1094,7 +1094,7 @@ op listJobSchedulesCustomization is Azure.Batch.ListOperation< // Create Task Operation @doc("Optional parameters for Create Task operation.") -model CreateBatchTaskOptions { +model BatchTaskCreateOptions { ...Azure.Batch.CommonJsonParameters; } @@ -1106,7 +1106,7 @@ op createTaskCustomization is Azure.Batch.CreateOperation< ...Azure.Batch.CreateTaskRequiredParameters; @doc("Optional parameters for Create Task operation.") - options?: CreateBatchTaskOptions; + options?: BatchTaskCreateOptions; }, void >; @@ -1115,7 +1115,7 @@ op createTaskCustomization is Azure.Batch.CreateOperation< // List Tasks Operation @doc("Optional parameters for List Tasks operation.") -model ListBatchTasksOptions { +model BatchTasksListOptions { ...Azure.Batch.CommonListParameters; ...Azure.Batch.ListTasksOptionalParameters; } @@ -1128,7 +1128,7 @@ op listTasksCustomization is Azure.Batch.ListOperation< ...Azure.Batch.ListTasksRequiredParameters; @doc("Optional parameters for List Tasks operation.") - options?: ListBatchTasksOptions; + options?: BatchTasksListOptions; }, Azure.Batch.BatchTaskListResult >; @@ -1137,7 +1137,7 @@ op listTasksCustomization is Azure.Batch.ListOperation< // Create Task Collection Operation @doc("Optional parameters for Create Task Collection operation.") -model CreateBatchTaskCollectionOptions { +model BatchTaskCollectionCreateOptions { ...Azure.Batch.CommonJsonParameters; } @@ -1149,9 +1149,9 @@ op createTaskCollectionCustomization is Azure.Batch.PostOperation< ...Azure.Batch.CreateTaskCollectionRequiredParameters; @doc("Optional parameters for Create Task Collection operation.") - options?: CreateBatchTaskCollectionOptions; + options?: BatchTaskCollectionCreateOptions; }, - Azure.Batch.BatchTaskAddCollectionResult + Azure.Batch.BatchCreateTaskCollectionResult >; @@override(Azure.Batch.Tasks.createTaskCollection, @@ -1161,7 +1161,7 @@ op createTaskCollectionCustomization is Azure.Batch.PostOperation< // Delete Task Operation @doc("Optional parameters for Delete Task operation.") -model DeleteBatchTaskOptions { +model BatchTaskDeleteOptions { ...Azure.Batch.CommonParameters; } @@ -1173,7 +1173,7 @@ op deleteTaskCustomization is Azure.Batch.DeleteOperation< ...Azure.Batch.DeleteTaskRequiredParameters; @doc("Optional parameters for Delete Task operation.") - options?: DeleteBatchTaskOptions; + options?: BatchTaskDeleteOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -1184,7 +1184,7 @@ op deleteTaskCustomization is Azure.Batch.DeleteOperation< // Get Task Operation @doc("Optional parameters for Get Task operation.") -model GetBatchTaskOptions { +model BatchTaskGetOptions { ...Azure.Batch.CommonParameters; ...Azure.Batch.GetTaskOptionalParameters; } @@ -1197,7 +1197,7 @@ op getTaskCustomization is Azure.Batch.ReadOperation< ...Azure.Batch.GetTaskRequiredParameters; @doc("Optional parameters for Get Task operation.") - options?: GetBatchTaskOptions; + options?: BatchTaskGetOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -1208,7 +1208,7 @@ op getTaskCustomization is Azure.Batch.ReadOperation< // Replace Task Operation @doc("Optional parameters for Replace Task operation.") -model ReplaceBatchTaskOptions { +model BatchTaskReplaceOptions { ...Azure.Batch.CommonJsonParameters; } @@ -1220,7 +1220,7 @@ op replaceTaskCustomization is Azure.Batch.ReplaceOperation< ...Azure.Batch.ReplaceTaskRequiredParameters; @doc("Optional parameters for Replace Task operation.") - options?: ReplaceBatchTaskOptions; + options?: BatchTaskReplaceOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -1231,7 +1231,7 @@ op replaceTaskCustomization is Azure.Batch.ReplaceOperation< // List SubTasks Operation @doc("Optional parameters for List SubTasks operation.") -model ListBatchSubTasksOptions { +model BatchSubTasksListOptions { ...Azure.Batch.CommonParameters; ...Azure.Batch.ListSubTasksOptionalParameters; } @@ -1244,7 +1244,7 @@ op listSubTasksCustomization is Azure.Batch.ReadOperation< ...Azure.Batch.ListSubTasksRequiredParameters; @doc("Optional parameters for List SubTasks operation.") - options?: ListBatchSubTasksOptions; + options?: BatchSubTasksListOptions; }, Azure.Batch.BatchTaskListSubtasksResult >; @@ -1253,7 +1253,7 @@ op listSubTasksCustomization is Azure.Batch.ReadOperation< // Terminate Task Operation @doc("Optional parameters for Terminate Task operation.") -model TerminateBatchTaskOptions { +model BatchTaskTerminateOptions { ...Azure.Batch.CommonParameters; } @@ -1265,7 +1265,7 @@ op terminateTaskCustomization is Azure.Batch.PostOperation< ...Azure.Batch.TerminateTaskRequiredParameters; @doc("Optional parameters for Terminate Task operation.") - options?: TerminateBatchTaskOptions; + options?: BatchTaskTerminateOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -1276,7 +1276,7 @@ op terminateTaskCustomization is Azure.Batch.PostOperation< // Reactivate Task Operation @doc("Optional parameters for Reactivate Task operation.") -model ReactivateBatchTaskOptions { +model BatchTaskReactivateOptions { ...Azure.Batch.CommonParameters; } @@ -1288,7 +1288,7 @@ op reactivateTaskCustomization is Azure.Batch.PostOperation< ...Azure.Batch.ReactivateTaskRequiredParameters; @doc("Optional parameters for Reactivate Task operation.") - options?: ReactivateBatchTaskOptions; + options?: BatchTaskReactivateOptions; ...Azure.Batch.BatchMatchHeaders; }, @@ -1302,7 +1302,7 @@ op reactivateTaskCustomization is Azure.Batch.PostOperation< // Delete Task File Operation @doc("Optional parameters for Delete Task File operation.") -model DeleteBatchTaskFileOptions { +model BatchTaskFileDeleteOptions { ...Azure.Batch.CommonParameters; ...Azure.Batch.DeleteTaskFileOptionalParameters; } @@ -1315,7 +1315,7 @@ op deleteTaskFileCustomization is Azure.Batch.DeleteOperation< ...Azure.Batch.BatchTaskFileClientPathContent; @doc("Optional parameters for Delete Task File operation.") - options?: DeleteBatchTaskFileOptions; + options?: BatchTaskFileDeleteOptions; }, Azure.Batch.DeleteTaskFileResponse >; @@ -1327,7 +1327,7 @@ op deleteTaskFileCustomization is Azure.Batch.DeleteOperation< // Get Task File Operation @doc("Optional parameters for Get Task File operation.") -model GetBatchTaskFileOptions { +model BatchTaskFileGetOptions { ...Azure.Batch.CommonParameters; ...Azure.Batch.BatchModifiedSinceHeaders; ...Azure.Batch.GetTaskFileOptionalParameters; @@ -1341,7 +1341,7 @@ op getTaskFileCustomization is Azure.Batch.FileOperation< ...Azure.Batch.BatchTaskFileClientPathContent; @doc("Optional parameters for Get Task File operation.") - options?: GetBatchTaskFileOptions; + options?: BatchTaskFileGetOptions; }, Azure.Batch.GetTaskFileResponse >; @@ -1350,7 +1350,7 @@ op getTaskFileCustomization is Azure.Batch.FileOperation< // Get Task File Properties Operation @doc("Optional parameters for Get Task File Properties operation.") -model GetBatchTaskFilePropertiesOptions { +model BatchTaskFilePropertiesGetOptions { ...Azure.Batch.CommonParameters; ...Azure.Batch.BatchModifiedSinceHeaders; } @@ -1363,7 +1363,7 @@ op getTaskFilePropertiesCustomization is Azure.Batch.HeadFileOperation< ...Azure.Batch.BatchTaskFileClientPathContent; @doc("Optional parameters for Get Task File Properties operation.") - options?: GetBatchTaskFilePropertiesOptions; + options?: BatchTaskFilePropertiesGetOptions; }, {} >; @@ -1375,7 +1375,7 @@ op getTaskFilePropertiesCustomization is Azure.Batch.HeadFileOperation< // List Task Files Operation @doc("Optional parameters for List Task Files operation.") -model ListBatchTaskFilesOptions { +model BatchTaskFilesListOptions { ...Azure.Batch.CommonListParameters; ...Azure.Batch.ListTaskFilesOptionalParameters; } @@ -1388,7 +1388,7 @@ op listTaskFilesCustomization is Azure.Batch.ListOperation< ...Azure.Batch.ListTaskFilesRequiredParameters; @doc("Optional parameters for List Task Files operation.") - options?: ListBatchTaskFilesOptions; + options?: BatchTaskFilesListOptions; }, Azure.Batch.BatchNodeFileListResult >; @@ -1397,7 +1397,7 @@ op listTaskFilesCustomization is Azure.Batch.ListOperation< // Create Node User Operation @doc("Optional parameters for Create Node User operation.") -model CreateBatchNodeUserOptions { +model BatchNodeUserCreateOptions { ...Azure.Batch.CommonJsonParameters; } @@ -1409,7 +1409,7 @@ op createNodeUserCustomization is Azure.Batch.CreateOperation< ...Azure.Batch.CreateNodeUserRequiredParameters; @doc("Optional parameters for Create Node User operation.") - options?: CreateBatchNodeUserOptions; + options?: BatchNodeUserCreateOptions; }, void >; @@ -1421,7 +1421,7 @@ op createNodeUserCustomization is Azure.Batch.CreateOperation< // Delete Node User Operation @doc("Optional parameters for Delete Node User operation.") -model DeleteBatchNodeUserOptions { +model BatchNodeUserDeleteOptions { ...Azure.Batch.CommonParameters; } @@ -1433,7 +1433,7 @@ op deleteNodeUserCustomization is Azure.Batch.DeleteOperation< ...Azure.Batch.DeleteNodeUserRequiredParameters; @doc("Optional parameters for Delete Node User operation.") - options?: DeleteBatchNodeUserOptions; + options?: BatchNodeUserDeleteOptions; }, Azure.Batch.DeleteNodeUserResponse >; @@ -1445,7 +1445,7 @@ op deleteNodeUserCustomization is Azure.Batch.DeleteOperation< // Replace Node User Operation @doc("Optional parameters for Replace Node User operation.") -model ReplaceBatchNodeUserOptions { +model BatchNodeUserReplaceOptions { ...Azure.Batch.CommonJsonParameters; } @@ -1457,7 +1457,7 @@ op replaceNodeUserCustomization is Azure.Batch.ReplaceOperation< ...Azure.Batch.ReplaceNodeUserRequiredParameters; @doc("Optional parameters for Replace Node User operation.") - options?: ReplaceBatchNodeUserOptions; + options?: BatchNodeUserReplaceOptions; }, Azure.Batch.RequestSuccessResponseHeaders >; @@ -1469,7 +1469,7 @@ op replaceNodeUserCustomization is Azure.Batch.ReplaceOperation< // Get Node Operation @doc("Optional parameters for Get Node operation.") -model GetBatchNodeOptions { +model BatchNodeGetOptions { ...Azure.Batch.CommonParameters; ...Azure.Batch.GetNodeOptionalParameters; } @@ -1482,7 +1482,7 @@ op getNodeCustomization is Azure.Batch.ReadOperation< ...Azure.Batch.GetNodeRequiredParameters; @doc("Optional parameters for Get Node operation.") - options?: GetBatchNodeOptions; + options?: BatchNodeGetOptions; }, Azure.Batch.BatchNode >; @@ -1491,7 +1491,7 @@ op getNodeCustomization is Azure.Batch.ReadOperation< // Reboot Node Operation @doc("Optional parameters for Reboot Node operation.") -model RebootBatchNodeOptions { +model BatchNodeRebootOptions { ...Azure.Batch.CommonJsonParameters; ...Azure.Batch.RebootNodeOptionalParameters; } @@ -1504,7 +1504,7 @@ op rebootNodeCustomization is Azure.Batch.PostOperation< ...Azure.Batch.RebootNodeRequiredParameters; @doc("Optional parameters for Reboot Node operation.") - options?: RebootBatchNodeOptions; + options?: BatchNodeRebootOptions; }, Azure.Batch.AcceptedProcessingResponseHeaders >; @@ -1513,7 +1513,7 @@ op rebootNodeCustomization is Azure.Batch.PostOperation< // Start Node Operation @doc("Optional parameters for Start Node operation.") -model StartBatchNodeOptions { +model BatchNodeStartOptions { ...Azure.Batch.CommonParameters; } @@ -1525,7 +1525,7 @@ op startNodeCustomization is Azure.Batch.PostOperation< ...Azure.Batch.StartNodeRequiredParameters; @doc("Optional parameters for Start Node operation.") - options?: StartBatchNodeOptions; + options?: BatchNodeStartOptions; }, Azure.Batch.AcceptedProcessingResponseHeaders >; @@ -1534,7 +1534,7 @@ op startNodeCustomization is Azure.Batch.PostOperation< // Deallocate Node Operation @doc("Optional parameters for Deallocate Node operation.") -model DeallocateBatchNodeOptions { +model BatchNodeDeallocateOptions { ...Azure.Batch.CommonJsonParameters; ...Azure.Batch.DeallocateNodeOptionalParameters; } @@ -1547,7 +1547,7 @@ op deallocateNodeCustomization is Azure.Batch.PostOperation< ...Azure.Batch.DeallocateNodeRequiredParameters; @doc("Optional parameters for Deallocate Node operation.") - options?: DeallocateBatchNodeOptions; + options?: BatchNodeDeallocateOptions; }, Azure.Batch.AcceptedProcessingResponseHeaders >; @@ -1559,7 +1559,7 @@ op deallocateNodeCustomization is Azure.Batch.PostOperation< // Reimage Node Operation @doc("Optional parameters for Reimage Node operation.") -model ReimageBatchNodeOptions { +model BatchNodeReimageOptions { ...Azure.Batch.CommonJsonParameters; ...Azure.Batch.ReimageNodeOptionalParameters; } @@ -1572,7 +1572,7 @@ op reimageNodeCustomization is Azure.Batch.PostOperation< ...Azure.Batch.ReimageNodeRequiredParameters; @doc("Optional parameters for Reimage Node operation.") - options?: ReimageBatchNodeOptions; + options?: BatchNodeReimageOptions; }, Azure.Batch.AcceptedProcessingResponseHeaders >; @@ -1581,7 +1581,7 @@ op reimageNodeCustomization is Azure.Batch.PostOperation< // Disable Node Scheduling Operation @doc("Optional parameters for Disable Node Scheduling operation.") -model DisableBatchNodeSchedulingOptions { +model BatchNodeSchedulingDisableOptions { ...Azure.Batch.CommonJsonParameters; ...Azure.Batch.DisableNodeSchedulingOptionalParameters; } @@ -1594,7 +1594,7 @@ op disableNodeSchedulingCustomization is Azure.Batch.PostOperation< ...Azure.Batch.DisableNodeSchedulingRequiredParameters; @doc("Optional parameters for Disable Node Scheduling operation.") - options?: DisableBatchNodeSchedulingOptions; + options?: BatchNodeSchedulingDisableOptions; }, Azure.Batch.RequestSuccessResponseHeaders >; @@ -1606,7 +1606,7 @@ op disableNodeSchedulingCustomization is Azure.Batch.PostOperation< // Enable Node Scheduling Operation @doc("Optional parameters for Enable Node Scheduling operation.") -model EnableBatchNodeSchedulingOptions { +model BatchNodeSchedulingEnableOptions { ...Azure.Batch.CommonParameters; } @@ -1618,7 +1618,7 @@ op enableNodeSchedulingCustomization is Azure.Batch.PostOperation< ...Azure.Batch.EnableNodeSchedulingRequiredParameters; @doc("Optional parameters for Enable Node Scheduling operation.") - options?: EnableBatchNodeSchedulingOptions; + options?: BatchNodeSchedulingEnableOptions; }, Azure.Batch.RequestSuccessResponseHeaders >; @@ -1630,7 +1630,7 @@ op enableNodeSchedulingCustomization is Azure.Batch.PostOperation< // Get Node Remote Login Settings Operation @doc("Optional parameters for Get Node Remote Login Settings operation.") -model GetBatchNodeRemoteLoginSettingsOptions { +model BatchNodeRemoteLoginSettingsGetOptions { ...Azure.Batch.CommonParameters; } @@ -1642,7 +1642,7 @@ op getNodeRemoteLoginSettingsCustomization is Azure.Batch.ReadOperation< ...Azure.Batch.GetNodeRemoteLoginSettingsRequiredParameters; @doc("Optional parameters for Get Node Remote Login Settings operation.") - options?: GetBatchNodeRemoteLoginSettingsOptions; + options?: BatchNodeRemoteLoginSettingsGetOptions; }, Azure.Batch.BatchNodeRemoteLoginSettings >; @@ -1654,7 +1654,7 @@ op getNodeRemoteLoginSettingsCustomization is Azure.Batch.ReadOperation< // Upload Node Logs Operation @doc("Optional parameters for Upload Node Logs operation.") -model UploadBatchNodeLogsOptions { +model BatchNodeLogsUploadOptions { ...Azure.Batch.CommonJsonParameters; } @@ -1666,7 +1666,7 @@ op uploadNodeLogsCustomization is Azure.Batch.PostOperation< ...Azure.Batch.UploadNodeLogsRequiredParameters; @doc("Optional parameters for Upload Node Logs operation.") - options?: UploadBatchNodeLogsOptions; + options?: BatchNodeLogsUploadOptions; }, Azure.Batch.UploadBatchServiceLogsResult >; @@ -1678,7 +1678,7 @@ op uploadNodeLogsCustomization is Azure.Batch.PostOperation< // List Nodes Operation @doc("Optional parameters for List Nodes operation.") -model ListBatchNodesOptions { +model BatchNodesListOptions { ...Azure.Batch.CommonListParameters; ...Azure.Batch.ListNodesOptionalParameters; } @@ -1691,7 +1691,7 @@ op listNodesCustomization is Azure.Batch.ListOperation< ...Azure.Batch.ListNodesRequiredParameters; @doc("Optional parameters for List Nodes operation.") - options?: ListBatchNodesOptions; + options?: BatchNodesListOptions; }, Azure.Batch.BatchNodeListResult >; @@ -1700,7 +1700,7 @@ op listNodesCustomization is Azure.Batch.ListOperation< // Get Node Extension Operation @doc("Optional parameters for Get Node Extension operation.") -model GetBatchNodeExtensionOptions { +model BatchNodeExtensionGetOptions { ...Azure.Batch.CommonParameters; ...Azure.Batch.GetNodeExtensionOptionalParameters; } @@ -1713,7 +1713,7 @@ op getNodeExtensionCustomization is Azure.Batch.ReadOperation< ...Azure.Batch.GetNodeExtensionRequiredParameters; @doc("Optional parameters for Get Node Extension operation.") - options?: GetBatchNodeExtensionOptions; + options?: BatchNodeExtensionGetOptions; }, Azure.Batch.BatchNodeVMExtension >; @@ -1725,7 +1725,7 @@ op getNodeExtensionCustomization is Azure.Batch.ReadOperation< // List Node Extensions Operation @doc("Optional parameters for List Node Extensions operation.") -model ListBatchNodeExtensionsOptions { +model BatchNodeExtensionsListOptions { ...Azure.Batch.CommonListParameters; ...Azure.Batch.ListNodeExtensionsOptionalParameters; } @@ -1738,7 +1738,7 @@ op listNodeExtensionsCustomization is Azure.Batch.ListOperation< ...Azure.Batch.ListNodeExtensionsRequiredParameters; @doc("Optional parameters for List Node Extensions operation.") - options?: ListBatchNodeExtensionsOptions; + options?: BatchNodeExtensionsListOptions; }, Azure.Batch.BatchNodeVMExtensionListResult >; @@ -1750,7 +1750,7 @@ op listNodeExtensionsCustomization is Azure.Batch.ListOperation< // Delete Node File Operation @doc("Optional parameters for Delete Node File operation.") -model DeleteBatchNodeFileOptions { +model BatchNodeFileDeleteOptions { ...Azure.Batch.CommonParameters; ...Azure.Batch.DeleteNodeFileOptionalParameters; } @@ -1763,7 +1763,7 @@ op deleteNodeFileCustomization is Azure.Batch.DeleteOperation< ...Azure.Batch.BatchNodeFileClientPathContent; @doc("Optional parameters for Delete Node File operation.") - options?: DeleteBatchNodeFileOptions; + options?: BatchNodeFileDeleteOptions; }, Azure.Batch.DeleteNodeFileResponse >; @@ -1775,7 +1775,7 @@ op deleteNodeFileCustomization is Azure.Batch.DeleteOperation< // Get Node File Operation @doc("Optional parameters for Get Node File operation.") -model GetBatchNodeFileOptions { +model BatchNodeFileGetOptions { ...Azure.Batch.CommonParameters; ...Azure.Batch.BatchModifiedSinceHeaders; ...Azure.Batch.GetNodeFileOptionalParameters; @@ -1789,7 +1789,7 @@ op getNodeFileCustomization is Azure.Batch.FileOperation< ...Azure.Batch.BatchNodeFileClientPathContent; @doc("Optional parameters for Get Node File operation.") - options?: GetBatchNodeFileOptions; + options?: BatchNodeFileGetOptions; }, Azure.Batch.GetNodeFileResponse >; @@ -1798,7 +1798,7 @@ op getNodeFileCustomization is Azure.Batch.FileOperation< // Get Node File Properties Operation @doc("Optional parameters for Get Node File Properties operation.") -model GetBatchNodeFilePropertiesOptions { +model BatchNodeFilePropertiesGetOptions { ...Azure.Batch.CommonParameters; ...Azure.Batch.BatchModifiedSinceHeaders; } @@ -1811,7 +1811,7 @@ op getNodeFilePropertiesCustomization is Azure.Batch.HeadFileOperation< ...Azure.Batch.BatchNodeFileClientPathContent; @doc("Optional parameters for Get Node File Properties operation.") - options?: GetBatchNodeFilePropertiesOptions; + options?: BatchNodeFilePropertiesGetOptions; }, {} >; @@ -1823,7 +1823,7 @@ op getNodeFilePropertiesCustomization is Azure.Batch.HeadFileOperation< // List Node Files Operation @doc("Optional parameters for List Node Files operation.") -model ListBatchNodeFilesOptions { +model BatchNodeFilesListOptions { ...Azure.Batch.CommonListParameters; ...Azure.Batch.ListNodeFilesOptionalParameters; } @@ -1836,9 +1836,147 @@ op listNodeFilesCustomization is Azure.Batch.ListOperation< ...Azure.Batch.ListNodeFilesRequiredParameters; @doc("Optional parameters for List Node Files operation.") - options?: ListBatchNodeFilesOptions; + options?: BatchNodeFilesListOptions; }, Azure.Batch.BatchNodeFileListResult >; @@override(Azure.Batch.Nodes.listNodeFiles, listNodeFilesCustomization, "java"); + +// Client Name Overrides + +// Rename Parameter models to avoid conflicts with Options bag names +@@clientName(Azure.Batch.BatchJobScheduleUpdateOptions, + "BatchJobScheduleUpdateParameters", + "java" +); +@@clientName(Azure.Batch.BatchJobScheduleCreateOptions, + "BatchJobScheduleCreateParameters", + "java" +); +@@clientName(Azure.Batch.BatchJobCreateOptions, + "BatchJobCreateParameters", + "java" +); +@@clientName(Azure.Batch.BatchJobUpdateOptions, + "BatchJobUpdateParameters", + "java" +); +@@clientName(Azure.Batch.BatchJobDisableOptions, + "BatchJobDisableParameters", + "java" +); +@@clientName(Azure.Batch.BatchJobTerminateOptions, + "BatchJobTerminateParameters", + "java" +); +@@clientName(Azure.Batch.BatchPoolCreateOptions, + "BatchPoolCreateParameters", + "java" +); +@@clientName(Azure.Batch.BatchPoolReplaceOptions, + "BatchPoolReplaceParameters", + "java" +); +@@clientName(Azure.Batch.BatchPoolUpdateOptions, + "BatchPoolUpdateParameters", + "java" +); +@@clientName(Azure.Batch.BatchPoolEnableAutoScaleOptions, + "BatchPoolEnableAutoScaleParameters", + "java" +); +@@clientName(Azure.Batch.BatchPoolEvaluateAutoScaleOptions, + "BatchPoolEvaluateAutoScaleParameters", + "java" +); +@@clientName(Azure.Batch.BatchPoolResizeOptions, + "BatchPoolResizeParameters", + "java" +); +@@clientName(Azure.Batch.BatchNodeRemoveOptions, + "BatchNodeRemoveParameters", + "java" +); +@@clientName(Azure.Batch.BatchNodeDeallocateOptions, + "BatchNodeDeallocateParameters", + "java" +); +@@clientName(Azure.Batch.BatchTaskCreateOptions, + "BatchTaskCreateParameters", + "java" +); +@@clientName(Azure.Batch.BatchNodeUserCreateOptions, + "BatchNodeUserCreateParameters", + "java" +); +@@clientName(Azure.Batch.BatchNodeUserUpdateOptions, + "BatchNodeUserUpdateParameters", + "java" +); +@@clientName(Azure.Batch.BatchNodeRebootOptions, + "BatchNodeRebootParameters", + "java" +); +@@clientName(Azure.Batch.BatchNodeReimageOptions, + "BatchNodeReimageParameters", + "java" +); +@@clientName(Azure.Batch.BatchNodeDisableSchedulingOptions, + "BatchNodeDisableSchedulingParameters", + "java" +); +@@clientName(Azure.Batch.UploadBatchServiceLogsOptions, + "UploadBatchServiceLogsParameters", + "java" +); + +// Rename options to parameters in Java to avoid having two 'options' +@@clientName(Azure.Batch.EnablePoolAutoscaleRequiredParameters.enableAutoScaleOptions, + "parameters", + "java" +); +@@clientName(Azure.Batch.EvaluatePoolAutoScaleRequiredParameters.evaluateAutoScaleOptions, + "parameters", + "java" +); +@@clientName(Azure.Batch.ResizePoolRequiredParameters.resizeOptions, + "parameters", + "java" +); +@@clientName(Azure.Batch.RemoveNodesRequiredParameters.removeOptions, + "parameters", + "java" +); +@@clientName(Azure.Batch.DisableJobRequiredParameters.disableOptions, + "parameters", + "java" +); +@@clientName(Azure.Batch.ReplaceNodeUserRequiredParameters.updateOptions, + "parameters", + "java" +); +@@clientName(Azure.Batch.UploadNodeLogsRequiredParameters.uploadOptions, + "parameters", + "java" +); +@@clientName(Azure.Batch.TerminateJobOptionalParameters.options, + "parameters", + "java" +); +@@clientName(Azure.Batch.RebootNodeOptionalParameters.options, + "parameters", + "java" +); +@@clientName(Azure.Batch.DeallocateNodeOptionalParameters.options, + "parameters", + "java" +); +@@clientName(Azure.Batch.ReimageNodeOptionalParameters.options, + "parameters", + "java" +); +@@clientName(Azure.Batch.DisableNodeSchedulingOptionalParameters.options, + "parameters", + "java" +); diff --git a/specification/batch/Azure.Batch/models.tsp b/specification/batch/Azure.Batch/models.tsp index c9a2b2ee2033..ed2041545be0 100644 --- a/specification/batch/Azure.Batch/models.tsp +++ b/specification/batch/Azure.Batch/models.tsp @@ -3,6 +3,7 @@ import "@azure-tools/typespec-client-generator-core"; using Azure.ClientGenerator.Core; using Azure.Core; +using Azure.Core.Foundations; namespace Azure.Batch; @@ -74,7 +75,7 @@ union BatchJobScheduleState { } @doc("The action the Batch service should take when all Tasks in the Job are in the completed state.") -union OnAllBatchTasksComplete { +union BatchAllTasksCompleteMode { string, @doc("Do nothing. The Job remains active unless terminated or disabled by some other means.") @@ -84,8 +85,8 @@ union OnAllBatchTasksComplete { TerminateJob: "terminatejob", } -@doc("OnTaskFailure enums") -union OnBatchTaskFailure { +@doc("TaskFailure enums") +union BatchTaskFailureMode { string, @doc("Do nothing. The Job remains active unless terminated or disabled by some other means.") @@ -303,8 +304,8 @@ union ContainerType { CriCompatible: "criCompatible", } -@doc("AccessScope enums") -union AccessScope { +@doc("BatchAccessScope enums") +union BatchAccessScope { string, @doc("Grants access to perform all operations on the Job containing the Task.") @@ -387,8 +388,8 @@ union BatchJobState { Deleting: "deleting", } -@doc("ErrorCategory enums") -union ErrorCategory { +@doc("BatchErrorSourceCategory enums") +union BatchErrorSourceCategory { string, @doc("The error is due to a user issue, such as misconfiguration.") @@ -516,7 +517,7 @@ union BatchNodeDeallocateOption { } @doc("BatchJobAction enums") -union BatchJobAction { +union BatchJobActionKind { string, @doc("Take no action.") @@ -674,8 +675,8 @@ union BatchStartTaskState { Completed: "completed", } -@doc("BatchNodeRebootOption enums") -union BatchNodeRebootOption { +@doc("BatchNodeRebootKind enums") +union BatchNodeRebootKind { string, @doc("Terminate running Task processes and requeue the Tasks. The Tasks will run again when a Compute Node is available. Restart the Compute Node as soon as Tasks have been terminated.") @@ -869,7 +870,7 @@ model BatchSupportedImage { nodeAgentSKUId: string; @doc("The reference to the Azure Virtual Machine's Marketplace Image.") - imageReference: ImageReference; + imageReference: BatchVmImageReference; @doc("The type of operating system (e.g. Windows or Linux) of the Image.") osType: OSType; @@ -889,7 +890,7 @@ model BatchSupportedImage { To get the list of all Azure Marketplace Image references verified by Azure Batch, see the ' List Supported Images ' operation. """) -model ImageReference { +model BatchVmImageReference { @doc("The publisher of the Azure Virtual Machines Marketplace Image. For example, Canonical or MicrosoftWindowsServer.") publisher?: string; @@ -903,7 +904,7 @@ model ImageReference { version?: string; @doc("The ARM resource identifier of the Azure Compute Gallery Image. Compute Nodes in the Pool will be created using this Image Id. This is of the form /subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/galleries/{galleryName}/images/{imageDefinitionName}/versions/{VersionId} or /subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/galleries/{galleryName}/images/{imageDefinitionName} for always defaulting to the latest image version. This property is mutually exclusive with other ImageReference properties. The Azure Compute Gallery Image must have replicas in the same region and must be in the same subscription as the Azure Batch account. If the image version is not specified in the imageId, the latest version will be used. For information about the firewall settings for the Batch Compute Node agent to communicate with the Batch service see https://learn.microsoft.com/azure/batch/nodes-and-pools#virtual-network-vnet-and-firewall-configuration.") - virtualMachineImageId?: string; + virtualMachineImageId?: Azure.Core.armResourceIdentifier; @doc("The specific version of the platform image or marketplace image used to create the node. This read-only field differs from 'version' only if the value specified for 'version' when the pool was created was 'latest'.") @visibility(Lifecycle.Read) @@ -1000,7 +1001,8 @@ model BatchNodeCounts { @doc("Contains utilization and resource usage statistics for the lifetime of a Pool.") model BatchPoolStatistics { @doc("The URL for the statistics.") - url: string; + @clientName("uri", "csharp") + url: url; @doc("The start time of the time range covered by the statistics.") startTime: utcDateTime; @@ -1009,9 +1011,11 @@ model BatchPoolStatistics { lastUpdateTime: utcDateTime; @doc("Statistics related to Pool usage, such as the amount of core-time used.") + @clientName("usageStatistics") usageStats?: BatchPoolUsageStatistics; @doc("Statistics related to resource consumption by Compute Nodes in the Pool.") + @clientName("resourceStatistics") resourceStats?: BatchPoolResourceStatistics; } @@ -1054,10 +1058,12 @@ model BatchPoolResourceStatistics { @doc("The total number of disk read operations across all Compute Nodes in the Pool.") @encode(string) + @clientName("diskReadIops") diskReadIOps: int64; @doc("The total number of disk write operations across all Compute Nodes in the Pool.") @encode(string) + @clientName("diskWriteIops") diskWriteIOps: int64; @doc("The total amount of data in GiB of disk reads across all Compute Nodes in the Pool.") @@ -1077,7 +1083,8 @@ model BatchPoolResourceStatistics { @doc("Resource usage statistics for a Job.") model BatchJobStatistics { @doc("The URL of the statistics.") - url: string; + @clientName("uri", "csharp") + url: url; @doc("The start time of the time range covered by the statistics.") startTime: utcDateTime; @@ -1098,28 +1105,35 @@ model BatchJobStatistics { @doc("The total number of disk read operations made by all Tasks in the Job.") @encode(string) + @clientName("readIops") readIOps: int64; @doc("The total number of disk write operations made by all Tasks in the Job.") @encode(string) + @clientName("writeIops") writeIOps: int64; @doc("The total amount of data in GiB read from disk by all Tasks in the Job.") + @clientName("readIoGiB") readIOGiB: float32; @doc("The total amount of data in GiB written to disk by all Tasks in the Job.") + @clientName("writeIoGiB") writeIOGiB: float32; @doc("The total number of Tasks successfully completed in the Job during the given time range. A Task completes successfully if it returns exit code 0.") @encode(string) + @clientName("succeededTasksCount") numSucceededTasks: int64; @doc("The total number of Tasks in the Job that failed during the given time range. A Task fails if it exhausts its maximum retry count without returning exit code 0.") @encode(string) + @clientName("failedTasksCount") numFailedTasks: int64; @doc("The total number of retries on all the Tasks in the Job during the given time range.") @encode(string) + @clientName("taskRetriesCount") numTaskRetries: int64; @doc("The total wait time of all Tasks in the Job. The wait time for a Task is defined as the elapsed time between the creation of the Task and the start of Task execution. (If the Task is retried due to failures, the wait time is the time to the most recent Task execution.) This value is only reported in the Account lifetime statistics; it is not included in the Job statistics.") @@ -1139,7 +1153,8 @@ model BatchCertificate { @doc("The URL of the Certificate.") @visibility(Lifecycle.Read) - url?: string; + @clientName("uri", "csharp") + url?: url; @doc("The state of the Certificate.") @visibility(Lifecycle.Read) @@ -1163,11 +1178,11 @@ model BatchCertificate { @doc("The error that occurred on the last attempt to delete this Certificate. This property is set only if the Certificate is in the DeleteFailed state.") @visibility(Lifecycle.Read) - deleteCertificateError?: DeleteBatchCertificateError; + deleteCertificateError?: BatchCertificateDeleteError; @doc("The base64-encoded contents of the Certificate. The maximum size is 10KB.") @visibility(Lifecycle.Create) - data: string; + data: bytes; @doc("The format of the Certificate data.") @visibility(Lifecycle.Create) @@ -1179,7 +1194,7 @@ model BatchCertificate { } @doc("An error encountered by the Batch service when deleting a Certificate.") -model DeleteBatchCertificateError { +model BatchCertificateDeleteError { @doc("An identifier for the Certificate deletion error. Codes are invariant and are intended to be consumed programmatically.") code?: string; @@ -1234,7 +1249,8 @@ model BatchNodeFile { name?: string; @doc("The URL of the file.") - url?: string; + @clientName("uri", "csharp") + url?: url; @doc("Whether the object represents a directory.") isDirectory?: boolean; @@ -1277,11 +1293,12 @@ model BatchJobSchedule { @doc("The URL of the Job Schedule.") @visibility(Lifecycle.Read) - url?: string; + @clientName("uri", "csharp") + url?: url; @doc("The ETag of the Job Schedule. This is an opaque string. You can use it to detect whether the Job Schedule has changed between requests. In particular, you can be pass the ETag with an Update Job Schedule request to specify that your changes should take effect only if nobody else has modified the schedule in the meantime.") @visibility(Lifecycle.Read) - eTag?: string; + eTag?: eTag; @doc("The last modified time of the Job Schedule. This is the last time at which the schedule level data, such as the Job specification or recurrence information, changed. It does not factor in job-level changes such as new Jobs being created or Jobs changing state.") @visibility(Lifecycle.Read) @@ -1318,17 +1335,18 @@ model BatchJobSchedule { executionInfo?: BatchJobScheduleExecutionInfo; @doc("A list of name-value pairs associated with the schedule as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.") - metadata?: MetadataItem[]; + metadata?: BatchMetadataItem[]; @doc("The lifetime resource usage statistics for the Job Schedule. The statistics may not be immediately available. The Batch service performs periodic roll-up of statistics. The typical delay is about 30 minutes.") @visibility(Lifecycle.Read) + @clientName("jobScheduleStatistics") stats?: BatchJobScheduleStatistics; } @doc(""" Parameters for updating an Azure Batch Job Schedule. """) -model BatchJobScheduleUpdateContent { +model BatchJobScheduleUpdateOptions { @doc("The schedule according to which Jobs will be created. All times are fixed respective to UTC and are not impacted by daylight saving time. If you do not specify this element, the existing schedule is left unchanged.") schedule?: BatchJobScheduleConfiguration; @@ -1336,13 +1354,13 @@ model BatchJobScheduleUpdateContent { jobSpecification?: BatchJobSpecification; @doc("A list of name-value pairs associated with the Job Schedule as metadata. If you do not specify this element, existing metadata is left unchanged.") - metadata?: MetadataItem[]; + metadata?: BatchMetadataItem[]; } @doc(""" Parameters for creating an Azure Batch Job Schedule """) -model BatchJobScheduleCreateContent { +model BatchJobScheduleCreateOptions { @doc("A string that uniquely identifies the schedule within the Account. The ID can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more than 64 characters. The ID is case-preserving and case-insensitive (that is, you may not have two IDs within an Account that differ only by case).") id: string; @@ -1356,7 +1374,7 @@ model BatchJobScheduleCreateContent { jobSpecification: BatchJobSpecification; @doc("A list of name-value pairs associated with the schedule as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.") - metadata?: MetadataItem[]; + metadata?: BatchMetadataItem[]; } @doc(""" @@ -1386,7 +1404,7 @@ model SecurityProfile { securityType: SecurityTypes; @doc("Specifies the security settings like secure boot and vTPM used while creating the virtual machine. Specifies the security settings like secure boot and vTPM used while creating the virtual machine.") - uefiSettings: UefiSettings; + uefiSettings: BatchUefiSettings; } @doc(""" @@ -1416,10 +1434,12 @@ model BatchJobSpecification { usesTaskDependencies?: boolean; @doc("The action the Batch service should take when all Tasks in a Job created under this schedule are in the completed state. Note that if a Job contains no Tasks, then all Tasks are considered complete. This option is therefore most commonly used with a Job 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. The default is noaction.") - onAllTasksComplete?: OnAllBatchTasksComplete; + @clientName("allTasksCompleteMode") + onAllTasksComplete?: BatchAllTasksCompleteMode; @doc("The action the Batch service should take when any Task fails in a Job created under this schedule. A Task is considered to have failed if it 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. The default is noaction.") - onTaskFailure?: OnBatchTaskFailure; + @clientName("taskFailureMode") + onTaskFailure?: BatchTaskFailureMode; @doc("The network configuration for the Job.") networkConfiguration?: BatchJobNetworkConfiguration; @@ -1443,7 +1463,7 @@ model BatchJobSpecification { poolInfo: BatchPoolInfo; @doc("A list of name-value pairs associated with each Job created under this schedule as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.") - metadata?: MetadataItem[]; + metadata?: BatchMetadataItem[]; } @doc("The network configuration for the Job.") @@ -1453,6 +1473,7 @@ model BatchJobNetworkConfiguration { #suppress "@azure-tools/typespec-azure-core/casing-style" "The names of Property types must use camelCase" @doc("Whether to withdraw Compute Nodes from the virtual network to DNC when the job is terminated or deleted. If true, nodes will remain joined to the virtual network to DNC. If false, nodes will automatically withdraw when the job ends. Defaults to false.") + @clientName("skipWithdrawFromVnet") skipWithdrawFromVNet: boolean; } @@ -1583,7 +1604,8 @@ model ContainerRegistryReference { password?: string; @doc("The registry URL. If omitted, the default is \"docker.io\".") - registryServer?: string; + @clientName("registryServerUri", "csharp") + registryServer?: url; @doc("The reference to the user assigned identity to use to access an Azure Container Registry instead of username and password.") identityReference?: BatchNodeIdentityReference; @@ -1595,7 +1617,7 @@ model ContainerRegistryReference { """) model BatchNodeIdentityReference { @doc("The ARM resource id of the user assigned identity.") - resourceId?: string; + resourceId?: Azure.Core.armResourceIdentifier; } @doc("A single file or multiple files to be downloaded to a Compute Node.") @@ -1604,10 +1626,12 @@ model ResourceFile { autoStorageContainerName?: string; @doc("The URL of the blob container within Azure Blob Storage. The autoStorageContainerName, storageContainerUrl and httpUrl properties are mutually exclusive and one of them must be specified. This URL must be readable and listable from compute nodes. There are three ways to get such a URL for a container in Azure storage: include a Shared Access Signature (SAS) granting read and list permissions on the container, use a managed identity with read and list permissions, or set the ACL for the container to allow public access.") - storageContainerUrl?: string; + @clientName("storageContainerUri", "csharp") + storageContainerUrl?: url; @doc("The URL of the file to download. The autoStorageContainerName, storageContainerUrl and httpUrl properties are mutually exclusive and one of them must be specified. If the URL points to Azure Blob Storage, it must be readable from compute nodes. There are three ways to get such a URL for a blob in Azure storage: include a Shared Access Signature (SAS) granting read permissions on the blob, use a managed identity with read permission, or set the ACL for the blob or its container to allow public access.") - httpUrl?: string; + @clientName("httpUri", "csharp") + httpUrl?: url; @doc("The blob prefix to use when downloading blobs from an Azure Storage container. Only the blobs whose names begin with the specified prefix will be downloaded. The property is valid only when autoStorageContainerName or storageContainerUrl is used. This prefix can be a partial filename or a subdirectory. If a prefix is not specified, all the files in the container will be downloaded.") blobPrefix?: string; @@ -1648,17 +1672,18 @@ model OutputFileBlobContainerDestination { path?: string; @doc("The URL of the container within Azure Blob Storage to which to upload the file(s). If not using a managed identity, the URL must include a Shared Access Signature (SAS) granting write permissions to the container.") - containerUrl: string; + @clientName("containerUri", "csharp") + containerUrl: url; @doc("The reference to the user assigned identity to use to access Azure Blob Storage specified by containerUrl. The identity must have write access to the Azure Blob Storage container.") identityReference?: BatchNodeIdentityReference; @doc("A list of name-value pairs for headers to be used in uploading output files. These headers will be specified when uploading files to Azure Storage. Official document on allowed headers when uploading blobs: https://learn.microsoft.com/rest/api/storageservices/put-blob#request-headers-all-blob-types.") - uploadHeaders?: HttpHeader[]; + uploadHeaders?: OutputFileUploadHeader[]; } @doc("An HTTP header name-value pair") -model HttpHeader { +model OutputFileUploadHeader { @doc("The case-insensitive name of the header to be used while uploading output files.") name: string; @@ -1706,7 +1731,7 @@ model UserIdentity { } @doc("Specifies the security settings like secure boot and vTPM used while creating the virtual machine.") -model UefiSettings { +model BatchUefiSettings { @doc("Specifies whether secure boot should be enabled on the virtual machine.") secureBootEnabled?: boolean; @@ -1740,7 +1765,7 @@ model BatchApplicationPackageReference { """) model AuthenticationTokenSettings { @doc("The Batch resources to which the token grants access. The authentication token grants access to a limited set of Batch service operations. Currently the only supported value for the access property is 'job', which grants access to all operations related to the Job which contains the Task.") - access?: AccessScope[]; + access?: BatchAccessScope[]; } @doc(""" @@ -1932,7 +1957,7 @@ model BatchPoolSpecification { userAccounts?: UserAccount[]; @doc("A list of name-value pairs associated with the Pool as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.") - metadata?: MetadataItem[]; + metadata?: BatchMetadataItem[]; @doc("A list of file systems to mount on each node in the pool. This supports Azure Files, NFS, CIFS/SMB, and Blobfuse.") mountConfiguration?: MountConfiguration[]; @@ -1951,7 +1976,7 @@ model BatchPoolSpecification { """) model VirtualMachineConfiguration { @doc("A reference to the Azure Virtual Machines Marketplace Image or the custom Virtual Machine Image to use.") - imageReference: ImageReference; + imageReference: BatchVmImageReference; @doc("The SKU of the Batch Compute Node agent to be provisioned on Compute Nodes in the Pool. The Batch Compute Node agent is a program that runs on each Compute Node in the Pool, and provides the command-and-control interface between the Compute Node and the Batch service. There are different implementations of the Compute Node agent, known as SKUs, for different operating systems. You must specify a Compute Node agent SKU which matches the selected Image reference. To get the list of supported Compute Node agent SKUs along with their list of verified Image references, see the 'List supported Compute Node agent SKUs' operation.") @clientName("nodeAgentSkuId", "!go") @@ -1977,7 +2002,7 @@ model VirtualMachineConfiguration { licenseType?: string; @doc("The container configuration for the Pool. If specified, setup is performed on each Compute Node in the Pool to allow Tasks to run in containers. All regular Tasks and Job manager Tasks run on this Pool must specify the containerSettings property, and all other Tasks may specify it.") - containerConfiguration?: ContainerConfiguration; + containerConfiguration?: BatchContainerConfiguration; @doc("The disk encryption configuration for the pool. If specified, encryption is performed on each node in the pool during node provisioning.") diskEncryptionConfiguration?: DiskEncryptionConfiguration; @@ -1989,7 +2014,8 @@ model VirtualMachineConfiguration { extensions?: VMExtension[]; @doc("Settings for the operating system disk of the Virtual Machine.") - osDisk?: OSDisk; + @clientName("OsDisk") + osDisk?: BatchOsDisk; @doc("Specifies the security profile settings for the virtual machine or virtual machine scale set.") securityProfile?: SecurityProfile; @@ -2027,7 +2053,7 @@ model DataDisk { } @doc("The configuration for container-enabled Pools.") -model ContainerConfiguration { +model BatchContainerConfiguration { @doc("The container technology to be used.") type: ContainerType; @@ -2091,9 +2117,9 @@ model VMExtension { #suppress "@azure-tools/typespec-azure-core/casing-style" "The names of Property types must use camelCase" @doc("Settings for the operating system disk of the compute node (VM).") -model OSDisk { +model BatchOsDisk { @doc("Specifies the ephemeral Disk Settings for the operating system disk used by the compute node (VM).") - ephemeralOSDiskSettings?: DiffDiskSettings; + ephemeralOSDiskSettings?: BatchDiffDiskSettings; @doc("Specifies the caching requirements. Possible values are: None, ReadOnly, ReadWrite. The default values are: None for Standard storage. ReadOnly for Premium storage.") caching?: CachingType; @@ -2112,7 +2138,7 @@ model OSDisk { Specifies the ephemeral Disk Settings for the operating system disk used by the compute node (VM). """) -model DiffDiskSettings { +model BatchDiffDiskSettings { @doc("Specifies the ephemeral disk placement for operating system disk for all VMs in the pool. This property can be used by user in the request to choose the location e.g., cache disk space for Ephemeral OS disk provisioning. For more information on Ephemeral OS disk size requirements, please refer to Ephemeral OS disk size requirements for Windows VMs at https://learn.microsoft.com/azure/virtual-machines/windows/ephemeral-os-disks#size-requirements and Linux VMs at https://learn.microsoft.com/azure/virtual-machines/linux/ephemeral-os-disks#size-requirements.") placement?: DiffDiskPlacement; } @@ -2130,6 +2156,7 @@ model NetworkConfiguration { subnetId?: string; @doc("The scope of dynamic vnet assignment.") + @clientName("dynamicVnetAssignmentScope") dynamicVNetAssignmentScope?: DynamicVNetAssignmentScope; @doc("The configuration for endpoints on Compute Nodes in the Batch Pool.") @@ -2137,7 +2164,7 @@ model NetworkConfiguration { @doc("The Public IPAddress configuration for Compute Nodes in the Batch Pool.") @clientName("publicIpAddressConfiguration", "!go") - publicIPAddressConfiguration?: PublicIpAddressConfiguration; + publicIPAddressConfiguration?: BatchPublicIpAddressConfiguration; @doc("Whether this pool should enable accelerated networking. Accelerated networking enables single root I/O virtualization (SR-IOV) to a VM, which may lead to improved networking performance. For more details, see: https://learn.microsoft.com/azure/virtual-network/accelerated-networking-overview.") enableAcceleratedNetworking?: boolean; @@ -2148,7 +2175,7 @@ model NetworkConfiguration { model BatchPoolEndpointConfiguration { @doc("A list of inbound NAT Pools that can be used to address specific ports on an individual Compute Node externally. The maximum number of inbound NAT Pools per Batch Pool is 5. If the maximum number of inbound NAT Pools is exceeded the request fails with HTTP status code 400. This cannot be specified if the IPAddressProvisioningType is NoPublicIPAddresses.") @clientName("inboundNatPools", "!go") - inboundNATPools: InboundNatPool[]; + inboundNATPools: BatchInboundNatPool[]; } #suppress "@azure-tools/typespec-azure-core/casing-style" "The names of Property types must use camelCase" @@ -2156,7 +2183,7 @@ model BatchPoolEndpointConfiguration { A inbound NAT Pool that can be used to address specific ports on Compute Nodes in a Batch Pool externally. """) -model InboundNatPool { +model BatchInboundNatPool { @doc("The name of the endpoint. The name must be unique within a Batch Pool, can contain letters, numbers, underscores, periods, and hyphens. Names must start with a letter or number, must end with a letter, number, or underscore, and cannot exceed 77 characters. If any invalid values are provided the request fails with HTTP status code 400.") name: string; @@ -2193,13 +2220,13 @@ model NetworkSecurityGroupRule { #suppress "@azure-tools/typespec-azure-core/casing-style" "The names of Property types must use camelCase" @doc("The public IP Address configuration of the networking configuration of a Pool.") -model PublicIpAddressConfiguration { +model BatchPublicIpAddressConfiguration { @doc("The provisioning type for Public IP Addresses for the Pool. The default value is BatchManaged.") @clientName("IpAddressProvisioningType") provision?: IpAddressProvisioningType; @doc("The list of public IPs which the Batch service will use when provisioning Compute Nodes. The number of IPs specified here limits the maximum size of the Pool - 100 dedicated nodes or 100 Spot/Low-priority nodes can be allocated for each public IP. For example, a pool needing 250 dedicated VMs would need at least 3 public IPs specified. Each element of this collection is of the form: /subscriptions/{subscription}/resourceGroups/{group}/providers/Microsoft.Network/publicIPAddresses/{ip}.") - ipAddressIds?: string[]; + ipAddressIds?: ipV4Address[]; } @doc(""" @@ -2305,14 +2332,14 @@ model ManagedDisk { storageAccountType?: StorageAccountType; @doc("Specifies the security profile settings for the managed disk.") - securityProfile?: VMDiskSecurityProfile; + securityProfile?: BatchVMDiskSecurityProfile; } @doc(""" The Batch service does not assign any meaning to this metadata; it is solely for the use of user code. """) -model MetadataItem { +model BatchMetadataItem { @doc("The name of the metadata item.") name: string; @@ -2398,13 +2425,14 @@ model AzureFileShareConfiguration { @doc("The Azure Storage account name.") accountName: string; - @doc("The Azure Files URL. This is of the form 'https://{account}.file.core.windows.net/'.") - azureFileUrl: string; - @secret @doc("The Azure Storage account key.") accountKey: string; + @doc("The Azure Files URL. This is of the form 'https://{account}.file.core.windows.net/'.") + @clientName("azureFileUri", "csharp") + azureFileUrl: url; + @doc("The relative path on the compute node where the file system will be mounted. All file systems are mounted relative to the Batch mounts directory, accessible via the AZ_BATCH_NODE_MOUNTS_DIR environment variable.") relativeMountPath: string; @@ -2433,14 +2461,16 @@ model RecentBatchJob { id?: string; @doc("The URL of the Job.") - url?: string; + @clientName("uri", "csharp") + url?: url; } #suppress "@azure-tools/typespec-azure-core/casing-style" "The names of Property types must use camelCase" @doc("Resource usage statistics for a Job Schedule.") model BatchJobScheduleStatistics { @doc("The URL of the statistics.") - url: string; + @clientName("uri", "csharp") + url: url; @doc("The start time of the time range covered by the statistics.") startTime: utcDateTime; @@ -2461,28 +2491,35 @@ model BatchJobScheduleStatistics { @doc("The total number of disk read operations made by all Tasks in all Jobs created under the schedule.") @encode(string) + @clientName("readIops") readIOps: int64; @doc("The total number of disk write operations made by all Tasks in all Jobs created under the schedule.") @encode(string) + @clientName("writeIops") writeIOps: int64; @doc("The total gibibytes read from disk by all Tasks in all Jobs created under the schedule.") + @clientName("readIoGiB") readIOGiB: float32; @doc("The total gibibytes written to disk by all Tasks in all Jobs created under the schedule.") + @clientName("writeIoGiB") writeIOGiB: float32; @doc("The total number of Tasks successfully completed during the given time range in Jobs created under the schedule. A Task completes successfully if it returns exit code 0.") @encode(string) + @clientName("succeededTasksCount") numSucceededTasks: int64; @doc("The total number of Tasks that failed during the given time range in Jobs created under the schedule. A Task fails if it exhausts its maximum retry count without returning exit code 0.") @encode(string) + @clientName("failedTasksCount") numFailedTasks: int64; @doc("The total number of retries during the given time range on all Tasks in all Jobs created under the schedule.") @encode(string) + @clientName("taskRetriesCount") numTaskRetries: int64; @doc("The total wait time of all Tasks in all Jobs created under the schedule. The wait time for a Task is defined as the elapsed time between the creation of the Task and the start of Task execution. (If the Task is retried due to failures, the wait time is the time to the most recent Task execution.). This value is only reported in the Account lifetime statistics; it is not included in the Job statistics.") @@ -2518,11 +2555,12 @@ model BatchJob { @doc("The URL of the Job.") @visibility(Lifecycle.Read) - url?: string; + @clientName("uri", "csharp") + url?: url; @doc("The ETag of the Job. This is an opaque string. You can use it to detect whether the Job has changed between requests. In particular, you can be pass the ETag when updating a Job to specify that your changes should take effect only if nobody else has modified the Job in the meantime.") @visibility(Lifecycle.Read) - eTag?: string; + eTag?: eTag; @doc("The last modified time of the Job. This is the last time at which the Job level data, such as the Job state or priority, changed. It does not factor in task-level changes such as adding new Tasks or Tasks changing state.") @visibility(Lifecycle.Read) @@ -2580,18 +2618,20 @@ model BatchJob { poolInfo: BatchPoolInfo; @doc("The action the Batch service should take when all Tasks in the Job are in the completed state. The default is noaction.") - onAllTasksComplete?: OnAllBatchTasksComplete; + @clientName("allTasksCompleteMode") + onAllTasksComplete?: BatchAllTasksCompleteMode; @doc("The action the Batch service should take when any Task in the Job fails. 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. The default is noaction.") @visibility(Lifecycle.Read) - onTaskFailure?: OnBatchTaskFailure; + @clientName("taskFailureMode") + onTaskFailure?: BatchTaskFailureMode; @doc("The network configuration for the Job.") @visibility(Lifecycle.Read) networkConfiguration?: BatchJobNetworkConfiguration; @doc("A list of name-value pairs associated with the Job as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.") - metadata?: MetadataItem[]; + metadata?: BatchMetadataItem[]; @doc("The execution information for the Job.") @visibility(Lifecycle.Read) @@ -2599,11 +2639,12 @@ model BatchJob { @doc("Resource usage statistics for the entire lifetime of the Job. This property is populated only if the BatchJob was retrieved with an expand clause including the 'stats' attribute; otherwise it is null. The statistics may not be immediately available. The Batch service performs periodic roll-up of statistics. The typical delay is about 30 minutes.") @visibility(Lifecycle.Read) + @clientName("jobStatistics") stats?: BatchJobStatistics; } @doc("Parameters for creating an Azure Batch Job.") -model BatchJobCreateContent { +model BatchJobCreateOptions { @doc("A string that uniquely identifies the Job within the Account. The ID can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more than 64 characters. The ID is case-preserving and case-insensitive (that is, you may not have two IDs within an Account that differ only by case).") id: string; @@ -2641,20 +2682,22 @@ model BatchJobCreateContent { poolInfo: BatchPoolInfo; @doc("The action the Batch service should take when all Tasks in the Job are in the completed state. Note that if a Job contains no Tasks, then all Tasks are considered complete. This option is therefore most commonly used with a Job 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. The default is noaction.") - onAllTasksComplete?: OnAllBatchTasksComplete; + @clientName("allTasksCompleteMode") + onAllTasksComplete?: BatchAllTasksCompleteMode; @doc("The action the Batch service should take when any Task in the Job fails. 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. The default is noaction.") - onTaskFailure?: OnBatchTaskFailure; + @clientName("taskFailureMode") + onTaskFailure?: BatchTaskFailureMode; @doc("The network configuration for the Job.") networkConfiguration?: BatchJobNetworkConfiguration; @doc("A list of name-value pairs associated with the Job as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.") - metadata?: MetadataItem[]; + metadata?: BatchMetadataItem[]; } @doc("Parameters for updating an Azure Batch Job.") -model BatchJobUpdateContent { +model BatchJobUpdateOptions { @doc("The priority of the Job. Priority values can range from -1000 to 1000, with -1000 being the lowest priority and 1000 being the highest priority. If omitted, the priority of the Job is left unchanged.") priority?: int32; @@ -2671,10 +2714,11 @@ model BatchJobUpdateContent { poolInfo?: BatchPoolInfo; @doc("The action the Batch service should take when all Tasks in the Job are in the completed state. If omitted, the completion behavior is left unchanged. You may not change the value from terminatejob to noaction - that is, once you have engaged automatic Job termination, you cannot turn it off again. If you try to do this, the request fails with an 'invalid property value' error response; if you are calling the REST API directly, the HTTP status code is 400 (Bad Request).") - onAllTasksComplete?: OnAllBatchTasksComplete; + @clientName("allTasksCompleteMode") + onAllTasksComplete?: BatchAllTasksCompleteMode; @doc("A list of name-value pairs associated with the Job as metadata. If omitted, the existing Job metadata is left unchanged.") - metadata?: MetadataItem[]; + metadata?: BatchMetadataItem[]; @doc("The network configuration for the Job.") networkConfiguration?: BatchJobNetworkConfiguration; @@ -2702,7 +2746,7 @@ model BatchJobExecutionInfo { @doc("An error encountered by the Batch service when scheduling a Job.") model BatchJobSchedulingError { @doc("The category of the Job scheduling error.") - category: ErrorCategory; + category: BatchErrorSourceCategory; @doc("An identifier for the Job scheduling error. Codes are invariant and are intended to be consumed programmatically.") code?: string; @@ -2715,13 +2759,13 @@ model BatchJobSchedulingError { } @doc("Parameters for disabling an Azure Batch Job.") -model BatchJobDisableContent { +model BatchJobDisableOptions { @doc("What to do with active Tasks associated with the Job.") disableTasks: DisableBatchJobOption; } @doc("Parameters for terminating an Azure Batch Job.") -model BatchJobTerminateContent { +model BatchJobTerminateOptions { @doc("The text you want to appear as the Job's TerminationReason. The default is 'UserTerminate'.") @clientName("terminationReason") terminateReason?: string; @@ -2765,7 +2809,8 @@ model BatchJobPreparationAndReleaseTaskStatus { nodeId?: string; @doc("The URL of the Compute Node to which this entry refers.") - nodeUrl?: string; + @clientName("nodeUri", "csharp") + nodeUrl?: url; @doc("Information about the execution status of the Job Preparation Task on this Compute Node.") jobPreparationTaskExecutionInfo?: BatchJobPreparationTaskExecutionInfo; @@ -2792,7 +2837,8 @@ model BatchJobPreparationTaskExecutionInfo { taskRootDirectory?: string; @doc("The URL to the root directory of the Job Preparation Task on the Compute Node.") - taskRootDirectoryUrl?: string; + @clientName("taskRootDirectoryUri", "csharp") + taskRootDirectoryUrl?: url; @doc("The exit code of the program specified on the Task command line. This parameter is returned only if the Task is in the completed state. The exit code for a process reflects the specific convention implemented by the application developer for that process. If you use the exit code value to make decisions in your code, be sure that you know the exit code convention used by the application process. Note that the exit code may also be generated by the Compute Node operating system, such as when a process is forcibly terminated.") exitCode?: int32; @@ -2828,7 +2874,7 @@ model BatchTaskContainerExecutionInfo { @doc("Information about a Task failure.") model BatchTaskFailureInfo { @doc("The category of the Task error.") - category: ErrorCategory; + category: BatchErrorSourceCategory; @doc("An identifier for the Task error. Codes are invariant and are intended to be consumed programmatically.") code?: string; @@ -2858,7 +2904,8 @@ model BatchJobReleaseTaskExecutionInfo { taskRootDirectory?: string; @doc("The URL to the root directory of the Job Release Task on the Compute Node.") - taskRootDirectoryUrl?: string; + @clientName("taskRootDirectoryUri", "csharp") + taskRootDirectoryUrl?: url; @doc("The exit code of the program specified on the Task command line. This parameter is returned only if the Task is in the completed state. The exit code for a process reflects the specific convention implemented by the application developer for that process. If you use the exit code value to make decisions in your code, be sure that you know the exit code convention used by the application process. Note that the exit code may also be generated by the Compute Node operating system, such as when a process is forcibly terminated.") exitCode?: int32; @@ -2930,11 +2977,12 @@ model BatchPool { @doc("The URL of the Pool.") @visibility(Lifecycle.Read) - url?: string; + @clientName("uri", "csharp") + url?: url; @doc("The ETag of the Pool. This is an opaque string. You can use it to detect whether the Pool has changed between requests. In particular, you can be pass the ETag when updating a Pool to specify that your changes should take effect only if nobody else has modified the Pool in the meantime.") @visibility(Lifecycle.Read) - eTag?: string; + eTag?: eTag; @doc("The last modified time of the Pool. This is the last time at which the Pool level data, such as the targetDedicatedNodes or enableAutoscale settings, changed. It does not factor in node-level changes such as a Compute Node changing state.") @visibility(Lifecycle.Read) @@ -3050,10 +3098,11 @@ model BatchPool { @doc("A list of name-value pairs associated with the Pool as metadata.") @visibility(Lifecycle.Read) - metadata?: MetadataItem[]; + metadata?: BatchMetadataItem[]; @doc("Utilization and resource usage statistics for the entire lifetime of the Pool. This property is populated only if the BatchPool was retrieved with an expand clause including the 'stats' attribute; otherwise it is null. The statistics may not be immediately available. The Batch service performs periodic roll-up of statistics. The typical delay is about 30 minutes.") @visibility(Lifecycle.Read) + @clientName("poolStatistics") stats?: BatchPoolStatistics; @doc("A list of file systems to mount on each node in the pool. This supports Azure Files, NFS, CIFS/SMB, and Blobfuse.") @@ -3076,7 +3125,7 @@ model BatchPool { } @doc("Parameters for creating an Azure Batch Pool.") -model BatchPoolCreateContent { +model BatchPoolCreateOptions { @doc("A string that uniquely identifies the Pool within the Account. The ID can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more than 64 characters. The ID is case-preserving and case-insensitive (that is, you may not have two Pool IDs within an Account that differ only by case).") id: string; @@ -3140,7 +3189,7 @@ model BatchPoolCreateContent { userAccounts?: UserAccount[]; @doc("A list of name-value pairs associated with the Pool as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.") - metadata?: MetadataItem[]; + metadata?: BatchMetadataItem[]; @doc("Mount storage using specified file system for the entire lifetime of the pool. Mount the storage using Azure fileshare, NFS, CIFS or Blobfuse based file system.") mountConfiguration?: MountConfiguration[]; @@ -3153,7 +3202,7 @@ model BatchPoolCreateContent { } @doc("Parameters for replacing properties on an Azure Batch Pool.") -model BatchPoolReplaceContent { +model BatchPoolReplaceOptions { @doc("A Task to run on each Compute Node as it joins the Pool. The Task runs when the Compute Node is added to the Pool or when the Compute Node is restarted. If this element is present, it overwrites any existing StartTask. If omitted, any existing StartTask is removed from the Pool.") startTask?: BatchStartTask; @@ -3171,14 +3220,14 @@ model BatchPoolReplaceContent { applicationPackageReferences: BatchApplicationPackageReference[]; @doc("A list of name-value pairs associated with the Pool as metadata. This list replaces any existing metadata configured on the Pool. If omitted, or if you specify an empty collection, any existing metadata is removed from the Pool.") - metadata: MetadataItem[]; + metadata: BatchMetadataItem[]; @doc("The desired node communication mode for the pool. This setting replaces any existing targetNodeCommunication setting on the Pool. If omitted, the existing setting is default.") targetNodeCommunicationMode?: BatchNodeCommunicationMode; } @doc("Parameters for updating an Azure Batch Pool.") -model BatchPoolUpdateContent { +model BatchPoolUpdateOptions { @doc("The display name for the Pool. The display name need not be unique and can contain any Unicode characters up to a maximum length of 1024. This field can be updated only when the pool is empty.") displayName?: string; @@ -3205,7 +3254,7 @@ model BatchPoolUpdateContent { applicationPackageReferences?: BatchApplicationPackageReference[]; @doc("A list of name-value pairs associated with the Pool as metadata. If this element is present, it replaces any existing metadata configured on the Pool. If you specify an empty collection, any metadata is removed from the Pool. If omitted, any existing metadata is left unchanged.") - metadata?: MetadataItem[]; + metadata?: BatchMetadataItem[]; @doc("The virtual machine configuration for the Pool. This property must be specified.

This field can be updated only when the pool is empty.") virtualMachineConfiguration?: VirtualMachineConfiguration; @@ -3277,13 +3326,13 @@ model BatchPoolIdentity { type: BatchPoolIdentityType; @doc("The list of user identities associated with the Batch account. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.") - userAssignedIdentities?: UserAssignedIdentity[]; + userAssignedIdentities?: BatchUserAssignedIdentity[]; } @doc("The user assigned Identity") -model UserAssignedIdentity { +model BatchUserAssignedIdentity { @doc("The ARM resource id of the user assigned identity.") - resourceId: string; + resourceId: Azure.Core.armResourceIdentifier; @doc("The client id of the user assigned identity.") @visibility(Lifecycle.Read) @@ -3308,7 +3357,7 @@ model BatchPoolListResult { } @doc("Parameters for enabling automatic scaling on an Azure Batch Pool.") -model BatchPoolEnableAutoScaleContent { +model BatchPoolEnableAutoScaleOptions { @doc("The formula for the desired number of Compute Nodes in the Pool. The default value is 15 minutes. The minimum and maximum value are 5 minutes and 168 hours respectively. If you specify a value less than 5 minutes or greater than 168 hours, the Batch service rejects the request with an invalid property value error; if you are calling the REST API directly, the HTTP status code is 400 (Bad Request). If you specify a new interval, then the existing autoscale evaluation schedule will be stopped and a new autoscale evaluation schedule will be started, with its starting time being the time when this request was issued.") autoScaleFormula?: string; @@ -3317,13 +3366,13 @@ model BatchPoolEnableAutoScaleContent { } @doc("Parameters for evaluating an automatic scaling formula on an Azure Batch Pool.") -model BatchPoolEvaluateAutoScaleContent { +model BatchPoolEvaluateAutoScaleOptions { @doc("The formula for the desired number of Compute Nodes in the Pool. The formula is validated and its results calculated, but it is not applied to the Pool. To apply the formula to the Pool, 'Enable automatic scaling on a Pool'. For more information about specifying this formula, see Automatically scale Compute Nodes in an Azure Batch Pool (https://learn.microsoft.com/azure/batch/batch-automatic-scaling).") autoScaleFormula: string; } @doc("Parameters for changing the size of an Azure Batch Pool.") -model BatchPoolResizeContent { +model BatchPoolResizeOptions { @doc("The desired number of dedicated Compute Nodes in the Pool.") targetDedicatedNodes?: int32; @@ -3338,8 +3387,9 @@ model BatchPoolResizeContent { } @doc("Parameters for removing nodes from an Azure Batch Pool.") -model BatchNodeRemoveContent { +model BatchNodeRemoveOptions { @doc("A list containing the IDs of the Compute Nodes to be removed from the specified Pool. A maximum of 100 nodes may be removed per request.") + @clientName("nodeIds") nodeList: string[]; @doc("The timeout for removal of Compute Nodes to the Pool. The default value is 15 minutes. The minimum value is 5 minutes. If you specify a value less than 5 minutes, the Batch service returns an error; if you are calling the REST API directly, the HTTP status code is 400 (Bad Request).") @@ -3350,7 +3400,7 @@ model BatchNodeRemoveContent { } @doc("Options for deallocating a Compute Node.") -model BatchNodeDeallocateContent { +model BatchNodeDeallocateOptions { @doc("When to deallocate the Compute Node and what to do with currently running Tasks. The default value is requeue.") nodeDeallocateOption?: BatchNodeDeallocateOption; } @@ -3377,11 +3427,12 @@ model BatchTask { @doc("The URL of the Task.") @visibility(Lifecycle.Read) - url?: string; + @clientName("uri", "csharp") + url?: url; @doc("The ETag of the Task. This is an opaque string. You can use it to detect whether the Task has changed between requests. In particular, you can be pass the ETag when updating a Task to specify that your changes should take effect only if nobody else has modified the Task in the meantime.") @visibility(Lifecycle.Read) - eTag?: string; + eTag?: eTag; @doc("The last modified time of the Task.") @visibility(Lifecycle.Read) @@ -3433,7 +3484,7 @@ model BatchTask { @doc("A locality hint that can be used by the Batch service to select a Compute Node on which to start the new Task.") @visibility(Lifecycle.Read) - affinityInfo?: AffinityInfo; + affinityInfo?: BatchAffinityInfo; @doc("The execution constraints that apply to this Task.") constraints?: BatchTaskConstraints; @@ -3460,6 +3511,7 @@ model BatchTask { @doc("Resource usage statistics for the Task.") @visibility(Lifecycle.Read) + @clientName("taskStatistics") stats?: BatchTaskStatistics; @doc("The Tasks that this Task depends on. This Task will not be scheduled until all Tasks that it depends on have completed successfully. If any of those Tasks fail and exhaust their retry counts, this Task will never be scheduled.") @@ -3478,7 +3530,7 @@ model BatchTask { @doc(""" Parameters for creating an Azure Batch Task. """) -model BatchTaskCreateContent { +model BatchTaskCreateOptions { @doc("A string that uniquely identifies the Task within the Job. The ID can contain any combination of alphanumeric characters including hyphens and underscores, and cannot contain more than 64 characters. The ID is case-preserving and case-insensitive (that is, you may not have two IDs within a Job that differ only by case).") id: string; @@ -3504,7 +3556,7 @@ model BatchTaskCreateContent { environmentSettings?: EnvironmentSetting[]; @doc("A locality hint that can be used by the Batch service to select a Compute Node on which to start the new Task.") - affinityInfo?: AffinityInfo; + affinityInfo?: BatchAffinityInfo; @doc("The execution constraints that apply to this Task. If you do not specify constraints, the maxTaskRetryCount is the maxTaskRetryCount specified for the Job, the maxWallClockTime is infinite, and the retentionTime is 7 days.") constraints?: BatchTaskConstraints; @@ -3561,7 +3613,7 @@ model ExitCodeMapping { @doc("Specifies how the Batch service responds to a particular exit condition.") model ExitOptions { @doc("An action to take on the Job containing the Task, if the Task completes with the given exit condition and the Job's onTaskFailed property is 'performExitOptionsJobAction'. 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).") - jobAction?: BatchJobAction; + jobAction?: BatchJobActionKind; @doc("An action that the Batch service performs on Tasks that depend on this Task. Possible values are 'satisfy' (allowing dependent tasks to progress) and 'block' (dependent tasks continue to wait). Batch does not yet support cancellation of dependent tasks.") dependencyAction?: DependencyAction; @@ -3569,7 +3621,8 @@ model ExitOptions { #suppress "@azure-tools/typespec-azure-core/casing-style" "The names of Property types must use camelCase" @doc("Specifies the security profile settings for the managed disk. **Note**: It can only be set for Confidential VMs and required when using Confidential VMs.") -model VMDiskSecurityProfile { +@clientName("VmDiskSecurityProfile") +model BatchVMDiskSecurityProfile { @doc("Specifies the EncryptionType of the managed disk. It is set to VMGuestStateOnly for encryption of just the VMGuestState blob, and NonPersistedTPM for not persisting firmware state in the VMGuestState blob. **Note**: It can be set for only Confidential VMs and is required when using Confidential VMs.") securityEncryptionType?: SecurityEncryptionTypes; } @@ -3593,7 +3646,7 @@ model ExitCodeRangeMapping { A locality hint that can be used by the Batch service to select a Compute Node on which to start a Task. """) -model AffinityInfo { +model BatchAffinityInfo { @doc("An opaque string representing the location of a Compute Node or a Task that has run previously. You can pass the affinityId of a Node to indicate that this Task needs to run on that Compute Node. Note that this is just a soft affinity. If the target Compute Node is busy or unavailable at the time the Task is scheduled, then the Task will be scheduled elsewhere.") affinityId: string; } @@ -3637,7 +3690,8 @@ model BatchNodeInfo { affinityId?: string; @doc("The URL of the Compute Node on which the Task ran.") - nodeUrl?: string; + @clientName("nodeUri", "csharp") + nodeUrl?: url; @doc("The ID of the Pool on which the Task ran.") poolId?: string; @@ -3649,7 +3703,8 @@ model BatchNodeInfo { taskRootDirectory?: string; @doc("The URL to the root directory of the Task on the Compute Node.") - taskRootDirectoryUrl?: string; + @clientName("taskRootDirectoryUri", "csharp") + taskRootDirectoryUrl?: url; } @doc(""" @@ -3673,7 +3728,8 @@ model MultiInstanceSettings { @doc("Resource usage statistics for a Task.") model BatchTaskStatistics { @doc("The URL of the statistics.") - url: string; + @clientName("uri", "csharp") + url: url; @doc("The start time of the time range covered by the statistics.") startTime: utcDateTime; @@ -3694,16 +3750,20 @@ model BatchTaskStatistics { @doc("The total number of disk read operations made by the Task.") @encode(string) + @clientName("readIops") readIOps: int64; @doc("The total number of disk write operations made by the Task.") @encode(string) + @clientName("writeIops") writeIOps: int64; @doc("The total gibibytes read from disk by the Task.") + @clientName("readIoGiB") readIOGiB: float32; @doc("The total gibibytes written to disk by the Task.") + @clientName("writeIoGiB") writeIOGiB: float32; @doc("The total wait time of the Task. The wait time for a Task is defined as the elapsed time between the creation of the Task and the start of Task execution. (If the Task is retried due to failures, the wait time is the time to the most recent Task execution.).") @@ -3751,17 +3811,19 @@ model BatchTaskListResult { @doc("A collection of Azure Batch Tasks to add.") model BatchTaskGroup { @doc("The collection of Tasks to add. The maximum count of Tasks is 100. The total serialized size of this collection must be less than 1MB. If it is greater than 1MB (for example if each Task has 100's of resource files or environment variables), the request will fail with code 'RequestBodyTooLarge' and should be retried again with fewer Tasks.") - value: BatchTaskCreateContent[]; + @clientName("values") + value: BatchTaskCreateOptions[]; } -@doc("The result of adding a collection of Tasks to a Job.") -model BatchTaskAddCollectionResult { - @doc("The results of the add Task collection operation.") - value?: BatchTaskAddResult[]; +@doc("The result of creating a collection of Tasks to a Job.") +model BatchCreateTaskCollectionResult { + @doc("The results of the create Task collection operation.") + @clientName("values") + value?: BatchTaskCreateResult[]; } -@doc("Result for a single Task added as part of an add Task collection operation.") -model BatchTaskAddResult { +@doc("Result for a single Task created as part of an add Task collection operation.") +model BatchTaskCreateResult { @doc("The status of the add Task request.") status: BatchTaskAddStatus; @@ -3769,7 +3831,7 @@ model BatchTaskAddResult { taskId: string; @doc("The ETag of the Task, if the Task was successfully added. You can use this to detect whether the Task has changed between requests. In particular, you can be pass the ETag with an Update Task request to specify that your changes should take effect only if nobody else has modified the Job in the meantime.") - eTag?: string; + eTag?: eTag; @doc("The last modified time of the Task.") lastModified?: utcDateTime; @@ -3889,7 +3951,7 @@ model RollingUpgradePolicy { } @doc("Parameters for creating a user account for RDP or SSH access on an Azure Batch Compute Node.") -model BatchNodeUserCreateContent { +model BatchNodeUserCreateOptions { @doc("The user name of the Account.") name: string; @@ -3908,7 +3970,7 @@ model BatchNodeUserCreateContent { } @doc("Parameters for updating a user account for RDP or SSH access on an Azure Batch Compute Node.") -model BatchNodeUserUpdateContent { +model BatchNodeUserUpdateOptions { @secret @doc("The password of the Account. The password is required for Windows Compute Nodes. For Linux Compute Nodes, the password can optionally be specified along with the sshPublicKey property. If omitted, any existing password is removed.") password?: string; @@ -3926,7 +3988,8 @@ model BatchNode { id?: string; @doc("The URL of the Compute Node.") - url?: string; + @clientName("uri", "csharp") + url?: url; @doc("The current state of the Compute Node. The Spot/Low-priority Compute Node has been preempted. Tasks which were running on the Compute Node when it was preempted will be rescheduled when another Compute Node becomes available.") state?: BatchNodeState; @@ -3944,7 +4007,7 @@ model BatchNode { allocationTime?: utcDateTime; @doc("The IP address that other Nodes can use to communicate with this Compute Node. Every Compute Node that is added to a Pool is assigned a unique IP address. Whenever a Compute Node is removed from a Pool, all of its local files are deleted, and the IP address is reclaimed and could be reused for new Compute Nodes.") - ipAddress?: string; + ipAddress?: ipV4Address; @doc("An identifier which can be passed when adding a Task to request that the Task be scheduled on this Compute Node. Note that this is just a soft affinity. If the target Compute Node is busy or unavailable at the time the Task is scheduled, then the Task will be scheduled elsewhere.") affinityId?: string; @@ -4000,7 +4063,8 @@ model BatchNode { @doc("Information about a Task running on a Compute Node.") model BatchTaskInfo { @doc("The URL of the Task.") - taskUrl?: string; + @clientName("taskUri", "csharp") + taskUrl?: url; @doc("The ID of the Job to which the Task belongs.") jobId?: string; @@ -4077,7 +4141,7 @@ model InboundEndpoint { @doc("The public IP address of the Compute Node.") @clientName("publicIpAddress") - publicIPAddress: string; + publicIPAddress: ipV4Address; @doc("The public fully qualified domain name for the Compute Node.") publicFQDN: string; @@ -4104,26 +4168,27 @@ model BatchNodeAgentInfo { @doc("Info about the current state of the virtual machine.") model VirtualMachineInfo { @doc("The reference to the Azure Virtual Machine's Marketplace Image.") - imageReference?: ImageReference; + imageReference?: BatchVmImageReference; @doc("The resource ID of the Compute Node's current Virtual Machine Scale Set VM. Only defined if the Batch Account was created with its poolAllocationMode property set to 'UserSubscription'.") scaleSetVmResourceId?: string; } @doc("Parameters for rebooting an Azure Batch Compute Node.") -model BatchNodeRebootContent { +model BatchNodeRebootOptions { @doc("When to reboot the Compute Node and what to do with currently running Tasks. The default value is requeue.") - nodeRebootOption?: BatchNodeRebootOption; + @clientName("nodeRebootKind") + nodeRebootOption?: BatchNodeRebootKind; } @doc("Parameters for reimaging an Azure Batch Compute Node.") -model BatchNodeReimageContent { +model BatchNodeReimageOptions { @doc("When to reimage the Compute Node and what to do with currently running Tasks. The default value is requeue.") nodeReimageOption?: BatchNodeReimageOption; } @doc("Parameters for disabling scheduling on an Azure Batch Compute Node.") -model BatchNodeDisableSchedulingContent { +model BatchNodeDisableSchedulingOptions { @doc("What to do with currently running Tasks when disabling Task scheduling on the Compute Node. The default value is requeue.") nodeDisableSchedulingOption?: BatchNodeDisableSchedulingOption; } @@ -4133,16 +4198,17 @@ model BatchNodeDisableSchedulingContent { model BatchNodeRemoteLoginSettings { @doc("The IP address used for remote login to the Compute Node.") @clientName("remoteLoginIpAddress") - remoteLoginIPAddress: string; + remoteLoginIPAddress: ipV4Address; @doc("The port used for remote login to the Compute Node.") remoteLoginPort: int32; } @doc("The Azure Batch service log files upload parameters for a Compute Node.") -model UploadBatchServiceLogsContent { +model UploadBatchServiceLogsOptions { @doc("The URL of the container within Azure Blob Storage to which to upload the Batch Service log file(s). If a user assigned managed identity is not being used, the URL must include a Shared Access Signature (SAS) granting write permissions to the container. The SAS duration must allow enough time for the upload to finish. The start time for SAS is optional and recommended to not be specified.") - containerUrl: string; + @clientName("containerUri", "csharp") + containerUrl: url; @doc("The start of the time range from which to upload Batch Service log file(s). Any log file containing a log message in the time range will be uploaded. This means that the operation might retrieve more logs than have been requested since the entire log file is always uploaded, but the operation should not retrieve fewer logs than have been requested.") startTime: utcDateTime; diff --git a/specification/batch/Azure.Batch/routes.tsp b/specification/batch/Azure.Batch/routes.tsp index 07eba776afa9..90101215ee0a 100644 --- a/specification/batch/Azure.Batch/routes.tsp +++ b/specification/batch/Azure.Batch/routes.tsp @@ -815,7 +815,7 @@ interface Tasks { ...CommonJsonParameters; ...CreateTaskCollectionRequiredParameters; }, - BatchTaskAddCollectionResult + BatchCreateTaskCollectionResult >; @summary("Deletes a Task from the specified Job.") diff --git a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/BatchService.json b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/BatchService.json index 3ef6204d33af..f5e9e386bfb8 100644 --- a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/BatchService.json +++ b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/BatchService.json @@ -93,8 +93,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -195,8 +194,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -290,8 +288,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -414,8 +411,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -512,8 +508,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -625,8 +620,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -725,8 +719,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -829,8 +822,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -961,8 +953,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -996,7 +987,7 @@ "description": "The Job to be created.", "required": true, "schema": { - "$ref": "#/definitions/BatchJobCreateContent" + "$ref": "#/definitions/BatchJobCreateOptions" } } ], @@ -1062,8 +1053,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -1214,8 +1204,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -1354,8 +1343,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -1430,7 +1418,7 @@ "description": "The options to use for updating the Job.", "required": true, "schema": { - "$ref": "#/definitions/BatchJobUpdateContent" + "$ref": "#/definitions/BatchJobUpdateOptions" } } ], @@ -1491,8 +1479,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -1618,8 +1605,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -1668,7 +1654,7 @@ "200": { "description": "The request has succeeded.", "schema": { - "$ref": "#/definitions/BatchTaskAddCollectionResult" + "$ref": "#/definitions/BatchCreateTaskCollectionResult" }, "headers": { "ETag": { @@ -1728,8 +1714,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -1799,12 +1784,12 @@ "type": "string" }, { - "name": "content", + "name": "disableOptions", "in": "body", "description": "The options to use for disabling the Job.", "required": true, "schema": { - "$ref": "#/definitions/BatchJobDisableContent" + "$ref": "#/definitions/BatchJobDisableOptions" } } ], @@ -1867,8 +1852,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -1997,8 +1981,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -2124,8 +2107,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -2219,8 +2201,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -2358,8 +2339,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -2400,7 +2380,7 @@ "description": "The Task to be created.", "required": true, "schema": { - "$ref": "#/definitions/BatchTaskCreateContent" + "$ref": "#/definitions/BatchTaskCreateOptions" } } ], @@ -2478,8 +2458,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -2640,8 +2619,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -2784,8 +2762,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -2908,8 +2885,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -3041,8 +3017,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -3195,8 +3170,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -3296,8 +3270,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -3442,8 +3415,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -3579,8 +3551,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -3695,8 +3666,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -3835,8 +3805,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -3913,12 +3882,12 @@ "type": "boolean" }, { - "name": "parameters", + "name": "options", "in": "body", "description": "The options to use for terminating the Job.", "required": false, "schema": { - "$ref": "#/definitions/BatchJobTerminateContent" + "$ref": "#/definitions/BatchJobTerminateOptions" } } ], @@ -3981,8 +3950,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -4113,8 +4081,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -4148,7 +4115,7 @@ "description": "The Job Schedule to be created.", "required": true, "schema": { - "$ref": "#/definitions/BatchJobScheduleCreateContent" + "$ref": "#/definitions/BatchJobScheduleCreateOptions" } } ], @@ -4213,8 +4180,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -4365,8 +4331,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -4505,8 +4470,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -4581,7 +4545,7 @@ "description": "The options to use for updating the Job Schedule.", "required": true, "schema": { - "$ref": "#/definitions/BatchJobScheduleUpdateContent" + "$ref": "#/definitions/BatchJobScheduleUpdateOptions" } } ], @@ -4642,8 +4606,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -4764,8 +4727,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -4893,8 +4855,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -5023,8 +4984,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -5153,8 +5113,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -5291,8 +5250,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -5427,8 +5385,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -5536,8 +5493,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -5668,8 +5624,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -5703,7 +5658,7 @@ "description": "The Pool to be created.", "required": true, "schema": { - "$ref": "#/definitions/BatchPoolCreateContent" + "$ref": "#/definitions/BatchPoolCreateOptions" } } ], @@ -5789,8 +5744,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -5956,8 +5910,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -6032,7 +5985,7 @@ "description": "The pool properties to update.", "required": true, "schema": { - "$ref": "#/definitions/BatchPoolUpdateContent" + "$ref": "#/definitions/BatchPoolUpdateOptions" } } ], @@ -6093,8 +6046,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -6207,8 +6159,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -6336,8 +6287,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -6435,8 +6385,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -6506,12 +6455,12 @@ "type": "string" }, { - "name": "content", + "name": "enableAutoScaleOptions", "in": "body", "description": "The options to use for enabling automatic scaling.", "required": true, "schema": { - "$ref": "#/definitions/BatchPoolEnableAutoScaleContent" + "$ref": "#/definitions/BatchPoolEnableAutoScaleOptions" } } ], @@ -6577,8 +6526,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -6614,12 +6562,12 @@ "type": "string" }, { - "name": "content", + "name": "evaluateAutoScaleOptions", "in": "body", "description": "The options to use for evaluating the automatic scaling formula.", "required": true, "schema": { - "$ref": "#/definitions/BatchPoolEvaluateAutoScaleContent" + "$ref": "#/definitions/BatchPoolEvaluateAutoScaleOptions" } } ], @@ -6685,8 +6633,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -6812,8 +6759,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -6928,8 +6874,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -6972,12 +6917,12 @@ "type": "string" }, { - "name": "parameters", + "name": "options", "in": "body", "description": "The options to use for deallocating the Compute Node.", "required": false, "schema": { - "$ref": "#/definitions/BatchNodeDeallocateContent" + "$ref": "#/definitions/BatchNodeDeallocateOptions" } } ], @@ -7043,8 +6988,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -7087,12 +7031,12 @@ "type": "string" }, { - "name": "parameters", + "name": "options", "in": "body", "description": "The options to use for disabling scheduling on the Compute Node.", "required": false, "schema": { - "$ref": "#/definitions/BatchNodeDisableSchedulingContent" + "$ref": "#/definitions/BatchNodeDisableSchedulingOptions" } } ], @@ -7155,8 +7099,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -7258,8 +7201,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -7385,8 +7327,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -7505,8 +7446,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -7638,8 +7578,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -7792,8 +7731,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -7893,8 +7831,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -8042,8 +7979,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -8086,12 +8022,12 @@ "type": "string" }, { - "name": "parameters", + "name": "options", "in": "body", "description": "The options to use for rebooting the Compute Node.", "required": false, "schema": { - "$ref": "#/definitions/BatchNodeRebootContent" + "$ref": "#/definitions/BatchNodeRebootOptions" } } ], @@ -8157,8 +8093,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -8201,12 +8136,12 @@ "type": "string" }, { - "name": "parameters", + "name": "options", "in": "body", "description": "The options to use for reimaging the Compute Node.", "required": false, "schema": { - "$ref": "#/definitions/BatchNodeReimageContent" + "$ref": "#/definitions/BatchNodeReimageOptions" } } ], @@ -8269,8 +8204,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -8371,8 +8305,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -8477,8 +8410,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -8521,12 +8453,12 @@ "type": "string" }, { - "name": "content", + "name": "uploadOptions", "in": "body", "description": "The Azure Batch service log files upload options.", "required": true, "schema": { - "$ref": "#/definitions/UploadBatchServiceLogsContent" + "$ref": "#/definitions/UploadBatchServiceLogsOptions" } } ], @@ -8591,8 +8523,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -8640,7 +8571,7 @@ "description": "The options to use for creating the user.", "required": true, "schema": { - "$ref": "#/definitions/BatchNodeUserCreateContent" + "$ref": "#/definitions/BatchNodeUserCreateOptions" } } ], @@ -8706,8 +8637,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -8757,12 +8687,12 @@ "type": "string" }, { - "name": "content", + "name": "updateOptions", "in": "body", "description": "The options to use for updating the user.", "required": true, "schema": { - "$ref": "#/definitions/BatchNodeUserUpdateContent" + "$ref": "#/definitions/BatchNodeUserUpdateOptions" } } ], @@ -8823,8 +8753,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -8923,8 +8852,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -8994,12 +8922,12 @@ "type": "string" }, { - "name": "content", + "name": "removeOptions", "in": "body", "description": "The options to use for removing the node.", "required": true, "schema": { - "$ref": "#/definitions/BatchNodeRemoveContent" + "$ref": "#/definitions/BatchNodeRemoveOptions" } } ], @@ -9065,8 +8993,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -9136,12 +9063,12 @@ "type": "string" }, { - "name": "content", + "name": "resizeOptions", "in": "body", "description": "The options to use for resizing the pool.", "required": true, "schema": { - "$ref": "#/definitions/BatchPoolResizeContent" + "$ref": "#/definitions/BatchPoolResizeOptions" } } ], @@ -9204,8 +9131,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -9337,8 +9263,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -9379,7 +9304,7 @@ "description": "The options to use for replacing properties on the pool.", "required": true, "schema": { - "$ref": "#/definitions/BatchPoolReplaceContent" + "$ref": "#/definitions/BatchPoolReplaceOptions" } } ], @@ -9442,8 +9367,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -9567,8 +9491,7 @@ "description": "The maximum time that the server can spend processing the request, in seconds. The default is 30 seconds. If the value is larger than 30, the default will be used instead.\".", "required": false, "type": "integer", - "format": "int32", - "default": 30 + "format": "int32" }, { "name": "client-request-id", @@ -9660,37 +9583,6 @@ } }, "definitions": { - "AccessScope": { - "type": "string", - "description": "AccessScope enums", - "enum": [ - "job" - ], - "x-ms-enum": { - "name": "AccessScope", - "modelAsString": true, - "values": [ - { - "name": "Job", - "value": "job", - "description": "Grants access to perform all operations on the Job containing the Task." - } - ] - } - }, - "AffinityInfo": { - "type": "object", - "description": "A locality hint that can be used by the Batch service to select a Compute Node\non which to start a Task.", - "properties": { - "affinityId": { - "type": "string", - "description": "An opaque string representing the location of a Compute Node or a Task that has run previously. You can pass the affinityId of a Node to indicate that this Task needs to run on that Compute Node. Note that this is just a soft affinity. If the target Compute Node is busy or unavailable at the time the Task is scheduled, then the Task will be scheduled elsewhere." - } - }, - "required": [ - "affinityId" - ] - }, "AllocationState": { "type": "string", "description": "AllocationState enums", @@ -9729,7 +9621,7 @@ "type": "array", "description": "The Batch resources to which the token grants access. The authentication token grants access to a limited set of Batch service operations. Currently the only supported value for the access property is 'job', which grants access to all operations related to the Job which contains the Task.", "items": { - "$ref": "#/definitions/AccessScope" + "$ref": "#/definitions/BatchAccessScope" } } } @@ -9839,6 +9731,14 @@ } } }, + "Azure.Core.eTag": { + "type": "string", + "description": "The ETag (or entity tag) HTTP response header is an identifier for a specific version of a resource.\nIt lets caches be more efficient and save bandwidth, as a web server does not need to resend a full response if the content was not changed.\n\nIt is a string of ASCII characters placed between double quotes, like \"675af34563dc-tr34\"." + }, + "Azure.Core.ipV4Address": { + "type": "string", + "description": "Represent an IP V4 address serialized as a string.\n\nIt is formatted as four 8-bit fields separated by periods." + }, "AzureBlobFileSystemConfiguration": { "type": "object", "description": "Information used to connect to an Azure Storage Container using Blobfuse.", @@ -9890,16 +9790,17 @@ "type": "string", "description": "The Azure Storage account name." }, - "azureFileUrl": { - "type": "string", - "description": "The Azure Files URL. This is of the form 'https://{account}.file.core.windows.net/'." - }, "accountKey": { "type": "string", "format": "password", "description": "The Azure Storage account key.", "x-ms-secret": true }, + "azureFileUrl": { + "type": "string", + "format": "uri", + "description": "The Azure Files URL. This is of the form 'https://{account}.file.core.windows.net/'." + }, "relativeMountPath": { "type": "string", "description": "The relative path on the compute node where the file system will be mounted. All file systems are mounted relative to the Batch mounts directory, accessible via the AZ_BATCH_NODE_MOUNTS_DIR environment variable." @@ -9911,11 +9812,29 @@ }, "required": [ "accountName", - "azureFileUrl", "accountKey", + "azureFileUrl", "relativeMountPath" ] }, + "BatchAccessScope": { + "type": "string", + "description": "BatchAccessScope enums", + "enum": [ + "job" + ], + "x-ms-enum": { + "name": "BatchAccessScope", + "modelAsString": true, + "values": [ + { + "name": "Job", + "value": "job", + "description": "Grants access to perform all operations on the Job containing the Task." + } + ] + } + }, "BatchAccountListSupportedImagesResult": { "type": "object", "description": "The result of listing the supported Virtual Machine Images.", @@ -9934,6 +9853,43 @@ } } }, + "BatchAffinityInfo": { + "type": "object", + "description": "A locality hint that can be used by the Batch service to select a Compute Node\non which to start a Task.", + "properties": { + "affinityId": { + "type": "string", + "description": "An opaque string representing the location of a Compute Node or a Task that has run previously. You can pass the affinityId of a Node to indicate that this Task needs to run on that Compute Node. Note that this is just a soft affinity. If the target Compute Node is busy or unavailable at the time the Task is scheduled, then the Task will be scheduled elsewhere." + } + }, + "required": [ + "affinityId" + ] + }, + "BatchAllTasksCompleteMode": { + "type": "string", + "description": "The action the Batch service should take when all Tasks in the Job are in the completed state.", + "enum": [ + "noaction", + "terminatejob" + ], + "x-ms-enum": { + "name": "BatchAllTasksCompleteMode", + "modelAsString": true, + "values": [ + { + "name": "NoAction", + "value": "noaction", + "description": "Do nothing. The Job remains active unless terminated or disabled by some other means." + }, + { + "name": "TerminateJob", + "value": "terminatejob", + "description": "Terminate the Job. The Job's terminationReason is set to 'AllTasksComplete'." + } + ] + } + }, "BatchApplication": { "type": "object", "description": "Contains information about an application in an Azure Batch Account.", @@ -10055,6 +10011,7 @@ }, "url": { "type": "string", + "format": "uri", "description": "The URL of the Certificate.", "readOnly": true }, @@ -10086,12 +10043,13 @@ "readOnly": true }, "deleteCertificateError": { - "$ref": "#/definitions/DeleteBatchCertificateError", + "$ref": "#/definitions/BatchCertificateDeleteError", "description": "The error that occurred on the last attempt to delete this Certificate. This property is set only if the Certificate is in the DeleteFailed state.", "readOnly": true }, "data": { "type": "string", + "format": "byte", "description": "The base64-encoded contents of the Certificate. The maximum size is 10KB.", "x-ms-mutability": [ "create" @@ -10118,6 +10076,28 @@ "data" ] }, + "BatchCertificateDeleteError": { + "type": "object", + "description": "An error encountered by the Batch service when deleting a Certificate.", + "properties": { + "code": { + "type": "string", + "description": "An identifier for the Certificate deletion error. Codes are invariant and are intended to be consumed programmatically." + }, + "message": { + "type": "string", + "description": "A message describing the Certificate deletion error, intended to be suitable for display in a user interface." + }, + "values": { + "type": "array", + "description": "A list of additional error details related to the Certificate deletion error. This list includes details such as the active Pools and Compute Nodes referencing this Certificate. However, if a large number of resources reference the Certificate, the list contains only about the first hundred.", + "items": { + "$ref": "#/definitions/NameValuePair" + }, + "x-ms-identifiers": [] + } + } + }, "BatchCertificateFormat": { "type": "string", "description": "BatchCertificateFormat enums", @@ -10277,64 +10257,210 @@ ] } }, - "BatchError": { + "BatchContainerConfiguration": { "type": "object", - "description": "An error response received from the Azure Batch service.", + "description": "The configuration for container-enabled Pools.", "properties": { - "code": { - "type": "string", - "description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically." + "type": { + "$ref": "#/definitions/ContainerType", + "description": "The container technology to be used." }, - "message": { - "$ref": "#/definitions/BatchErrorMessage", - "description": "A message describing the error, intended to be suitable for display in a user interface." + "containerImageNames": { + "type": "array", + "description": "The collection of container Image names. This is the full Image reference, as would be specified to \"docker pull\". An Image will be sourced from the default Docker registry unless the Image is fully qualified with an alternative registry.", + "items": { + "type": "string" + } }, - "values": { + "containerRegistries": { "type": "array", - "description": "A collection of key-value pairs containing additional details about the error.", + "description": "Additional private registries from which containers can be pulled. If any Images must be downloaded from a private registry which requires credentials, then those credentials must be provided here.", "items": { - "$ref": "#/definitions/BatchErrorDetail" + "$ref": "#/definitions/ContainerRegistryReference" }, "x-ms-identifiers": [] } }, "required": [ - "code" + "type" ] }, - "BatchErrorDetail": { + "BatchContainerConfigurationUpdate": { "type": "object", - "description": "An item of additional information included in an Azure Batch error response.", + "description": "The configuration for container-enabled Pools.", "properties": { - "key": { - "type": "string", - "description": "An identifier specifying the meaning of the Value property." + "type": { + "$ref": "#/definitions/ContainerType", + "description": "The container technology to be used." }, - "value": { - "type": "string", - "description": "The additional information included with the error response." + "containerImageNames": { + "type": "array", + "description": "The collection of container Image names. This is the full Image reference, as would be specified to \"docker pull\". An Image will be sourced from the default Docker registry unless the Image is fully qualified with an alternative registry.", + "items": { + "type": "string" + } + }, + "containerRegistries": { + "type": "array", + "description": "Additional private registries from which containers can be pulled. If any Images must be downloaded from a private registry which requires credentials, then those credentials must be provided here.", + "items": { + "$ref": "#/definitions/ContainerRegistryReference" + }, + "x-ms-identifiers": [] } } }, - "BatchErrorMessage": { + "BatchCreateTaskCollectionResult": { "type": "object", - "description": "An error message received in an Azure Batch error response.", + "description": "The result of creating a collection of Tasks to a Job.", "properties": { - "lang": { - "type": "string", - "description": "The language code of the error message." - }, "value": { - "type": "string", - "description": "The text of the message." + "type": "array", + "description": "The results of the create Task collection operation.", + "items": { + "$ref": "#/definitions/BatchTaskCreateResult" + }, + "x-ms-client-name": "values", + "x-ms-identifiers": [] } } }, - "BatchJob": { + "BatchDiffDiskSettings": { "type": "object", - "description": "An Azure Batch Job.", + "description": "Specifies the ephemeral Disk Settings for the operating system disk used by the\ncompute node (VM).", "properties": { - "id": { + "placement": { + "$ref": "#/definitions/DiffDiskPlacement", + "description": "Specifies the ephemeral disk placement for operating system disk for all VMs in the pool. This property can be used by user in the request to choose the location e.g., cache disk space for Ephemeral OS disk provisioning. For more information on Ephemeral OS disk size requirements, please refer to Ephemeral OS disk size requirements for Windows VMs at https://learn.microsoft.com/azure/virtual-machines/windows/ephemeral-os-disks#size-requirements and Linux VMs at https://learn.microsoft.com/azure/virtual-machines/linux/ephemeral-os-disks#size-requirements." + } + } + }, + "BatchError": { + "type": "object", + "description": "An error response received from the Azure Batch service.", + "properties": { + "code": { + "type": "string", + "description": "An identifier for the error. Codes are invariant and are intended to be consumed programmatically." + }, + "message": { + "$ref": "#/definitions/BatchErrorMessage", + "description": "A message describing the error, intended to be suitable for display in a user interface." + }, + "values": { + "type": "array", + "description": "A collection of key-value pairs containing additional details about the error.", + "items": { + "$ref": "#/definitions/BatchErrorDetail" + }, + "x-ms-identifiers": [] + } + }, + "required": [ + "code" + ] + }, + "BatchErrorDetail": { + "type": "object", + "description": "An item of additional information included in an Azure Batch error response.", + "properties": { + "key": { + "type": "string", + "description": "An identifier specifying the meaning of the Value property." + }, + "value": { + "type": "string", + "description": "The additional information included with the error response." + } + } + }, + "BatchErrorMessage": { + "type": "object", + "description": "An error message received in an Azure Batch error response.", + "properties": { + "lang": { + "type": "string", + "description": "The language code of the error message." + }, + "value": { + "type": "string", + "description": "The text of the message." + } + } + }, + "BatchErrorSourceCategory": { + "type": "string", + "description": "BatchErrorSourceCategory enums", + "enum": [ + "usererror", + "servererror" + ], + "x-ms-enum": { + "name": "BatchErrorSourceCategory", + "modelAsString": true, + "values": [ + { + "name": "UserError", + "value": "usererror", + "description": "The error is due to a user issue, such as misconfiguration." + }, + { + "name": "ServerError", + "value": "servererror", + "description": "The error is due to an internal server issue." + } + ] + } + }, + "BatchInboundNatPool": { + "type": "object", + "description": "A inbound NAT Pool that can be used to address specific ports on Compute Nodes\nin a Batch Pool externally.", + "properties": { + "name": { + "type": "string", + "description": "The name of the endpoint. The name must be unique within a Batch Pool, can contain letters, numbers, underscores, periods, and hyphens. Names must start with a letter or number, must end with a letter, number, or underscore, and cannot exceed 77 characters. If any invalid values are provided the request fails with HTTP status code 400." + }, + "protocol": { + "$ref": "#/definitions/InboundEndpointProtocol", + "description": "The protocol of the endpoint." + }, + "backendPort": { + "type": "integer", + "format": "int32", + "description": "The port number on the Compute Node. This must be unique within a Batch Pool. Acceptable values are between 1 and 65535 except for 29876 and 29877 as these are reserved. If any reserved values are provided the request fails with HTTP status code 400." + }, + "frontendPortRangeStart": { + "type": "integer", + "format": "int32", + "description": "The first port number in the range of external ports that will be used to provide inbound access to the backendPort on individual Compute Nodes. 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. Each range must contain at least 40 ports. If any reserved or overlapping values are provided the request fails with HTTP status code 400." + }, + "frontendPortRangeEnd": { + "type": "integer", + "format": "int32", + "description": "The last port number in the range of external ports that will be used to provide inbound access to the backendPort on individual Compute Nodes. 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. Each range must contain at least 40 ports. If any reserved or overlapping values are provided the request fails with HTTP status code 400." + }, + "networkSecurityGroupRules": { + "type": "array", + "description": "A list of network security group rules that will be applied to the endpoint. The maximum number of rules that can be specified across all the endpoints on a Batch Pool is 25. If no network security group rules are specified, a default rule will be created to allow inbound access to the specified backendPort. If the maximum number of network security group rules is exceeded the request fails with HTTP status code 400.", + "items": { + "$ref": "#/definitions/NetworkSecurityGroupRule" + }, + "x-ms-identifiers": [] + } + }, + "required": [ + "name", + "protocol", + "backendPort", + "frontendPortRangeStart", + "frontendPortRangeEnd" + ] + }, + "BatchJob": { + "type": "object", + "description": "An Azure Batch Job.", + "properties": { + "id": { "type": "string", "description": "A string that uniquely identifies the Job within the Account. The ID is case-preserving and case-insensitive (that is, you may not have two IDs within an Account that differ only by case).", "readOnly": true @@ -10351,11 +10477,12 @@ }, "url": { "type": "string", + "format": "uri", "description": "The URL of the Job.", "readOnly": true }, "eTag": { - "type": "string", + "$ref": "#/definitions/Azure.Core.eTag", "description": "The ETag of the Job. This is an opaque string. You can use it to detect whether the Job has changed between requests. In particular, you can be pass the ETag when updating a Job to specify that your changes should take effect only if nobody else has modified the Job in the meantime.", "readOnly": true }, @@ -10441,13 +10568,15 @@ "description": "The Pool settings associated with the Job." }, "onAllTasksComplete": { - "$ref": "#/definitions/OnAllBatchTasksComplete", - "description": "The action the Batch service should take when all Tasks in the Job are in the completed state. The default is noaction." + "$ref": "#/definitions/BatchAllTasksCompleteMode", + "description": "The action the Batch service should take when all Tasks in the Job are in the completed state. The default is noaction.", + "x-ms-client-name": "allTasksCompleteMode" }, "onTaskFailure": { - "$ref": "#/definitions/OnBatchTaskFailure", + "$ref": "#/definitions/BatchTaskFailureMode", "description": "The action the Batch service should take when any Task in the Job fails. 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. The default is noaction.", - "readOnly": true + "readOnly": true, + "x-ms-client-name": "taskFailureMode" }, "networkConfiguration": { "$ref": "#/definitions/BatchJobNetworkConfiguration", @@ -10458,7 +10587,7 @@ "type": "array", "description": "A list of name-value pairs associated with the Job as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.", "items": { - "$ref": "#/definitions/MetadataItem" + "$ref": "#/definitions/BatchMetadataItem" }, "x-ms-identifiers": [] }, @@ -10470,14 +10599,15 @@ "stats": { "$ref": "#/definitions/BatchJobStatistics", "description": "Resource usage statistics for the entire lifetime of the Job. This property is populated only if the BatchJob was retrieved with an expand clause including the 'stats' attribute; otherwise it is null. The statistics may not be immediately available. The Batch service performs periodic roll-up of statistics. The typical delay is about 30 minutes.", - "readOnly": true + "readOnly": true, + "x-ms-client-name": "jobStatistics" } }, "required": [ "poolInfo" ] }, - "BatchJobAction": { + "BatchJobActionKind": { "type": "string", "description": "BatchJobAction enums", "enum": [ @@ -10486,7 +10616,7 @@ "terminate" ], "x-ms-enum": { - "name": "BatchJobAction", + "name": "BatchJobActionKind", "modelAsString": true, "values": [ { @@ -10523,7 +10653,7 @@ } } }, - "BatchJobCreateContent": { + "BatchJobCreateOptions": { "type": "object", "description": "Parameters for creating an Azure Batch Job.", "properties": { @@ -10583,12 +10713,14 @@ "description": "The Pool on which the Batch service runs the Job's Tasks." }, "onAllTasksComplete": { - "$ref": "#/definitions/OnAllBatchTasksComplete", - "description": "The action the Batch service should take when all Tasks in the Job are in the completed state. Note that if a Job contains no Tasks, then all Tasks are considered complete. This option is therefore most commonly used with a Job 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. The default is noaction." + "$ref": "#/definitions/BatchAllTasksCompleteMode", + "description": "The action the Batch service should take when all Tasks in the Job are in the completed state. Note that if a Job contains no Tasks, then all Tasks are considered complete. This option is therefore most commonly used with a Job 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. The default is noaction.", + "x-ms-client-name": "allTasksCompleteMode" }, "onTaskFailure": { - "$ref": "#/definitions/OnBatchTaskFailure", - "description": "The action the Batch service should take when any Task in the Job fails. 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. The default is noaction." + "$ref": "#/definitions/BatchTaskFailureMode", + "description": "The action the Batch service should take when any Task in the Job fails. 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. The default is noaction.", + "x-ms-client-name": "taskFailureMode" }, "networkConfiguration": { "$ref": "#/definitions/BatchJobNetworkConfiguration", @@ -10598,7 +10730,7 @@ "type": "array", "description": "A list of name-value pairs associated with the Job as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.", "items": { - "$ref": "#/definitions/MetadataItem" + "$ref": "#/definitions/BatchMetadataItem" }, "x-ms-identifiers": [] } @@ -10608,7 +10740,7 @@ "poolInfo" ] }, - "BatchJobDisableContent": { + "BatchJobDisableOptions": { "type": "object", "description": "Parameters for disabling an Azure Batch Job.", "properties": { @@ -10850,7 +10982,8 @@ }, "skipWithdrawFromVNet": { "type": "boolean", - "description": "Whether to withdraw Compute Nodes from the virtual network to DNC when the job is terminated or deleted. If true, nodes will remain joined to the virtual network to DNC. If false, nodes will automatically withdraw when the job ends. Defaults to false." + "description": "Whether to withdraw Compute Nodes from the virtual network to DNC when the job is terminated or deleted. If true, nodes will remain joined to the virtual network to DNC. If false, nodes will automatically withdraw when the job ends. Defaults to false.", + "x-ms-client-name": "skipWithdrawFromVnet" } }, "required": [ @@ -10868,7 +11001,8 @@ }, "skipWithdrawFromVNet": { "type": "boolean", - "description": "Whether to withdraw Compute Nodes from the virtual network to DNC when the job is terminated or deleted. If true, nodes will remain joined to the virtual network to DNC. If false, nodes will automatically withdraw when the job ends. Defaults to false." + "description": "Whether to withdraw Compute Nodes from the virtual network to DNC when the job is terminated or deleted. If true, nodes will remain joined to the virtual network to DNC. If false, nodes will automatically withdraw when the job ends. Defaults to false.", + "x-ms-client-name": "skipWithdrawFromVnet" } } }, @@ -10886,6 +11020,7 @@ }, "nodeUrl": { "type": "string", + "format": "uri", "description": "The URL of the Compute Node to which this entry refers." }, "jobPreparationTaskExecutionInfo": { @@ -10993,6 +11128,7 @@ }, "taskRootDirectoryUrl": { "type": "string", + "format": "uri", "description": "The URL to the root directory of the Job Preparation Task on the Compute Node." }, "exitCode": { @@ -11178,6 +11314,7 @@ }, "taskRootDirectoryUrl": { "type": "string", + "format": "uri", "description": "The URL to the root directory of the Job Release Task on the Compute Node." }, "exitCode": { @@ -11291,11 +11428,12 @@ }, "url": { "type": "string", + "format": "uri", "description": "The URL of the Job Schedule.", "readOnly": true }, "eTag": { - "type": "string", + "$ref": "#/definitions/Azure.Core.eTag", "description": "The ETag of the Job Schedule. This is an opaque string. You can use it to detect whether the Job Schedule has changed between requests. In particular, you can be pass the ETag with an Update Job Schedule request to specify that your changes should take effect only if nobody else has modified the schedule in the meantime.", "readOnly": true }, @@ -11350,14 +11488,15 @@ "type": "array", "description": "A list of name-value pairs associated with the schedule as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.", "items": { - "$ref": "#/definitions/MetadataItem" + "$ref": "#/definitions/BatchMetadataItem" }, "x-ms-identifiers": [] }, "stats": { "$ref": "#/definitions/BatchJobScheduleStatistics", "description": "The lifetime resource usage statistics for the Job Schedule. The statistics may not be immediately available. The Batch service performs periodic roll-up of statistics. The typical delay is about 30 minutes.", - "readOnly": true + "readOnly": true, + "x-ms-client-name": "jobScheduleStatistics" } }, "required": [ @@ -11390,7 +11529,7 @@ } } }, - "BatchJobScheduleCreateContent": { + "BatchJobScheduleCreateOptions": { "type": "object", "description": "Parameters for creating an Azure Batch Job Schedule", "properties": { @@ -11414,7 +11553,7 @@ "type": "array", "description": "A list of name-value pairs associated with the schedule as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.", "items": { - "$ref": "#/definitions/MetadataItem" + "$ref": "#/definitions/BatchMetadataItem" }, "x-ms-identifiers": [] } @@ -11510,6 +11649,7 @@ "properties": { "url": { "type": "string", + "format": "uri", "description": "The URL of the statistics." }, "startTime": { @@ -11542,37 +11682,44 @@ "readIOps": { "type": "string", "format": "int64", - "description": "The total number of disk read operations made by all Tasks in all Jobs created under the schedule." + "description": "The total number of disk read operations made by all Tasks in all Jobs created under the schedule.", + "x-ms-client-name": "readIops" }, "writeIOps": { "type": "string", "format": "int64", - "description": "The total number of disk write operations made by all Tasks in all Jobs created under the schedule." + "description": "The total number of disk write operations made by all Tasks in all Jobs created under the schedule.", + "x-ms-client-name": "writeIops" }, "readIOGiB": { "type": "number", "format": "float", - "description": "The total gibibytes read from disk by all Tasks in all Jobs created under the schedule." + "description": "The total gibibytes read from disk by all Tasks in all Jobs created under the schedule.", + "x-ms-client-name": "readIoGiB" }, "writeIOGiB": { "type": "number", "format": "float", - "description": "The total gibibytes written to disk by all Tasks in all Jobs created under the schedule." + "description": "The total gibibytes written to disk by all Tasks in all Jobs created under the schedule.", + "x-ms-client-name": "writeIoGiB" }, "numSucceededTasks": { "type": "string", "format": "int64", - "description": "The total number of Tasks successfully completed during the given time range in Jobs created under the schedule. A Task completes successfully if it returns exit code 0." + "description": "The total number of Tasks successfully completed during the given time range in Jobs created under the schedule. A Task completes successfully if it returns exit code 0.", + "x-ms-client-name": "succeededTasksCount" }, "numFailedTasks": { "type": "string", "format": "int64", - "description": "The total number of Tasks that failed during the given time range in Jobs created under the schedule. A Task fails if it exhausts its maximum retry count without returning exit code 0." + "description": "The total number of Tasks that failed during the given time range in Jobs created under the schedule. A Task fails if it exhausts its maximum retry count without returning exit code 0.", + "x-ms-client-name": "failedTasksCount" }, "numTaskRetries": { "type": "string", "format": "int64", - "description": "The total number of retries during the given time range on all Tasks in all Jobs created under the schedule." + "description": "The total number of retries during the given time range on all Tasks in all Jobs created under the schedule.", + "x-ms-client-name": "taskRetriesCount" }, "waitTime": { "type": "string", @@ -11597,7 +11744,7 @@ "waitTime" ] }, - "BatchJobScheduleUpdateContent": { + "BatchJobScheduleUpdateOptions": { "type": "object", "description": "Parameters for updating an Azure Batch Job Schedule.", "properties": { @@ -11613,7 +11760,7 @@ "type": "array", "description": "A list of name-value pairs associated with the Job Schedule as metadata. If you do not specify this element, existing metadata is left unchanged.", "items": { - "$ref": "#/definitions/MetadataItem" + "$ref": "#/definitions/BatchMetadataItem" }, "x-ms-identifiers": [] } @@ -11624,7 +11771,7 @@ "description": "An error encountered by the Batch service when scheduling a Job.", "properties": { "category": { - "$ref": "#/definitions/ErrorCategory", + "$ref": "#/definitions/BatchErrorSourceCategory", "description": "The category of the Job scheduling error." }, "code": { @@ -11675,12 +11822,14 @@ "description": "Whether Tasks in the Job can define dependencies on each other. The default is false." }, "onAllTasksComplete": { - "$ref": "#/definitions/OnAllBatchTasksComplete", - "description": "The action the Batch service should take when all Tasks in a Job created under this schedule are in the completed state. Note that if a Job contains no Tasks, then all Tasks are considered complete. This option is therefore most commonly used with a Job 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. The default is noaction." + "$ref": "#/definitions/BatchAllTasksCompleteMode", + "description": "The action the Batch service should take when all Tasks in a Job created under this schedule are in the completed state. Note that if a Job contains no Tasks, then all Tasks are considered complete. This option is therefore most commonly used with a Job 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. The default is noaction.", + "x-ms-client-name": "allTasksCompleteMode" }, "onTaskFailure": { - "$ref": "#/definitions/OnBatchTaskFailure", - "description": "The action the Batch service should take when any Task fails in a Job created under this schedule. A Task is considered to have failed if it 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. The default is noaction." + "$ref": "#/definitions/BatchTaskFailureMode", + "description": "The action the Batch service should take when any Task fails in a Job created under this schedule. A Task is considered to have failed if it 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. The default is noaction.", + "x-ms-client-name": "taskFailureMode" }, "networkConfiguration": { "$ref": "#/definitions/BatchJobNetworkConfiguration", @@ -11718,7 +11867,7 @@ "type": "array", "description": "A list of name-value pairs associated with each Job created under this schedule as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.", "items": { - "$ref": "#/definitions/MetadataItem" + "$ref": "#/definitions/BatchMetadataItem" }, "x-ms-identifiers": [] } @@ -11754,12 +11903,14 @@ "description": "Whether Tasks in the Job can define dependencies on each other. The default is false." }, "onAllTasksComplete": { - "$ref": "#/definitions/OnAllBatchTasksComplete", - "description": "The action the Batch service should take when all Tasks in a Job created under this schedule are in the completed state. Note that if a Job contains no Tasks, then all Tasks are considered complete. This option is therefore most commonly used with a Job 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. The default is noaction." + "$ref": "#/definitions/BatchAllTasksCompleteMode", + "description": "The action the Batch service should take when all Tasks in a Job created under this schedule are in the completed state. Note that if a Job contains no Tasks, then all Tasks are considered complete. This option is therefore most commonly used with a Job 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. The default is noaction.", + "x-ms-client-name": "allTasksCompleteMode" }, "onTaskFailure": { - "$ref": "#/definitions/OnBatchTaskFailure", - "description": "The action the Batch service should take when any Task fails in a Job created under this schedule. A Task is considered to have failed if it 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. The default is noaction." + "$ref": "#/definitions/BatchTaskFailureMode", + "description": "The action the Batch service should take when any Task fails in a Job created under this schedule. A Task is considered to have failed if it 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. The default is noaction.", + "x-ms-client-name": "taskFailureMode" }, "networkConfiguration": { "$ref": "#/definitions/BatchJobNetworkConfigurationUpdate", @@ -11797,7 +11948,7 @@ "type": "array", "description": "A list of name-value pairs associated with each Job created under this schedule as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.", "items": { - "$ref": "#/definitions/MetadataItem" + "$ref": "#/definitions/BatchMetadataItem" }, "x-ms-identifiers": [] } @@ -11863,6 +12014,7 @@ "properties": { "url": { "type": "string", + "format": "uri", "description": "The URL of the statistics." }, "startTime": { @@ -11895,37 +12047,44 @@ "readIOps": { "type": "string", "format": "int64", - "description": "The total number of disk read operations made by all Tasks in the Job." + "description": "The total number of disk read operations made by all Tasks in the Job.", + "x-ms-client-name": "readIops" }, "writeIOps": { "type": "string", "format": "int64", - "description": "The total number of disk write operations made by all Tasks in the Job." + "description": "The total number of disk write operations made by all Tasks in the Job.", + "x-ms-client-name": "writeIops" }, "readIOGiB": { "type": "number", "format": "float", - "description": "The total amount of data in GiB read from disk by all Tasks in the Job." + "description": "The total amount of data in GiB read from disk by all Tasks in the Job.", + "x-ms-client-name": "readIoGiB" }, "writeIOGiB": { "type": "number", "format": "float", - "description": "The total amount of data in GiB written to disk by all Tasks in the Job." + "description": "The total amount of data in GiB written to disk by all Tasks in the Job.", + "x-ms-client-name": "writeIoGiB" }, "numSucceededTasks": { "type": "string", "format": "int64", - "description": "The total number of Tasks successfully completed in the Job during the given time range. A Task completes successfully if it returns exit code 0." + "description": "The total number of Tasks successfully completed in the Job during the given time range. A Task completes successfully if it returns exit code 0.", + "x-ms-client-name": "succeededTasksCount" }, "numFailedTasks": { "type": "string", "format": "int64", - "description": "The total number of Tasks in the Job that failed during the given time range. A Task fails if it exhausts its maximum retry count without returning exit code 0." + "description": "The total number of Tasks in the Job that failed during the given time range. A Task fails if it exhausts its maximum retry count without returning exit code 0.", + "x-ms-client-name": "failedTasksCount" }, "numTaskRetries": { "type": "string", "format": "int64", - "description": "The total number of retries on all the Tasks in the Job during the given time range." + "description": "The total number of retries on all the Tasks in the Job during the given time range.", + "x-ms-client-name": "taskRetriesCount" }, "waitTime": { "type": "string", @@ -11950,7 +12109,7 @@ "waitTime" ] }, - "BatchJobTerminateContent": { + "BatchJobTerminateOptions": { "type": "object", "description": "Parameters for terminating an Azure Batch Job.", "properties": { @@ -11961,7 +12120,7 @@ } } }, - "BatchJobUpdateContent": { + "BatchJobUpdateOptions": { "type": "object", "description": "Parameters for updating an Azure Batch Job.", "properties": { @@ -11988,14 +12147,15 @@ "description": "The Pool on which the Batch service runs the Job's Tasks. You may change the Pool for a Job only when the Job is disabled. The Patch Job call will fail if you include the poolInfo element and the Job is not disabled. If you specify an autoPoolSpecification in the poolInfo, only the keepAlive property of the autoPoolSpecification can be updated, and then only if the autoPoolSpecification has a poolLifetimeOption of Job (other job properties can be updated as normal). If omitted, the Job continues to run on its current Pool." }, "onAllTasksComplete": { - "$ref": "#/definitions/OnAllBatchTasksComplete", - "description": "The action the Batch service should take when all Tasks in the Job are in the completed state. If omitted, the completion behavior is left unchanged. You may not change the value from terminatejob to noaction - that is, once you have engaged automatic Job termination, you cannot turn it off again. If you try to do this, the request fails with an 'invalid property value' error response; if you are calling the REST API directly, the HTTP status code is 400 (Bad Request)." + "$ref": "#/definitions/BatchAllTasksCompleteMode", + "description": "The action the Batch service should take when all Tasks in the Job are in the completed state. If omitted, the completion behavior is left unchanged. You may not change the value from terminatejob to noaction - that is, once you have engaged automatic Job termination, you cannot turn it off again. If you try to do this, the request fails with an 'invalid property value' error response; if you are calling the REST API directly, the HTTP status code is 400 (Bad Request).", + "x-ms-client-name": "allTasksCompleteMode" }, "metadata": { "type": "array", "description": "A list of name-value pairs associated with the Job as metadata. If omitted, the existing Job metadata is left unchanged.", "items": { - "$ref": "#/definitions/MetadataItem" + "$ref": "#/definitions/BatchMetadataItem" }, "x-ms-identifiers": [] }, @@ -12005,6 +12165,24 @@ } } }, + "BatchMetadataItem": { + "type": "object", + "description": "The Batch service does not assign any meaning to this metadata; it is solely\nfor the use of user code.", + "properties": { + "name": { + "type": "string", + "description": "The name of the metadata item." + }, + "value": { + "type": "string", + "description": "The value of the metadata item." + } + }, + "required": [ + "name", + "value" + ] + }, "BatchNode": { "type": "object", "description": "A Compute Node in the Batch service.", @@ -12015,6 +12193,7 @@ }, "url": { "type": "string", + "format": "uri", "description": "The URL of the Compute Node." }, "state": { @@ -12041,7 +12220,7 @@ "description": "The time at which this Compute Node was allocated to the Pool. This is the time when the Compute Node was initially allocated and doesn't change once set. It is not updated when the Compute Node is service healed or preempted." }, "ipAddress": { - "type": "string", + "$ref": "#/definitions/Azure.Core.ipV4Address", "description": "The IP address that other Nodes can use to communicate with this Compute Node. Every Compute Node that is added to a Pool is assigned a unique IP address. Whenever a Compute Node is removed from a Pool, all of its local files are deleted, and the IP address is reclaimed and could be reused for new Compute Nodes." }, "affinityId": { @@ -12282,16 +12461,6 @@ "upgradingOS" ] }, - "BatchNodeDeallocateContent": { - "type": "object", - "description": "Options for deallocating a Compute Node.", - "properties": { - "nodeDeallocateOption": { - "$ref": "#/definitions/BatchNodeDeallocateOption", - "description": "When to deallocate the Compute Node and what to do with currently running Tasks. The default value is requeue." - } - } - }, "BatchNodeDeallocateOption": { "type": "string", "description": "BatchNodeDeallocateOption enums", @@ -12328,6 +12497,16 @@ ] } }, + "BatchNodeDeallocateOptions": { + "type": "object", + "description": "Options for deallocating a Compute Node.", + "properties": { + "nodeDeallocateOption": { + "$ref": "#/definitions/BatchNodeDeallocateOption", + "description": "When to deallocate the Compute Node and what to do with currently running Tasks. The default value is requeue." + } + } + }, "BatchNodeDeallocationOption": { "type": "string", "description": "BatchNodeDeallocationOption enums", @@ -12364,16 +12543,6 @@ ] } }, - "BatchNodeDisableSchedulingContent": { - "type": "object", - "description": "Parameters for disabling scheduling on an Azure Batch Compute Node.", - "properties": { - "nodeDisableSchedulingOption": { - "$ref": "#/definitions/BatchNodeDisableSchedulingOption", - "description": "What to do with currently running Tasks when disabling Task scheduling on the Compute Node. The default value is requeue." - } - } - }, "BatchNodeDisableSchedulingOption": { "type": "string", "description": "BatchNodeDisableSchedulingOption enums", @@ -12404,6 +12573,16 @@ ] } }, + "BatchNodeDisableSchedulingOptions": { + "type": "object", + "description": "Parameters for disabling scheduling on an Azure Batch Compute Node.", + "properties": { + "nodeDisableSchedulingOption": { + "$ref": "#/definitions/BatchNodeDisableSchedulingOption", + "description": "What to do with currently running Tasks when disabling Task scheduling on the Compute Node. The default value is requeue." + } + } + }, "BatchNodeEndpointConfiguration": { "type": "object", "description": "The endpoint configuration for the Compute Node.", @@ -12453,6 +12632,7 @@ }, "url": { "type": "string", + "format": "uri", "description": "The URL of the file." }, "isDirectory": { @@ -12513,6 +12693,7 @@ "properties": { "resourceId": { "type": "string", + "format": "arm-id", "description": "The ARM resource id of the user assigned identity." } } @@ -12527,6 +12708,7 @@ }, "nodeUrl": { "type": "string", + "format": "uri", "description": "The URL of the Compute Node on which the Task ran." }, "poolId": { @@ -12543,6 +12725,7 @@ }, "taskRootDirectoryUrl": { "type": "string", + "format": "uri", "description": "The URL to the root directory of the Task on the Compute Node." } } @@ -12598,19 +12781,9 @@ ] } }, - "BatchNodeRebootContent": { - "type": "object", - "description": "Parameters for rebooting an Azure Batch Compute Node.", - "properties": { - "nodeRebootOption": { - "$ref": "#/definitions/BatchNodeRebootOption", - "description": "When to reboot the Compute Node and what to do with currently running Tasks. The default value is requeue." - } - } - }, - "BatchNodeRebootOption": { + "BatchNodeRebootKind": { "type": "string", - "description": "BatchNodeRebootOption enums", + "description": "BatchNodeRebootKind enums", "enum": [ "requeue", "terminate", @@ -12618,7 +12791,7 @@ "retaineddata" ], "x-ms-enum": { - "name": "BatchNodeRebootOption", + "name": "BatchNodeRebootKind", "modelAsString": true, "values": [ { @@ -12644,13 +12817,14 @@ ] } }, - "BatchNodeReimageContent": { + "BatchNodeRebootOptions": { "type": "object", - "description": "Parameters for reimaging an Azure Batch Compute Node.", + "description": "Parameters for rebooting an Azure Batch Compute Node.", "properties": { - "nodeReimageOption": { - "$ref": "#/definitions/BatchNodeReimageOption", - "description": "When to reimage the Compute Node and what to do with currently running Tasks. The default value is requeue." + "nodeRebootOption": { + "$ref": "#/definitions/BatchNodeRebootKind", + "description": "When to reboot the Compute Node and what to do with currently running Tasks. The default value is requeue.", + "x-ms-client-name": "nodeRebootKind" } } }, @@ -12690,12 +12864,22 @@ ] } }, + "BatchNodeReimageOptions": { + "type": "object", + "description": "Parameters for reimaging an Azure Batch Compute Node.", + "properties": { + "nodeReimageOption": { + "$ref": "#/definitions/BatchNodeReimageOption", + "description": "When to reimage the Compute Node and what to do with currently running Tasks. The default value is requeue." + } + } + }, "BatchNodeRemoteLoginSettings": { "type": "object", "description": "The remote login settings for a Compute Node.", "properties": { "remoteLoginIPAddress": { - "type": "string", + "$ref": "#/definitions/Azure.Core.ipV4Address", "description": "The IP address used for remote login to the Compute Node.", "x-ms-client-name": "remoteLoginIpAddress" }, @@ -12710,7 +12894,7 @@ "remoteLoginPort" ] }, - "BatchNodeRemoveContent": { + "BatchNodeRemoveOptions": { "type": "object", "description": "Parameters for removing nodes from an Azure Batch Pool.", "properties": { @@ -12719,7 +12903,8 @@ "description": "A list containing the IDs of the Compute Nodes to be removed from the specified Pool. A maximum of 100 nodes may be removed per request.", "items": { "type": "string" - } + }, + "x-ms-client-name": "nodeIds" }, "resizeTimeout": { "type": "string", @@ -12843,7 +13028,7 @@ ] } }, - "BatchNodeUserCreateContent": { + "BatchNodeUserCreateOptions": { "type": "object", "description": "Parameters for creating a user account for RDP or SSH access on an Azure Batch Compute Node.", "properties": { @@ -12875,7 +13060,7 @@ "name" ] }, - "BatchNodeUserUpdateContent": { + "BatchNodeUserUpdateOptions": { "type": "object", "description": "Parameters for updating a user account for RDP or SSH access on an Azure Batch Compute Node.", "properties": { @@ -12932,6 +13117,33 @@ } } }, + "BatchOsDisk": { + "type": "object", + "description": "Settings for the operating system disk of the compute node (VM).", + "properties": { + "ephemeralOSDiskSettings": { + "$ref": "#/definitions/BatchDiffDiskSettings", + "description": "Specifies the ephemeral Disk Settings for the operating system disk used by the compute node (VM)." + }, + "caching": { + "$ref": "#/definitions/CachingType", + "description": "Specifies the caching requirements. Possible values are: None, ReadOnly, ReadWrite. The default values are: None for Standard storage. ReadOnly for Premium storage." + }, + "diskSizeGB": { + "type": "integer", + "format": "int32", + "description": "The initial disk size in GB when creating new OS disk." + }, + "managedDisk": { + "$ref": "#/definitions/ManagedDisk", + "description": "The managed disk parameters." + }, + "writeAcceleratorEnabled": { + "type": "boolean", + "description": "Specifies whether writeAccelerator should be enabled or disabled on the disk." + } + } + }, "BatchPool": { "type": "object", "description": "A Pool in the Azure Batch service.", @@ -12948,11 +13160,12 @@ }, "url": { "type": "string", + "format": "uri", "description": "The URL of the Pool.", "readOnly": true }, "eTag": { - "type": "string", + "$ref": "#/definitions/Azure.Core.eTag", "description": "The ETag of the Pool. This is an opaque string. You can use it to detect whether the Pool has changed between requests. In particular, you can be pass the ETag when updating a Pool to specify that your changes should take effect only if nobody else has modified the Pool in the meantime.", "readOnly": true }, @@ -13124,7 +13337,7 @@ "type": "array", "description": "A list of name-value pairs associated with the Pool as metadata.", "items": { - "$ref": "#/definitions/MetadataItem" + "$ref": "#/definitions/BatchMetadataItem" }, "readOnly": true, "x-ms-identifiers": [] @@ -13132,7 +13345,8 @@ "stats": { "$ref": "#/definitions/BatchPoolStatistics", "description": "Utilization and resource usage statistics for the entire lifetime of the Pool. This property is populated only if the BatchPool was retrieved with an expand clause including the 'stats' attribute; otherwise it is null. The statistics may not be immediately available. The Batch service performs periodic roll-up of statistics. The typical delay is about 30 minutes.", - "readOnly": true + "readOnly": true, + "x-ms-client-name": "poolStatistics" }, "mountConfiguration": { "type": "array", @@ -13163,7 +13377,7 @@ } } }, - "BatchPoolCreateContent": { + "BatchPoolCreateOptions": { "type": "object", "description": "Parameters for creating an Azure Batch Pool.", "properties": { @@ -13267,7 +13481,7 @@ "type": "array", "description": "A list of name-value pairs associated with the Pool as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.", "items": { - "$ref": "#/definitions/MetadataItem" + "$ref": "#/definitions/BatchMetadataItem" }, "x-ms-identifiers": [] }, @@ -13293,7 +13507,7 @@ "vmSize" ] }, - "BatchPoolEnableAutoScaleContent": { + "BatchPoolEnableAutoScaleOptions": { "type": "object", "description": "Parameters for enabling automatic scaling on an Azure Batch Pool.", "properties": { @@ -13316,7 +13530,7 @@ "type": "array", "description": "A list of inbound NAT Pools that can be used to address specific ports on an individual Compute Node externally. The maximum number of inbound NAT Pools per Batch Pool is 5. If the maximum number of inbound NAT Pools is exceeded the request fails with HTTP status code 400. This cannot be specified if the IPAddressProvisioningType is NoPublicIPAddresses.", "items": { - "$ref": "#/definitions/InboundNatPool" + "$ref": "#/definitions/BatchInboundNatPool" }, "x-ms-client-name": "inboundNatPools", "x-ms-identifiers": [] @@ -13334,14 +13548,14 @@ "type": "array", "description": "A list of inbound NAT Pools that can be used to address specific ports on an individual Compute Node externally. The maximum number of inbound NAT Pools per Batch Pool is 5. If the maximum number of inbound NAT Pools is exceeded the request fails with HTTP status code 400. This cannot be specified if the IPAddressProvisioningType is NoPublicIPAddresses.", "items": { - "$ref": "#/definitions/InboundNatPool" + "$ref": "#/definitions/BatchInboundNatPool" }, "x-ms-client-name": "inboundNatPools", "x-ms-identifiers": [] } } }, - "BatchPoolEvaluateAutoScaleContent": { + "BatchPoolEvaluateAutoScaleOptions": { "type": "object", "description": "Parameters for evaluating an automatic scaling formula on an Azure Batch Pool.", "properties": { @@ -13366,7 +13580,7 @@ "type": "array", "description": "The list of user identities associated with the Batch account. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.", "items": { - "$ref": "#/definitions/UserAssignedIdentity" + "$ref": "#/definitions/BatchUserAssignedIdentity" }, "x-ms-identifiers": [] } @@ -13525,7 +13739,7 @@ } } }, - "BatchPoolReplaceContent": { + "BatchPoolReplaceOptions": { "type": "object", "description": "Parameters for replacing properties on an Azure Batch Pool.", "properties": { @@ -13553,7 +13767,7 @@ "type": "array", "description": "A list of name-value pairs associated with the Pool as metadata. This list replaces any existing metadata configured on the Pool. If omitted, or if you specify an empty collection, any existing metadata is removed from the Pool.", "items": { - "$ref": "#/definitions/MetadataItem" + "$ref": "#/definitions/BatchMetadataItem" }, "x-ms-identifiers": [] }, @@ -13568,7 +13782,7 @@ "metadata" ] }, - "BatchPoolResizeContent": { + "BatchPoolResizeOptions": { "type": "object", "description": "Parameters for changing the size of an Azure Batch Pool.", "properties": { @@ -13636,12 +13850,14 @@ "diskReadIOps": { "type": "string", "format": "int64", - "description": "The total number of disk read operations across all Compute Nodes in the Pool." + "description": "The total number of disk read operations across all Compute Nodes in the Pool.", + "x-ms-client-name": "diskReadIops" }, "diskWriteIOps": { "type": "string", "format": "int64", - "description": "The total number of disk write operations across all Compute Nodes in the Pool." + "description": "The total number of disk write operations across all Compute Nodes in the Pool.", + "x-ms-client-name": "diskWriteIops" }, "diskReadGiB": { "type": "number", @@ -13777,7 +13993,7 @@ "type": "array", "description": "A list of name-value pairs associated with the Pool as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.", "items": { - "$ref": "#/definitions/MetadataItem" + "$ref": "#/definitions/BatchMetadataItem" }, "x-ms-identifiers": [] }, @@ -13899,7 +14115,7 @@ "type": "array", "description": "A list of name-value pairs associated with the Pool as metadata. The Batch service does not assign any meaning to metadata; it is solely for the use of user code.", "items": { - "$ref": "#/definitions/MetadataItem" + "$ref": "#/definitions/BatchMetadataItem" }, "x-ms-identifiers": [] }, @@ -13951,6 +14167,7 @@ "properties": { "url": { "type": "string", + "format": "uri", "description": "The URL for the statistics." }, "startTime": { @@ -13965,11 +14182,13 @@ }, "usageStats": { "$ref": "#/definitions/BatchPoolUsageStatistics", - "description": "Statistics related to Pool usage, such as the amount of core-time used." + "description": "Statistics related to Pool usage, such as the amount of core-time used.", + "x-ms-client-name": "usageStatistics" }, "resourceStats": { "$ref": "#/definitions/BatchPoolResourceStatistics", - "description": "Statistics related to resource consumption by Compute Nodes in the Pool." + "description": "Statistics related to resource consumption by Compute Nodes in the Pool.", + "x-ms-client-name": "resourceStatistics" } }, "required": [ @@ -13978,7 +14197,7 @@ "lastUpdateTime" ] }, - "BatchPoolUpdateContent": { + "BatchPoolUpdateOptions": { "type": "object", "description": "Parameters for updating an Azure Batch Pool.", "properties": { @@ -14018,7 +14237,7 @@ "type": "array", "description": "A list of name-value pairs associated with the Pool as metadata. If this element is present, it replaces any existing metadata configured on the Pool. If you specify an empty collection, any metadata is removed from the Pool. If omitted, any existing metadata is left unchanged.", "items": { - "$ref": "#/definitions/MetadataItem" + "$ref": "#/definitions/BatchMetadataItem" }, "x-ms-identifiers": [] }, @@ -14134,16 +14353,34 @@ "dedicatedCoreTime" ] }, - "BatchStartTask": { + "BatchPublicIpAddressConfiguration": { "type": "object", - "description": "Batch will retry Tasks when a recovery operation is triggered on a Node.\nExamples of recovery operations include (but are not limited to) when an\nunhealthy Node is rebooted or a Compute Node disappeared due to host failure.\nRetries due to recovery operations are independent of and are not counted\nagainst the maxTaskRetryCount. Even if the maxTaskRetryCount is 0, an internal\nretry due to a recovery operation may occur. Because of this, all Tasks should\nbe idempotent. This means Tasks need to tolerate being interrupted and\nrestarted without causing any corruption or duplicate data. The best practice\nfor long running Tasks is to use some form of checkpointing. In some cases the\nStartTask may be re-run even though the Compute Node was not rebooted. Special\ncare should be taken to avoid StartTasks which create breakaway process or\ninstall/launch services from the StartTask working directory, as this will\nblock Batch from being able to re-run the StartTask.", + "description": "The public IP Address configuration of the networking configuration of a Pool.", "properties": { - "commandLine": { - "type": "string", - "description": "The command line of the StartTask. The command line does not run under a shell, and therefore cannot take advantage of shell features such as environment variable expansion. If you want to take advantage of such features, you should invoke the shell in the command line, for example using \"cmd /c MyCommand\" in Windows or \"/bin/sh -c MyCommand\" in Linux. If the command line refers to file paths, it should use a relative path (relative to the Task working directory), or use the Batch provided environment variable (https://learn.microsoft.com/azure/batch/batch-compute-node-environment-variables)." + "provision": { + "$ref": "#/definitions/IpAddressProvisioningType", + "description": "The provisioning type for Public IP Addresses for the Pool. The default value is BatchManaged.", + "x-ms-client-name": "IpAddressProvisioningType" }, - "containerSettings": { - "$ref": "#/definitions/BatchTaskContainerSettings", + "ipAddressIds": { + "type": "array", + "description": "The list of public IPs which the Batch service will use when provisioning Compute Nodes. The number of IPs specified here limits the maximum size of the Pool - 100 dedicated nodes or 100 Spot/Low-priority nodes can be allocated for each public IP. For example, a pool needing 250 dedicated VMs would need at least 3 public IPs specified. Each element of this collection is of the form: /subscriptions/{subscription}/resourceGroups/{group}/providers/Microsoft.Network/publicIPAddresses/{ip}.", + "items": { + "$ref": "#/definitions/Azure.Core.ipV4Address" + } + } + } + }, + "BatchStartTask": { + "type": "object", + "description": "Batch will retry Tasks when a recovery operation is triggered on a Node.\nExamples of recovery operations include (but are not limited to) when an\nunhealthy Node is rebooted or a Compute Node disappeared due to host failure.\nRetries due to recovery operations are independent of and are not counted\nagainst the maxTaskRetryCount. Even if the maxTaskRetryCount is 0, an internal\nretry due to a recovery operation may occur. Because of this, all Tasks should\nbe idempotent. This means Tasks need to tolerate being interrupted and\nrestarted without causing any corruption or duplicate data. The best practice\nfor long running Tasks is to use some form of checkpointing. In some cases the\nStartTask may be re-run even though the Compute Node was not rebooted. Special\ncare should be taken to avoid StartTasks which create breakaway process or\ninstall/launch services from the StartTask working directory, as this will\nblock Batch from being able to re-run the StartTask.", + "properties": { + "commandLine": { + "type": "string", + "description": "The command line of the StartTask. The command line does not run under a shell, and therefore cannot take advantage of shell features such as environment variable expansion. If you want to take advantage of such features, you should invoke the shell in the command line, for example using \"cmd /c MyCommand\" in Windows or \"/bin/sh -c MyCommand\" in Linux. If the command line refers to file paths, it should use a relative path (relative to the Task working directory), or use the Batch provided environment variable (https://learn.microsoft.com/azure/batch/batch-compute-node-environment-variables)." + }, + "containerSettings": { + "$ref": "#/definitions/BatchTaskContainerSettings", "description": "The settings for the container under which the StartTask runs. When this is specified, all directories recursively below the AZ_BATCH_NODE_ROOT_DIR (the root of Azure Batch directories on the node) are mapped into the container, all Task environment variables are mapped into the container, and the Task command line is executed in the container. Files produced in the container outside of AZ_BATCH_NODE_ROOT_DIR might not be reflected to the host disk, meaning that Batch file APIs will not be able to access those files." }, "resourceFiles": { @@ -14399,7 +14636,7 @@ "x-ms-client-name": "nodeAgentSkuId" }, "imageReference": { - "$ref": "#/definitions/ImageReference", + "$ref": "#/definitions/BatchVmImageReference", "description": "The reference to the Azure Virtual Machine's Marketplace Image." }, "osType": { @@ -14446,11 +14683,12 @@ }, "url": { "type": "string", + "format": "uri", "description": "The URL of the Task.", "readOnly": true }, "eTag": { - "type": "string", + "$ref": "#/definitions/Azure.Core.eTag", "description": "The ETag of the Task. This is an opaque string. You can use it to detect whether the Task has changed between requests. In particular, you can be pass the ETag when updating a Task to specify that your changes should take effect only if nobody else has modified the Task in the meantime.", "readOnly": true }, @@ -14531,7 +14769,7 @@ "x-ms-identifiers": [] }, "affinityInfo": { - "$ref": "#/definitions/AffinityInfo", + "$ref": "#/definitions/BatchAffinityInfo", "description": "A locality hint that can be used by the Batch service to select a Compute Node on which to start the new Task.", "readOnly": true }, @@ -14568,7 +14806,8 @@ "stats": { "$ref": "#/definitions/BatchTaskStatistics", "description": "Resource usage statistics for the Task.", - "readOnly": true + "readOnly": true, + "x-ms-client-name": "taskStatistics" }, "dependsOn": { "$ref": "#/definitions/BatchTaskDependencies", @@ -14591,55 +14830,6 @@ } } }, - "BatchTaskAddCollectionResult": { - "type": "object", - "description": "The result of adding a collection of Tasks to a Job.", - "properties": { - "value": { - "type": "array", - "description": "The results of the add Task collection operation.", - "items": { - "$ref": "#/definitions/BatchTaskAddResult" - }, - "x-ms-identifiers": [] - } - } - }, - "BatchTaskAddResult": { - "type": "object", - "description": "Result for a single Task added as part of an add Task collection operation.", - "properties": { - "status": { - "$ref": "#/definitions/BatchTaskAddStatus", - "description": "The status of the add Task request." - }, - "taskId": { - "type": "string", - "description": "The ID of the Task for which this is the result." - }, - "eTag": { - "type": "string", - "description": "The ETag of the Task, if the Task was successfully added. You can use this to detect whether the Task has changed between requests. In particular, you can be pass the ETag with an Update Task request to specify that your changes should take effect only if nobody else has modified the Job in the meantime." - }, - "lastModified": { - "type": "string", - "format": "date-time", - "description": "The last modified time of the Task." - }, - "location": { - "type": "string", - "description": "The URL of the Task, if the Task was successfully added." - }, - "error": { - "$ref": "#/definitions/BatchError", - "description": "The error encountered while attempting to add the Task." - } - }, - "required": [ - "status", - "taskId" - ] - }, "BatchTaskAddStatus": { "type": "string", "description": "BatchTaskAddStatus enums", @@ -14828,7 +15018,7 @@ "taskSlotCounts" ] }, - "BatchTaskCreateContent": { + "BatchTaskCreateOptions": { "type": "object", "description": "Parameters for creating an Azure Batch Task.", "properties": { @@ -14877,7 +15067,7 @@ "x-ms-identifiers": [] }, "affinityInfo": { - "$ref": "#/definitions/AffinityInfo", + "$ref": "#/definitions/BatchAffinityInfo", "description": "A locality hint that can be used by the Batch service to select a Compute Node on which to start the new Task." }, "constraints": { @@ -14919,6 +15109,41 @@ "commandLine" ] }, + "BatchTaskCreateResult": { + "type": "object", + "description": "Result for a single Task created as part of an add Task collection operation.", + "properties": { + "status": { + "$ref": "#/definitions/BatchTaskAddStatus", + "description": "The status of the add Task request." + }, + "taskId": { + "type": "string", + "description": "The ID of the Task for which this is the result." + }, + "eTag": { + "$ref": "#/definitions/Azure.Core.eTag", + "description": "The ETag of the Task, if the Task was successfully added. You can use this to detect whether the Task has changed between requests. In particular, you can be pass the ETag with an Update Task request to specify that your changes should take effect only if nobody else has modified the Job in the meantime." + }, + "lastModified": { + "type": "string", + "format": "date-time", + "description": "The last modified time of the Task." + }, + "location": { + "type": "string", + "description": "The URL of the Task, if the Task was successfully added." + }, + "error": { + "$ref": "#/definitions/BatchError", + "description": "The error encountered while attempting to add the Task." + } + }, + "required": [ + "status", + "taskId" + ] + }, "BatchTaskDependencies": { "type": "object", "description": "Specifies any dependencies of a Task. Any Task that is explicitly specified or\nwithin a dependency range must complete before the dependant Task will be\nscheduled.", @@ -15026,7 +15251,7 @@ "description": "Information about a Task failure.", "properties": { "category": { - "$ref": "#/definitions/ErrorCategory", + "$ref": "#/definitions/BatchErrorSourceCategory", "description": "The category of the Task error." }, "code": { @@ -15050,6 +15275,30 @@ "category" ] }, + "BatchTaskFailureMode": { + "type": "string", + "description": "TaskFailure enums", + "enum": [ + "noaction", + "performexitoptionsjobaction" + ], + "x-ms-enum": { + "name": "BatchTaskFailureMode", + "modelAsString": true, + "values": [ + { + "name": "NoAction", + "value": "noaction", + "description": "Do nothing. The Job remains active unless terminated or disabled by some other means." + }, + { + "name": "PerformExitOptionsJobAction", + "value": "performexitoptionsjobaction", + "description": "Terminate the Job. The Job's terminationReason is set to 'AllTasksComplete'." + } + ] + } + }, "BatchTaskGroup": { "type": "object", "description": "A collection of Azure Batch Tasks to add.", @@ -15058,8 +15307,9 @@ "type": "array", "description": "The collection of Tasks to add. The maximum count of Tasks is 100. The total serialized size of this collection must be less than 1MB. If it is greater than 1MB (for example if each Task has 100's of resource files or environment variables), the request will fail with code 'RequestBodyTooLarge' and should be retried again with fewer Tasks.", "items": { - "$ref": "#/definitions/BatchTaskCreateContent" - } + "$ref": "#/definitions/BatchTaskCreateOptions" + }, + "x-ms-client-name": "values" } }, "required": [ @@ -15092,6 +15342,7 @@ "properties": { "taskUrl": { "type": "string", + "format": "uri", "description": "The URL of the Task." }, "jobId": { @@ -15257,6 +15508,7 @@ "properties": { "url": { "type": "string", + "format": "uri", "description": "The URL of the statistics." }, "startTime": { @@ -15289,22 +15541,26 @@ "readIOps": { "type": "string", "format": "int64", - "description": "The total number of disk read operations made by the Task." + "description": "The total number of disk read operations made by the Task.", + "x-ms-client-name": "readIops" }, "writeIOps": { "type": "string", "format": "int64", - "description": "The total number of disk write operations made by the Task." + "description": "The total number of disk write operations made by the Task.", + "x-ms-client-name": "writeIops" }, "readIOGiB": { "type": "number", "format": "float", - "description": "The total gibibytes read from disk by the Task." + "description": "The total gibibytes read from disk by the Task.", + "x-ms-client-name": "readIoGiB" }, "writeIOGiB": { "type": "number", "format": "float", - "description": "The total gibibytes written to disk by the Task." + "description": "The total gibibytes written to disk by the Task.", + "x-ms-client-name": "writeIoGiB" }, "waitTime": { "type": "string", @@ -15326,6 +15582,84 @@ "waitTime" ] }, + "BatchUefiSettings": { + "type": "object", + "description": "Specifies the security settings like secure boot and vTPM used while creating the virtual machine.", + "properties": { + "secureBootEnabled": { + "type": "boolean", + "description": "Specifies whether secure boot should be enabled on the virtual machine." + }, + "vTpmEnabled": { + "type": "boolean", + "description": "Specifies whether vTPM should be enabled on the virtual machine." + } + } + }, + "BatchUserAssignedIdentity": { + "type": "object", + "description": "The user assigned Identity", + "properties": { + "resourceId": { + "type": "string", + "format": "arm-id", + "description": "The ARM resource id of the user assigned identity." + }, + "clientId": { + "type": "string", + "description": "The client id of the user assigned identity.", + "readOnly": true + }, + "principalId": { + "type": "string", + "description": "The principal id of the user assigned identity.", + "readOnly": true + } + }, + "required": [ + "resourceId" + ] + }, + "BatchVmImageReference": { + "type": "object", + "description": "A reference to an Azure Virtual Machines Marketplace Image or a Azure Compute Gallery Image.\nTo get the list of all Azure Marketplace Image references verified by Azure Batch, see the\n' List Supported Images ' operation.", + "properties": { + "publisher": { + "type": "string", + "description": "The publisher of the Azure Virtual Machines Marketplace Image. For example, Canonical or MicrosoftWindowsServer." + }, + "offer": { + "type": "string", + "description": "The offer type of the Azure Virtual Machines Marketplace Image. For example, UbuntuServer or WindowsServer." + }, + "sku": { + "type": "string", + "description": "The SKU of the Azure Virtual Machines Marketplace Image. For example, 18.04-LTS or 2019-Datacenter." + }, + "version": { + "type": "string", + "description": "The version of the Azure Virtual Machines Marketplace Image. A value of 'latest' can be specified to select the latest version of an Image. If omitted, the default is 'latest'." + }, + "virtualMachineImageId": { + "type": "string", + "format": "arm-id", + "description": "The ARM resource identifier of the Azure Compute Gallery Image. Compute Nodes in the Pool will be created using this Image Id. This is of the form /subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/galleries/{galleryName}/images/{imageDefinitionName}/versions/{VersionId} or /subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/galleries/{galleryName}/images/{imageDefinitionName} for always defaulting to the latest image version. This property is mutually exclusive with other ImageReference properties. The Azure Compute Gallery Image must have replicas in the same region and must be in the same subscription as the Azure Batch account. If the image version is not specified in the imageId, the latest version will be used. For information about the firewall settings for the Batch Compute Node agent to communicate with the Batch service see https://learn.microsoft.com/azure/batch/nodes-and-pools#virtual-network-vnet-and-firewall-configuration." + }, + "exactVersion": { + "type": "string", + "description": "The specific version of the platform image or marketplace image used to create the node. This read-only field differs from 'version' only if the value specified for 'version' when the pool was created was 'latest'.", + "readOnly": true + }, + "sharedGalleryImageId": { + "type": "string", + "description": "The shared gallery image unique identifier. This property is mutually exclusive with other properties and can be fetched from shared gallery image GET call." + }, + "communityGalleryImageId": { + "type": "string", + "description": "The community gallery image unique identifier. This property is mutually exclusive with other properties and can be fetched from community gallery image GET call." + } + } + }, "CachingType": { "type": "string", "description": "CachingType enums", @@ -15390,59 +15724,6 @@ "password" ] }, - "ContainerConfiguration": { - "type": "object", - "description": "The configuration for container-enabled Pools.", - "properties": { - "type": { - "$ref": "#/definitions/ContainerType", - "description": "The container technology to be used." - }, - "containerImageNames": { - "type": "array", - "description": "The collection of container Image names. This is the full Image reference, as would be specified to \"docker pull\". An Image will be sourced from the default Docker registry unless the Image is fully qualified with an alternative registry.", - "items": { - "type": "string" - } - }, - "containerRegistries": { - "type": "array", - "description": "Additional private registries from which containers can be pulled. If any Images must be downloaded from a private registry which requires credentials, then those credentials must be provided here.", - "items": { - "$ref": "#/definitions/ContainerRegistryReference" - }, - "x-ms-identifiers": [] - } - }, - "required": [ - "type" - ] - }, - "ContainerConfigurationUpdate": { - "type": "object", - "description": "The configuration for container-enabled Pools.", - "properties": { - "type": { - "$ref": "#/definitions/ContainerType", - "description": "The container technology to be used." - }, - "containerImageNames": { - "type": "array", - "description": "The collection of container Image names. This is the full Image reference, as would be specified to \"docker pull\". An Image will be sourced from the default Docker registry unless the Image is fully qualified with an alternative registry.", - "items": { - "type": "string" - } - }, - "containerRegistries": { - "type": "array", - "description": "Additional private registries from which containers can be pulled. If any Images must be downloaded from a private registry which requires credentials, then those credentials must be provided here.", - "items": { - "$ref": "#/definitions/ContainerRegistryReference" - }, - "x-ms-identifiers": [] - } - } - }, "ContainerHostBatchBindMountEntry": { "type": "object", "description": "The entry of path and mount mode you want to mount into task container.", @@ -15521,6 +15802,7 @@ }, "registryServer": { "type": "string", + "format": "uri", "description": "The registry URL. If omitted, the default is \"docker.io\"." }, "identityReference": { @@ -15607,28 +15889,6 @@ "diskSizeGB" ] }, - "DeleteBatchCertificateError": { - "type": "object", - "description": "An error encountered by the Batch service when deleting a Certificate.", - "properties": { - "code": { - "type": "string", - "description": "An identifier for the Certificate deletion error. Codes are invariant and are intended to be consumed programmatically." - }, - "message": { - "type": "string", - "description": "A message describing the Certificate deletion error, intended to be suitable for display in a user interface." - }, - "values": { - "type": "array", - "description": "A list of additional error details related to the Certificate deletion error. This list includes details such as the active Pools and Compute Nodes referencing this Certificate. However, if a large number of resources reference the Certificate, the list contains only about the first hundred.", - "items": { - "$ref": "#/definitions/NameValuePair" - }, - "x-ms-identifiers": [] - } - } - }, "DependencyAction": { "type": "string", "description": "DependencyAction enums", @@ -15671,16 +15931,6 @@ ] } }, - "DiffDiskSettings": { - "type": "object", - "description": "Specifies the ephemeral Disk Settings for the operating system disk used by the\ncompute node (VM).", - "properties": { - "placement": { - "$ref": "#/definitions/DiffDiskPlacement", - "description": "Specifies the ephemeral disk placement for operating system disk for all VMs in the pool. This property can be used by user in the request to choose the location e.g., cache disk space for Ephemeral OS disk provisioning. For more information on Ephemeral OS disk size requirements, please refer to Ephemeral OS disk size requirements for Windows VMs at https://learn.microsoft.com/azure/virtual-machines/windows/ephemeral-os-disks#size-requirements and Linux VMs at https://learn.microsoft.com/azure/virtual-machines/linux/ephemeral-os-disks#size-requirements." - } - } - }, "DisableBatchJobOption": { "type": "string", "description": "DisableBatchJobOption enums", @@ -15813,30 +16063,6 @@ "name" ] }, - "ErrorCategory": { - "type": "string", - "description": "ErrorCategory enums", - "enum": [ - "usererror", - "servererror" - ], - "x-ms-enum": { - "name": "ErrorCategory", - "modelAsString": true, - "values": [ - { - "name": "UserError", - "value": "usererror", - "description": "The error is due to a user issue, such as misconfiguration." - }, - { - "name": "ServerError", - "value": "servererror", - "description": "The error is due to an internal server issue." - } - ] - } - }, "ExitCodeMapping": { "type": "object", "description": "How the Batch service should respond if a Task exits with a particular exit\ncode.", @@ -15920,7 +16146,7 @@ "description": "Specifies how the Batch service responds to a particular exit condition.", "properties": { "jobAction": { - "$ref": "#/definitions/BatchJobAction", + "$ref": "#/definitions/BatchJobActionKind", "description": "An action to take on the Job containing the Task, if the Task completes with the given exit condition and the Job's onTaskFailed property is 'performExitOptionsJobAction'. 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)." }, "dependencyAction": { @@ -15962,62 +16188,6 @@ "contentLength" ] }, - "HttpHeader": { - "type": "object", - "description": "An HTTP header name-value pair", - "properties": { - "name": { - "type": "string", - "description": "The case-insensitive name of the header to be used while uploading output files." - }, - "value": { - "type": "string", - "description": "The value of the header to be used while uploading output files." - } - }, - "required": [ - "name" - ] - }, - "ImageReference": { - "type": "object", - "description": "A reference to an Azure Virtual Machines Marketplace Image or a Azure Compute Gallery Image.\nTo get the list of all Azure Marketplace Image references verified by Azure Batch, see the\n' List Supported Images ' operation.", - "properties": { - "publisher": { - "type": "string", - "description": "The publisher of the Azure Virtual Machines Marketplace Image. For example, Canonical or MicrosoftWindowsServer." - }, - "offer": { - "type": "string", - "description": "The offer type of the Azure Virtual Machines Marketplace Image. For example, UbuntuServer or WindowsServer." - }, - "sku": { - "type": "string", - "description": "The SKU of the Azure Virtual Machines Marketplace Image. For example, 18.04-LTS or 2019-Datacenter." - }, - "version": { - "type": "string", - "description": "The version of the Azure Virtual Machines Marketplace Image. A value of 'latest' can be specified to select the latest version of an Image. If omitted, the default is 'latest'." - }, - "virtualMachineImageId": { - "type": "string", - "description": "The ARM resource identifier of the Azure Compute Gallery Image. Compute Nodes in the Pool will be created using this Image Id. This is of the form /subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/galleries/{galleryName}/images/{imageDefinitionName}/versions/{VersionId} or /subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/galleries/{galleryName}/images/{imageDefinitionName} for always defaulting to the latest image version. This property is mutually exclusive with other ImageReference properties. The Azure Compute Gallery Image must have replicas in the same region and must be in the same subscription as the Azure Batch account. If the image version is not specified in the imageId, the latest version will be used. For information about the firewall settings for the Batch Compute Node agent to communicate with the Batch service see https://learn.microsoft.com/azure/batch/nodes-and-pools#virtual-network-vnet-and-firewall-configuration." - }, - "exactVersion": { - "type": "string", - "description": "The specific version of the platform image or marketplace image used to create the node. This read-only field differs from 'version' only if the value specified for 'version' when the pool was created was 'latest'.", - "readOnly": true - }, - "sharedGalleryImageId": { - "type": "string", - "description": "The shared gallery image unique identifier. This property is mutually exclusive with other properties and can be fetched from shared gallery image GET call." - }, - "communityGalleryImageId": { - "type": "string", - "description": "The community gallery image unique identifier. This property is mutually exclusive with other properties and can be fetched from community gallery image GET call." - } - } - }, "ImageVerificationType": { "type": "string", "description": "ImageVerificationType enums", @@ -16055,7 +16225,7 @@ "description": "The protocol of the endpoint." }, "publicIPAddress": { - "type": "string", + "$ref": "#/definitions/Azure.Core.ipV4Address", "description": "The public IP address of the Compute Node.", "x-ms-client-name": "publicIpAddress" }, @@ -16107,50 +16277,6 @@ ] } }, - "InboundNatPool": { - "type": "object", - "description": "A inbound NAT Pool that can be used to address specific ports on Compute Nodes\nin a Batch Pool externally.", - "properties": { - "name": { - "type": "string", - "description": "The name of the endpoint. The name must be unique within a Batch Pool, can contain letters, numbers, underscores, periods, and hyphens. Names must start with a letter or number, must end with a letter, number, or underscore, and cannot exceed 77 characters. If any invalid values are provided the request fails with HTTP status code 400." - }, - "protocol": { - "$ref": "#/definitions/InboundEndpointProtocol", - "description": "The protocol of the endpoint." - }, - "backendPort": { - "type": "integer", - "format": "int32", - "description": "The port number on the Compute Node. This must be unique within a Batch Pool. Acceptable values are between 1 and 65535 except for 29876 and 29877 as these are reserved. If any reserved values are provided the request fails with HTTP status code 400." - }, - "frontendPortRangeStart": { - "type": "integer", - "format": "int32", - "description": "The first port number in the range of external ports that will be used to provide inbound access to the backendPort on individual Compute Nodes. 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. Each range must contain at least 40 ports. If any reserved or overlapping values are provided the request fails with HTTP status code 400." - }, - "frontendPortRangeEnd": { - "type": "integer", - "format": "int32", - "description": "The last port number in the range of external ports that will be used to provide inbound access to the backendPort on individual Compute Nodes. 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. Each range must contain at least 40 ports. If any reserved or overlapping values are provided the request fails with HTTP status code 400." - }, - "networkSecurityGroupRules": { - "type": "array", - "description": "A list of network security group rules that will be applied to the endpoint. The maximum number of rules that can be specified across all the endpoints on a Batch Pool is 25. If no network security group rules are specified, a default rule will be created to allow inbound access to the specified backendPort. If the maximum number of network security group rules is exceeded the request fails with HTTP status code 400.", - "items": { - "$ref": "#/definitions/NetworkSecurityGroupRule" - }, - "x-ms-identifiers": [] - } - }, - "required": [ - "name", - "protocol", - "backendPort", - "frontendPortRangeStart", - "frontendPortRangeEnd" - ] - }, "InstanceViewStatus": { "type": "object", "description": "The instance view status.", @@ -16263,29 +16389,11 @@ "description": "The storage account type for managed disk." }, "securityProfile": { - "$ref": "#/definitions/VMDiskSecurityProfile", + "$ref": "#/definitions/VmDiskSecurityProfile", "description": "Specifies the security profile settings for the managed disk." } } }, - "MetadataItem": { - "type": "object", - "description": "The Batch service does not assign any meaning to this metadata; it is solely\nfor the use of user code.", - "properties": { - "name": { - "type": "string", - "description": "The name of the metadata item." - }, - "value": { - "type": "string", - "description": "The value of the metadata item." - } - }, - "required": [ - "name", - "value" - ] - }, "MountConfiguration": { "type": "object", "description": "The file system to mount on each node.", @@ -16358,14 +16466,15 @@ }, "dynamicVNetAssignmentScope": { "$ref": "#/definitions/DynamicVNetAssignmentScope", - "description": "The scope of dynamic vnet assignment." + "description": "The scope of dynamic vnet assignment.", + "x-ms-client-name": "dynamicVnetAssignmentScope" }, "endpointConfiguration": { "$ref": "#/definitions/BatchPoolEndpointConfiguration", "description": "The configuration for endpoints on Compute Nodes in the Batch Pool." }, "publicIPAddressConfiguration": { - "$ref": "#/definitions/PublicIpAddressConfiguration", + "$ref": "#/definitions/BatchPublicIpAddressConfiguration", "description": "The Public IPAddress configuration for Compute Nodes in the Batch Pool.", "x-ms-client-name": "publicIpAddressConfiguration" }, @@ -16385,14 +16494,15 @@ }, "dynamicVNetAssignmentScope": { "$ref": "#/definitions/DynamicVNetAssignmentScope", - "description": "The scope of dynamic vnet assignment." + "description": "The scope of dynamic vnet assignment.", + "x-ms-client-name": "dynamicVnetAssignmentScope" }, "endpointConfiguration": { "$ref": "#/definitions/BatchPoolEndpointConfigurationUpdate", "description": "The configuration for endpoints on Compute Nodes in the Batch Pool." }, "publicIPAddressConfiguration": { - "$ref": "#/definitions/PublicIpAddressConfiguration", + "$ref": "#/definitions/BatchPublicIpAddressConfiguration", "description": "The Public IPAddress configuration for Compute Nodes in the Batch Pool.", "x-ms-client-name": "publicIpAddressConfiguration" }, @@ -16479,33 +16589,6 @@ "relativeMountPath" ] }, - "OSDisk": { - "type": "object", - "description": "Settings for the operating system disk of the compute node (VM).", - "properties": { - "ephemeralOSDiskSettings": { - "$ref": "#/definitions/DiffDiskSettings", - "description": "Specifies the ephemeral Disk Settings for the operating system disk used by the compute node (VM)." - }, - "caching": { - "$ref": "#/definitions/CachingType", - "description": "Specifies the caching requirements. Possible values are: None, ReadOnly, ReadWrite. The default values are: None for Standard storage. ReadOnly for Premium storage." - }, - "diskSizeGB": { - "type": "integer", - "format": "int32", - "description": "The initial disk size in GB when creating new OS disk." - }, - "managedDisk": { - "$ref": "#/definitions/ManagedDisk", - "description": "The managed disk parameters." - }, - "writeAcceleratorEnabled": { - "type": "boolean", - "description": "Specifies whether writeAccelerator should be enabled or disabled on the disk." - } - } - }, "OSType": { "type": "string", "description": "OSType enums", @@ -16530,54 +16613,6 @@ ] } }, - "OnAllBatchTasksComplete": { - "type": "string", - "description": "The action the Batch service should take when all Tasks in the Job are in the completed state.", - "enum": [ - "noaction", - "terminatejob" - ], - "x-ms-enum": { - "name": "OnAllBatchTasksComplete", - "modelAsString": true, - "values": [ - { - "name": "NoAction", - "value": "noaction", - "description": "Do nothing. The Job remains active unless terminated or disabled by some other means." - }, - { - "name": "TerminateJob", - "value": "terminatejob", - "description": "Terminate the Job. The Job's terminationReason is set to 'AllTasksComplete'." - } - ] - } - }, - "OnBatchTaskFailure": { - "type": "string", - "description": "OnTaskFailure enums", - "enum": [ - "noaction", - "performexitoptionsjobaction" - ], - "x-ms-enum": { - "name": "OnBatchTaskFailure", - "modelAsString": true, - "values": [ - { - "name": "NoAction", - "value": "noaction", - "description": "Do nothing. The Job remains active unless terminated or disabled by some other means." - }, - { - "name": "PerformExitOptionsJobAction", - "value": "performexitoptionsjobaction", - "description": "Terminate the Job. The Job's terminationReason is set to 'AllTasksComplete'." - } - ] - } - }, "OutputFile": { "type": "object", "description": "On every file uploads, Batch service writes two log files to the compute node, 'fileuploadout.txt' and 'fileuploaderr.txt'. These log files are used to learn more about a specific failure.", @@ -16611,6 +16646,7 @@ }, "containerUrl": { "type": "string", + "format": "uri", "description": "The URL of the container within Azure Blob Storage to which to upload the file(s). If not using a managed identity, the URL must include a Shared Access Signature (SAS) granting write permissions to the container." }, "identityReference": { @@ -16621,7 +16657,7 @@ "type": "array", "description": "A list of name-value pairs for headers to be used in uploading output files. These headers will be specified when uploading files to Azure Storage. Official document on allowed headers when uploading blobs: https://learn.microsoft.com/rest/api/storageservices/put-blob#request-headers-all-blob-types.", "items": { - "$ref": "#/definitions/HttpHeader" + "$ref": "#/definitions/OutputFileUploadHeader" }, "x-ms-identifiers": [] } @@ -16683,23 +16719,22 @@ "uploadCondition" ] }, - "PublicIpAddressConfiguration": { + "OutputFileUploadHeader": { "type": "object", - "description": "The public IP Address configuration of the networking configuration of a Pool.", + "description": "An HTTP header name-value pair", "properties": { - "provision": { - "$ref": "#/definitions/IpAddressProvisioningType", - "description": "The provisioning type for Public IP Addresses for the Pool. The default value is BatchManaged.", - "x-ms-client-name": "IpAddressProvisioningType" + "name": { + "type": "string", + "description": "The case-insensitive name of the header to be used while uploading output files." }, - "ipAddressIds": { - "type": "array", - "description": "The list of public IPs which the Batch service will use when provisioning Compute Nodes. The number of IPs specified here limits the maximum size of the Pool - 100 dedicated nodes or 100 Spot/Low-priority nodes can be allocated for each public IP. For example, a pool needing 250 dedicated VMs would need at least 3 public IPs specified. Each element of this collection is of the form: /subscriptions/{subscription}/resourceGroups/{group}/providers/Microsoft.Network/publicIPAddresses/{ip}.", - "items": { - "type": "string" - } + "value": { + "type": "string", + "description": "The value of the header to be used while uploading output files." } - } + }, + "required": [ + "name" + ] }, "RecentBatchJob": { "type": "object", @@ -16711,6 +16746,7 @@ }, "url": { "type": "string", + "format": "uri", "description": "The URL of the Job." } } @@ -16747,10 +16783,12 @@ }, "storageContainerUrl": { "type": "string", + "format": "uri", "description": "The URL of the blob container within Azure Blob Storage. The autoStorageContainerName, storageContainerUrl and httpUrl properties are mutually exclusive and one of them must be specified. This URL must be readable and listable from compute nodes. There are three ways to get such a URL for a container in Azure storage: include a Shared Access Signature (SAS) granting read and list permissions on the container, use a managed identity with read and list permissions, or set the ACL for the container to allow public access." }, "httpUrl": { "type": "string", + "format": "uri", "description": "The URL of the file to download. The autoStorageContainerName, storageContainerUrl and httpUrl properties are mutually exclusive and one of them must be specified. If the URL points to Azure Blob Storage, it must be readable from compute nodes. There are three ways to get such a URL for a blob in Azure storage: include a Shared Access Signature (SAS) granting read permissions on the blob, use a managed identity with read permission, or set the ACL for the blob or its container to allow public access." }, "blobPrefix": { @@ -16870,7 +16908,7 @@ "description": "Specifies the SecurityType of the virtual machine. It has to be set to any specified value to enable UefiSettings." }, "uefiSettings": { - "$ref": "#/definitions/UefiSettings", + "$ref": "#/definitions/BatchUefiSettings", "description": "Specifies the security settings like secure boot and vTPM used while creating the virtual machine. Specifies the security settings like secure boot and vTPM used while creating the virtual machine." } }, @@ -16893,7 +16931,7 @@ "description": "Specifies the SecurityType of the virtual machine. It has to be set to any specified value to enable UefiSettings." }, "uefiSettings": { - "$ref": "#/definitions/UefiSettings", + "$ref": "#/definitions/BatchUefiSettings", "description": "Specifies the security settings like secure boot and vTPM used while creating the virtual machine. Specifies the security settings like secure boot and vTPM used while creating the virtual machine." } } @@ -17005,20 +17043,6 @@ ] } }, - "UefiSettings": { - "type": "object", - "description": "Specifies the security settings like secure boot and vTPM used while creating the virtual machine.", - "properties": { - "secureBootEnabled": { - "type": "boolean", - "description": "Specifies whether secure boot should be enabled on the virtual machine." - }, - "vTpmEnabled": { - "type": "boolean", - "description": "Specifies whether vTPM should be enabled on the virtual machine." - } - } - }, "UpgradeMode": { "type": "string", "description": "UpgradeMode enums", @@ -17090,12 +17114,13 @@ } } }, - "UploadBatchServiceLogsContent": { + "UploadBatchServiceLogsOptions": { "type": "object", "description": "The Azure Batch service log files upload parameters for a Compute Node.", "properties": { "containerUrl": { "type": "string", + "format": "uri", "description": "The URL of the container within Azure Blob Storage to which to upload the Batch Service log file(s). If a user assigned managed identity is not being used, the URL must include a Shared Access Signature (SAS) granting write permissions to the container. The SAS duration must allow enough time for the upload to finish. The start time for SAS is optional and recommended to not be specified." }, "startTime": { @@ -17169,29 +17194,6 @@ "password" ] }, - "UserAssignedIdentity": { - "type": "object", - "description": "The user assigned Identity", - "properties": { - "resourceId": { - "type": "string", - "description": "The ARM resource id of the user assigned identity." - }, - "clientId": { - "type": "string", - "description": "The client id of the user assigned identity.", - "readOnly": true - }, - "principalId": { - "type": "string", - "description": "The principal id of the user assigned identity.", - "readOnly": true - } - }, - "required": [ - "resourceId" - ] - }, "UserIdentity": { "type": "object", "description": "The definition of the user identity under which the Task is run. Specify either the userName or autoUser property, but not both.", @@ -17206,16 +17208,6 @@ } } }, - "VMDiskSecurityProfile": { - "type": "object", - "description": "Specifies the security profile settings for the managed disk. **Note**: It can only be set for Confidential VMs and required when using Confidential VMs.", - "properties": { - "securityEncryptionType": { - "$ref": "#/definitions/SecurityEncryptionTypes", - "description": "Specifies the EncryptionType of the managed disk. It is set to VMGuestStateOnly for encryption of just the VMGuestState blob, and NonPersistedTPM for not persisting firmware state in the VMGuestState blob. **Note**: It can be set for only Confidential VMs and is required when using Confidential VMs." - } - } - }, "VMExtension": { "type": "object", "description": "The configuration for virtual machine extensions.", @@ -17303,7 +17295,7 @@ "description": "The configuration for Compute Nodes in a Pool based on the Azure Virtual\nMachines infrastructure.", "properties": { "imageReference": { - "$ref": "#/definitions/ImageReference", + "$ref": "#/definitions/BatchVmImageReference", "description": "A reference to the Azure Virtual Machines Marketplace Image or the custom Virtual Machine Image to use." }, "nodeAgentSKUId": { @@ -17328,7 +17320,7 @@ "description": "This only applies to Images that contain the Windows operating system, and\nshould only be used when you hold valid on-premises licenses for the Compute\nNodes which will be deployed. If omitted, no on-premises licensing discount is\napplied. Values are:\n\n Windows_Server - The on-premises license is for Windows\nServer.\n Windows_Client - The on-premises license is for Windows Client.\n" }, "containerConfiguration": { - "$ref": "#/definitions/ContainerConfiguration", + "$ref": "#/definitions/BatchContainerConfiguration", "description": "The container configuration for the Pool. If specified, setup is performed on each Compute Node in the Pool to allow Tasks to run in containers. All regular Tasks and Job manager Tasks run on this Pool must specify the containerSettings property, and all other Tasks may specify it." }, "diskEncryptionConfiguration": { @@ -17348,8 +17340,9 @@ "x-ms-identifiers": [] }, "osDisk": { - "$ref": "#/definitions/OSDisk", - "description": "Settings for the operating system disk of the Virtual Machine." + "$ref": "#/definitions/BatchOsDisk", + "description": "Settings for the operating system disk of the Virtual Machine.", + "x-ms-client-name": "OsDisk" }, "securityProfile": { "$ref": "#/definitions/SecurityProfile", @@ -17370,7 +17363,7 @@ "description": "The configuration for Compute Nodes in a Pool based on the Azure Virtual\nMachines infrastructure.", "properties": { "imageReference": { - "$ref": "#/definitions/ImageReference", + "$ref": "#/definitions/BatchVmImageReference", "description": "A reference to the Azure Virtual Machines Marketplace Image or the custom Virtual Machine Image to use." }, "nodeAgentSKUId": { @@ -17395,7 +17388,7 @@ "description": "This only applies to Images that contain the Windows operating system, and\nshould only be used when you hold valid on-premises licenses for the Compute\nNodes which will be deployed. If omitted, no on-premises licensing discount is\napplied. Values are:\n\n Windows_Server - The on-premises license is for Windows\nServer.\n Windows_Client - The on-premises license is for Windows Client.\n" }, "containerConfiguration": { - "$ref": "#/definitions/ContainerConfigurationUpdate", + "$ref": "#/definitions/BatchContainerConfigurationUpdate", "description": "The container configuration for the Pool. If specified, setup is performed on each Compute Node in the Pool to allow Tasks to run in containers. All regular Tasks and Job manager Tasks run on this Pool must specify the containerSettings property, and all other Tasks may specify it." }, "diskEncryptionConfiguration": { @@ -17415,8 +17408,9 @@ "x-ms-identifiers": [] }, "osDisk": { - "$ref": "#/definitions/OSDisk", - "description": "Settings for the operating system disk of the Virtual Machine." + "$ref": "#/definitions/BatchOsDisk", + "description": "Settings for the operating system disk of the Virtual Machine.", + "x-ms-client-name": "OsDisk" }, "securityProfile": { "$ref": "#/definitions/SecurityProfileUpdate", @@ -17433,7 +17427,7 @@ "description": "Info about the current state of the virtual machine.", "properties": { "imageReference": { - "$ref": "#/definitions/ImageReference", + "$ref": "#/definitions/BatchVmImageReference", "description": "The reference to the Azure Virtual Machine's Marketplace Image." }, "scaleSetVmResourceId": { @@ -17442,6 +17436,16 @@ } } }, + "VmDiskSecurityProfile": { + "type": "object", + "description": "Specifies the security profile settings for the managed disk. **Note**: It can only be set for Confidential VMs and required when using Confidential VMs.", + "properties": { + "securityEncryptionType": { + "$ref": "#/definitions/SecurityEncryptionTypes", + "description": "Specifies the EncryptionType of the managed disk. It is set to VMGuestStateOnly for encryption of just the VMGuestState blob, and NonPersistedTPM for not persisting firmware state in the VMGuestState blob. **Note**: It can be set for only Confidential VMs and is required when using Confidential VMs." + } + } + }, "WindowsConfiguration": { "type": "object", "description": "Windows operating system settings to apply to the virtual machine.", diff --git a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Certificates_CreateCertificate.json b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Certificates_CreateCertificate.json index 412695e63996..07ccef685677 100644 --- a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Certificates_CreateCertificate.json +++ b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Certificates_CreateCertificate.json @@ -9,7 +9,7 @@ "certificate": { "thumbprintAlgorithm": "sha1", "thumbprint": "0123456789abcdef0123456789abcdef01234567", - "data": "#####...", + "data": "U3dhZ2dlciByb2Nrcw==", "certificateFormat": "pfx", "password": "" } diff --git a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Jobs_DisableJob.json b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Jobs_DisableJob.json index 28510af741a6..94028fa357f3 100644 --- a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Jobs_DisableJob.json +++ b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Jobs_DisableJob.json @@ -7,7 +7,7 @@ "jobId": "jobId", "client-request-id": "00000000-0000-0000-0000-000000000000", "ocp-date": "Fri, 17 Feb 2017 00:00:00 GMT", - "content": { + "disableOptions": { "disableTasks": "terminate" } }, diff --git a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Nodes_ListNodeFiles.json b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Nodes_ListNodeFiles.json index b7dd7ef9b6db..d607a98ed9b6 100644 --- a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Nodes_ListNodeFiles.json +++ b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Nodes_ListNodeFiles.json @@ -21,7 +21,7 @@ }, { "name": "startup\\ProcessEnv.cmd", - "url": "https://account.region.batch.azure.com/pools/poolId/nodes/tvm-2167304207_2-20140919t215614z/files/startup\\ProcessEnv.cmd", + "url": "https://account.region.batch.azure.com/pools/poolId/nodes/tvm-2167304207_2-20140919t215614z/files/startup/ProcessEnv.cmd", "isDirectory": false, "properties": { "creationTime": "2014-09-19T21:56:17.679195Z", @@ -32,7 +32,7 @@ }, { "name": "startup\\stderr.txt", - "url": "https://account.region.batch.azure.com/pools/poolId/nodes/tvm-2167304207_2-20140919t215614z/files/startup\\stderr.txt", + "url": "https://account.region.batch.azure.com/pools/poolId/nodes/tvm-2167304207_2-20140919t215614z/files/startup/stderr.txt", "isDirectory": false, "properties": { "creationTime": "2014-09-19T21:56:17.5590855Z", diff --git a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Nodes_ReplaceNodeUser.json b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Nodes_ReplaceNodeUser.json index d93a7ffd93eb..84aadd20bd82 100644 --- a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Nodes_ReplaceNodeUser.json +++ b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Nodes_ReplaceNodeUser.json @@ -9,7 +9,7 @@ "userName": "userName", "client-request-id": "00000000-0000-0000-0000-000000000000", "ocp-date": "Fri, 17 Feb 2017 00:00:00 GMT", - "content": { + "updateOptions": { "password": "12345", "expiryTime": "2016-11-27T00:45:48.7320857Z" } diff --git a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Nodes_UploadNodeLogs.json b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Nodes_UploadNodeLogs.json index c4ce833ad67a..8d12d98a3a3e 100644 --- a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Nodes_UploadNodeLogs.json +++ b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Nodes_UploadNodeLogs.json @@ -8,7 +8,7 @@ "nodeId": "tvm-1695681911_1-20161121t182739z", "client-request-id": "00000000-0000-0000-0000-000000000000", "ocp-date": "Fri, 17 Feb 2017 00:00:00 GMT", - "content": { + "uploadOptions": { "containerUrl": "https://somestorageacct.blob.core.windows.net/batch-compute-node-logs?se=2017-12-09T18%3A51%3A00Z&sp=w&sv=2016-05-31&sr=c&sig", "startTime": "2017-11-27T00:00:00Z" } diff --git a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Pools_EnablePoolAutoscale.json b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Pools_EnablePoolAutoscale.json index c4ce7c23579d..bdb0fbd3329a 100644 --- a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Pools_EnablePoolAutoscale.json +++ b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Pools_EnablePoolAutoscale.json @@ -7,7 +7,7 @@ "poolId": "poolId", "client-request-id": "00000000-0000-0000-0000-000000000000", "ocp-date": "Fri, 17 Feb 2017 00:00:00 GMT", - "content": { + "enableAutoScaleOptions": { "autoScaleFormula": "$TargetDedicated=0", "autoScaleEvaluationInterval": "PT8M" } diff --git a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Pools_EvaluatePoolAutoscale.json b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Pools_EvaluatePoolAutoscale.json index 25ee2bbcf2f6..fbab2a0ff2ed 100644 --- a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Pools_EvaluatePoolAutoscale.json +++ b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Pools_EvaluatePoolAutoscale.json @@ -7,7 +7,7 @@ "poolId": "poolId", "client-request-id": "00000000-0000-0000-0000-000000000000", "ocp-date": "Fri, 17 Feb 2017 00:00:00 GMT", - "content": { + "evaluateAutoScaleOptions": { "autoScaleFormula": "$TargetDedicated=1" } }, diff --git a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Pools_RemoveNodes.json b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Pools_RemoveNodes.json index 2e68b4a5da9f..234c0f13bcc0 100644 --- a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Pools_RemoveNodes.json +++ b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Pools_RemoveNodes.json @@ -7,7 +7,7 @@ "poolId": "poolId", "client-request-id": "00000000-0000-0000-0000-000000000000", "ocp-date": "Fri, 17 Feb 2017 00:00:00 GMT", - "content": { + "removeOptions": { "nodeList": [ "tvm-1695681911_1-20161122t224741z", "tvm-1695681911_2-20161122t224741z" diff --git a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Pools_ResizePool.json b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Pools_ResizePool.json index 29ffedcbcfab..0cad4552bafe 100644 --- a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Pools_ResizePool.json +++ b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Pools_ResizePool.json @@ -7,7 +7,7 @@ "poolId": "resizePool", "client-request-id": "00000000-0000-0000-0000-000000000000", "ocp-date": "Fri, 17 Feb 2017 00:00:00 GMT", - "content": { + "resizeOptions": { "targetDedicatedNodes": 1, "targetLowPriorityNodes": 0 } diff --git a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Tasks_ListTaskFiles.json b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Tasks_ListTaskFiles.json index 494f14e3252d..a8481d3b1dd8 100644 --- a/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Tasks_ListTaskFiles.json +++ b/specification/batch/data-plane/Azure.Batch/preview/2024-07-01.20.0/examples/Tasks_ListTaskFiles.json @@ -16,7 +16,7 @@ "value": [ { "name": "startup\\ProcessEnv.cmd", - "url": "https://account.region.batch.azure.com/jobs/jobId/tasks/taskId/files/startup\\ProcessEnv.cmd", + "url": "https://account.region.batch.azure.com/jobs/jobId/tasks/taskId/files/startup/ProcessEnv.cmd", "isDirectory": false, "properties": { "creationTime": "2014-09-19T21:56:17.679195Z", @@ -27,7 +27,7 @@ }, { "name": "startup\\stderr.txt", - "url": "https://account.region.batch.azure.com/jobs/jobId/tasks/taskId/files/startup\\stderr.txt", + "url": "https://account.region.batch.azure.com/jobs/jobId/tasks/taskId/files/startup/stderr.txt", "isDirectory": false, "properties": { "creationTime": "2014-09-19T21:56:17.5590855Z",