Skip to content

Commit 5aa6439

Browse files
xingwu1xingwu1
committed
Update the new API
1 parent e20c535 commit 5aa6439

File tree

89 files changed

+208
-153
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+208
-153
lines changed

‎specification/batch/data-plane/Microsoft.Batch/stable/2018-08-01.7.0/BatchService.json‎

Lines changed: 43 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"swagger": "2.0",
33
"info": {
44
"title": "BatchService",
5-
"version": "2018-03-01.6.1",
5+
"version": "2018-08-01.7.0",
66
"description": "A client for issuing REST requests to the Azure Batch service.",
77
"x-ms-code-generation-settings": {
88
"name": "BatchServiceClient"
@@ -542,7 +542,7 @@
542542
"in": "query",
543543
"required": false,
544544
"type": "string",
545-
"description": "An OData $filter clause.",
545+
"description": "An OData $filter clause. For more information on constructing this filter, see https://docs.microsoft.com/en-us/rest/api/batchservice/odata-filters-in-batch.",
546546
"x-ms-parameter-grouping": {
547547
"postfix": "Options"
548548
}
@@ -1712,7 +1712,8 @@
17121712
},
17131713
"description": "A response containing the file content.",
17141714
"schema": {
1715-
"type": "file"
1715+
"type": "object",
1716+
"format": "file"
17161717
}
17171718
},
17181719
"default": {
@@ -2168,7 +2169,8 @@
21682169
},
21692170
"description": "The file content.",
21702171
"schema": {
2171-
"type": "file"
2172+
"type": "object",
2173+
"format": "file"
21722174
}
21732175
},
21742176
"default": {
@@ -5751,7 +5753,7 @@
57515753
"Job get task counts": { "$ref": "./examples/JobGetTaskCounts.json" }
57525754
},
57535755
"summary": "Gets the task counts for the specified job.",
5754-
"description": "Task counts provide a count of the tasks by active, running or completed task state, and a count of tasks which succeeded or failed. Tasks in the preparing state are counted as running. If the validationStatus is unvalidated, then the Batch service has not been able to check state counts against the task states as reported in the List Tasks API. The validationStatus may be unvalidated if the job contains more than 200,000 tasks.",
5756+
"description": "Task counts provide a count of the tasks by active, running or completed task state, and a count of tasks which succeeded or failed. Tasks in the preparing state are counted as running.",
57555757
"x-ms-request-id": "request-id",
57565758
"parameters": [
57575759
{
@@ -10319,7 +10321,8 @@
1031910321
},
1032010322
"description": "A response containing the RDP information.",
1032110323
"schema": {
10322-
"type": "file"
10324+
"type": "object",
10325+
"format": "file"
1032310326
}
1032410327
},
1032510328
"default": {
@@ -10610,7 +10613,7 @@
1061010613
"vmSize": {
1061110614
"type": "string",
1061210615
"title": "The size of virtual machines in the pool. All VMs in a pool are the same size.",
10613-
"description": "For information about available sizes of virtual machines in pools, see Choose a VM size for compute nodes in an Azure Batch pool (https://docs.microsoft.com/azure/batch/batch-pool-vm-sizes). Batch supports all Cloud Services VM sizes except ExtraSmall, STANDARD_A1_V2 and STANDARD_A2_V2. For information about available VM sizes for pools using images from the Virtual Machines Marketplace (pools created with virtualMachineConfiguration) see Sizes for Virtual Machines (Linux) (https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/) or Sizes for Virtual Machines (Windows) (https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/). Batch supports all Azure VM sizes except STANDARD_A0 and those with premium storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series)."
10616+
"description": "For information about available sizes of virtual machines in pools, see Choose a VM size for compute nodes in an Azure Batch pool (https://docs.microsoft.com/azure/batch/batch-pool-vm-sizes)."
1061410617
},
1061510618
"totalCoreHours": {
1061610619
"type": "number",
@@ -11893,7 +11896,7 @@
1189311896
"vmSize": {
1189411897
"type": "string",
1189511898
"title": "The size of the virtual machines in the pool. All virtual machines in a pool are the same size.",
11896-
"description": "For information about available sizes of virtual machines for Cloud Services pools (pools created with cloudServiceConfiguration), see Sizes for Cloud Services (https://azure.microsoft.com/documentation/articles/cloud-services-sizes-specs/). Batch supports all Cloud Services VM sizes except ExtraSmall, A1V2 and A2V2. For information about available VM sizes for pools using images from the Virtual Machines Marketplace (pools created with virtualMachineConfiguration) see Sizes for Virtual Machines (Linux) (https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/) or Sizes for Virtual Machines (Windows) (https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/). Batch supports all Azure VM sizes except STANDARD_A0 and those with premium storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series)."
11899+
"description": "For information about available sizes of virtual machines in pools, see Choose a VM size for compute nodes in an Azure Batch pool (https://docs.microsoft.com/azure/batch/batch-pool-vm-sizes)."
1189711900
},
1189811901
"cloudServiceConfiguration": {
1189911902
"$ref": "#/definitions/CloudServiceConfiguration",
@@ -11983,7 +11986,7 @@
1198311986
"type": "string"
1198411987
},
1198511988
"title": "The list of application licenses the Batch service will make available on each compute node in the pool.",
11986-
"description": "The list of application licenses must be a subset of available Batch service application licenses. If a license is requested which is not supported, pool creation will fail."
11989+
"description": "The list of application licenses must be a subset of available Batch service application licenses. If a license is requested which is not supported, pool creation will fail. The permitted licenses available on the pool are 'maya', 'vray', '3dsmax', 'arnold'. An additional charge applies for each application license added to the pool."
1198711990
},
1198811991
"userAccounts": {
1198911992
"type": "array",
@@ -12900,31 +12903,9 @@
1290012903
"type": "integer",
1290112904
"format": "int32",
1290212905
"title": "The number of tasks which failed. A task fails if its result (found in the executionInfo property) is 'failure'."
12903-
},
12904-
"validationStatus": {
12905-
"type": "string",
12906-
"title": "Whether the task counts have been validated.",
12907-
"enum": [
12908-
"validated",
12909-
"unvalidated"
12910-
],
12911-
"x-ms-enum": {
12912-
"name": "TaskCountValidationStatus",
12913-
"modelAsString": false,
12914-
"values": [
12915-
{
12916-
"value": "validated",
12917-
"description": "The Batch service has validated the state counts against the task states as reported in the List Tasks API."
12918-
},
12919-
{
12920-
"value": "unvalidated",
12921-
"description": "The Batch service has not been able to check state counts against the task states as reported in the List Tasks API. The validationStatus may be unvalidated if the job contains more than 200,000 tasks."
12922-
}
12923-
]
12924-
}
1292512906
}
1292612907
},
12927-
"required": ["active", "running", "completed", "succeeded", "failed", "validationStatus"],
12908+
"required": [ "active", "running", "completed", "succeeded", "failed" ],
1292812909
"title": "The task counts for a job."
1292912910
},
1293012911
"AutoScaleRunError": {
@@ -13043,7 +13024,7 @@
1304313024
"properties": {
1304413025
"caching": {
1304513026
"title": "The type of caching to enable for the OS disk.",
13046-
"description": "The default value for caching is none. For information about the caching options see: https://blogs.msdn.microsoft.com/windowsazurestorage/2012/06/27/exploring-windows-azure-drives-disks-and-images/.",
13027+
"description": "The default value for caching is readwrite. For information about the caching options see: https://blogs.msdn.microsoft.com/windowsazurestorage/2012/06/27/exploring-windows-azure-drives-disks-and-images/.",
1304713028
"$ref": "#/definitions/CachingType"
1304813029
}
1304913030
},
@@ -13070,7 +13051,7 @@
1307013051
"caching": {
1307113052
"$ref": "#/definitions/CachingType",
1307213053
"title": "The type of caching to be enabled for the data disks.",
13073-
"description": "The default value for caching is none. For information about the caching options see: https://blogs.msdn.microsoft.com/windowsazurestorage/2012/06/27/exploring-windows-azure-drives-disks-and-images/."
13054+
"description": "The default value for caching is readwrite. For information about the caching options see: https://blogs.msdn.microsoft.com/windowsazurestorage/2012/06/27/exploring-windows-azure-drives-disks-and-images/."
1307413055
},
1307513056
"diskSizeGB": {
1307613057
"type": "integer",
@@ -13211,15 +13192,15 @@
1321113192
"type": "string",
1321213193
"title": "The container technology to be used.",
1321313194
"enum": [
13214-
"docker"
13195+
"dockerCompatible"
1321513196
],
1321613197
"x-ms-enum": {
1321713198
"name": "ContainerType",
1321813199
"modelAsString": false,
1321913200
"values": [
1322013201
{
13221-
"value": "docker",
13222-
"description": "Docker will be used to launch the containers."
13202+
"value": "dockerCompatible",
13203+
"description": "A Docker compatible container technology will be used to launch the containers."
1322313204
}
1322413205
]
1322513206
}
@@ -13362,7 +13343,7 @@
1336213343
"vmSize": {
1336313344
"type": "string",
1336413345
"title": "The size of virtual machines in the pool. All virtual machines in a pool are the same size.",
13365-
"description": "For information about available sizes of virtual machines for Cloud Services pools (pools created with cloudServiceConfiguration), see Sizes for Cloud Services (https://azure.microsoft.com/documentation/articles/cloud-services-sizes-specs/). Batch supports all Cloud Services VM sizes except ExtraSmall, A1V2 and A2V2. For information about available VM sizes for pools using images from the Virtual Machines Marketplace (pools created with virtualMachineConfiguration) see Sizes for Virtual Machines (Linux) (https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/) or Sizes for Virtual Machines (Windows) (https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/). Batch supports all Azure VM sizes except STANDARD_A0 and those with premium storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series)."
13346+
"description": "For information about available sizes of virtual machines in pools, see Choose a VM size for compute nodes in an Azure Batch pool (https://docs.microsoft.com/azure/batch/batch-pool-vm-sizes)."
1336613347
},
1336713348
"cloudServiceConfiguration": {
1336813349
"$ref": "#/definitions/CloudServiceConfiguration",
@@ -13758,6 +13739,24 @@
1375813739
},
1375913740
"title": "Information about the compute node on which a task ran."
1376013741
},
13742+
"NodeAgentInformation": {
13743+
"properties": {
13744+
"version": {
13745+
"type": "string",
13746+
"title":"The version of the Batch node agent running on the compute node.",
13747+
"description":"This version number can be checked against the node agent release notes located at https://github.com/Azure/Batch/blob/master/changelogs/nodeagent/CHANGELOG.md."
13748+
},
13749+
"lastUpdateTime": {
13750+
"type": "string",
13751+
"format": "date-time",
13752+
"title": "The time when the node agent was updated on the compute node.",
13753+
"description": "This is the most recent time that the node agent was updated to a new version."
13754+
}
13755+
},
13756+
"required": [ "version", "lastUpdateTime" ],
13757+
"title": "Information about the node agent.",
13758+
"description": "The Batch node agent is a program that runs on each node in the pool and provides Batch capability on the compute node."
13759+
},
1376113760
"MultiInstanceSettings": {
1376213761
"properties": {
1376313762
"numberOfInstances": {
@@ -14119,7 +14118,7 @@
1411914118
"$ref": "#/definitions/TaskAddParameter"
1412014119
},
1412114120
"maxItems": 100,
14122-
"title": "The collection of tasks to add.",
14121+
"title": "The collection of tasks to add. The maximum count of tasks is 100.",
1412314122
"description": "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."
1412414123
}
1412514124
},
@@ -14556,7 +14555,7 @@
1455614555
"vmSize": {
1455714556
"type": "string",
1455814557
"title": "The size of the virtual machine hosting the compute node.",
14559-
"description": "For information about available sizes of virtual machines for Cloud Services pools (pools created with cloudServiceConfiguration), see Sizes for Cloud Services (https://azure.microsoft.com/documentation/articles/cloud-services-sizes-specs/). Batch supports all Cloud Services VM sizes except ExtraSmall, A1V2 and A2V2. For information about available VM sizes for pools using images from the Virtual Machines Marketplace (pools created with virtualMachineConfiguration) see Sizes for Virtual Machines (Linux) (https://azure.microsoft.com/documentation/articles/virtual-machines-linux-sizes/) or Sizes for Virtual Machines (Windows) (https://azure.microsoft.com/documentation/articles/virtual-machines-windows-sizes/). Batch supports all Azure VM sizes except STANDARD_A0 and those with premium storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series)."
14558+
"description": "For information about available sizes of virtual machines in pools, see Choose a VM size for compute nodes in an Azure Batch pool (https://docs.microsoft.com/azure/batch/batch-pool-vm-sizes)."
1456014559
},
1456114560
"totalTasksRun": {
1456214561
"type": "integer",
@@ -14611,6 +14610,10 @@
1461114610
"endpointConfiguration": {
1461214611
"$ref": "#/definitions/ComputeNodeEndpointConfiguration",
1461314612
"title": "The endpoint configuration for the compute node."
14613+
},
14614+
"nodeAgentInfo": {
14615+
"$ref":"#/definitions/NodeAgentInformation",
14616+
"title": "Information about the node agent version and the time the node upgraded to a new version."
1461414617
}
1461514618
},
1461614619
"title": "A compute node in the Batch service."

‎specification/batch/data-plane/Microsoft.Batch/stable/2018-08-01.7.0/examples/AccountListNodeAgentSkus.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parameters": {
3-
"api-version": "2018-03-01.6.1",
3+
"api-version": "2018-08-01.7.0",
44
"client-request-id": "00000000-0000-0000-0000-000000000000",
55
"ocp-data": "Fri, 17 Feb 2017 00:00:00 GMT"
66
},

‎specification/batch/data-plane/Microsoft.Batch/stable/2018-08-01.7.0/examples/AccountListPoolNodeCounts.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parameters": {
3-
"api-version": "2018-03-01.6.1",
3+
"api-version": "2018-08-01.7.0",
44
"client-request-id": "00000000-0000-0000-0000-000000000000",
55
"ocp-data": "Fri, 17 Feb 2017 00:00:00 GMT"
66
},
@@ -13,7 +13,7 @@
1313
"dedicated": {
1414
"creating": 0,
1515
"idle": 0,
16-
"leavingpool": 0,
16+
"leavingPool": 0,
1717
"offline": 0,
1818
"preempted": 0,
1919
"rebooting": 0,
@@ -29,7 +29,7 @@
2929
"lowPriority": {
3030
"creating": 0,
3131
"idle": 0,
32-
"leavingpool": 0,
32+
"leavingPool": 0,
3333
"offline": 0,
3434
"preempted": 0,
3535
"rebooting": 0,
@@ -48,7 +48,7 @@
4848
"dedicated": {
4949
"creating": 0,
5050
"idle": 1,
51-
"leavingpool": 0,
51+
"leavingPool": 0,
5252
"offline": 3,
5353
"preempted": 0,
5454
"rebooting": 0,
@@ -64,7 +64,7 @@
6464
"lowPriority": {
6565
"creating": 0,
6666
"idle": 0,
67-
"leavingpool": 0,
67+
"leavingPool": 0,
6868
"offline": 0,
6969
"preempted": 0,
7070
"rebooting": 0,
@@ -83,7 +83,7 @@
8383
"dedicated": {
8484
"creating": 0,
8585
"idle": 5,
86-
"leavingpool": 0,
86+
"leavingPool": 0,
8787
"offline": 0,
8888
"preempted": 0,
8989
"rebooting": 0,
@@ -99,7 +99,7 @@
9999
"lowPriority": {
100100
"creating": 7,
101101
"idle": 0,
102-
"leavingpool": 0,
102+
"leavingPool": 0,
103103
"offline": 0,
104104
"preempted": 0,
105105
"rebooting": 0,

‎specification/batch/data-plane/Microsoft.Batch/stable/2018-08-01.7.0/examples/ApplicationGet.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parameters": {
3-
"api-version": "2018-03-01.6.1",
3+
"api-version": "2018-08-01.7.0",
44
"client-request-id": "00000000-0000-0000-0000-000000000000",
55
"ocp-data": "Fri, 17 Feb 2017 00:00:00 GMT",
66
"applicationId": "my_application_id"

‎specification/batch/data-plane/Microsoft.Batch/stable/2018-08-01.7.0/examples/ApplicationList.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parameters": {
3-
"api-version": "2018-03-01.6.1",
3+
"api-version": "2018-08-01.7.0",
44
"client-request-id": "00000000-0000-0000-0000-000000000000",
55
"ocp-data": "Fri, 17 Feb 2017 00:00:00 GMT"
66
},

‎specification/batch/data-plane/Microsoft.Batch/stable/2018-08-01.7.0/examples/CertificateAdd.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parameters": {
3-
"api-version": "2018-03-01.6.1",
3+
"api-version": "2018-08-01.7.0",
44
"client-request-id": "00000000-0000-0000-0000-000000000000",
55
"ocp-data": "Fri, 17 Feb 2017 00:00:00 GMT",
66
"certificate": {

‎specification/batch/data-plane/Microsoft.Batch/stable/2018-08-01.7.0/examples/CertificateCancelDelete.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parameters": {
3-
"api-version": "2018-03-01.6.1",
3+
"api-version": "2018-08-01.7.0",
44
"thumbprintAlgorithm": "sha1",
55
"thumbprint": "0123456789abcdef0123456789abcdef01234567",
66
"client-request-id": "00000000-0000-0000-0000-000000000000",

‎specification/batch/data-plane/Microsoft.Batch/stable/2018-08-01.7.0/examples/CertificateDelete.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parameters": {
3-
"api-version": "2018-03-01.6.1",
3+
"api-version": "2018-08-01.7.0",
44
"thumbprintAlgorithm": "sha1",
55
"thumbprint": "0123456789abcdef0123456789abcdef01234567",
66
"client-request-id": "00000000-0000-0000-0000-000000000000",

‎specification/batch/data-plane/Microsoft.Batch/stable/2018-08-01.7.0/examples/CertificateGet.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parameters": {
3-
"api-version": "2018-03-01.6.1",
3+
"api-version": "2018-08-01.7.0",
44
"thumbprintAlgorithm": "sha1",
55
"thumbprint": "0123456789abcdef0123456789abcdef01234567",
66
"client-request-id": "00000000-0000-0000-0000-000000000000",

‎specification/batch/data-plane/Microsoft.Batch/stable/2018-08-01.7.0/examples/CertificateList.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parameters": {
3-
"api-version": "2018-03-01.6.1",
3+
"api-version": "2018-08-01.7.0",
44
"client-request-id": "00000000-0000-0000-0000-000000000000",
55
"ocp-data": "Fri, 17 Feb 2017 00:00:00 GMT"
66
},

0 commit comments

Comments
 (0)