Skip to content

Commit 4a2e07c

Browse files
jingjliijingjlii
committed
Update examples and spec for new API version.
1 parent 1480f5c commit 4a2e07c

File tree

5 files changed

+206
-18
lines changed

5 files changed

+206
-18
lines changed

‎specification/batch/resource-manager/Microsoft.Batch/stable/2023-05-01/BatchManagement.json

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2157,6 +2157,9 @@
21572157
},
21582158
"CreatePool - VirtualMachineConfiguration Extensions": {
21592159
"$ref": "./examples/PoolCreate_VirtualMachineConfiguration_Extensions.json"
2160+
},
2161+
"CreatePool - accelerated networking": {
2162+
"$ref": "./examples/PoolCreate_AcceleratedNetworking.json"
21602163
}
21612164
},
21622165
"parameters": [
@@ -2367,6 +2370,9 @@
23672370
},
23682371
"GetPool - VirtualMachineConfiguration Extensions": {
23692372
"$ref": "./examples/PoolGet_VirtualMachineConfiguration_Extensions.json"
2373+
},
2374+
"GetPool - AcceleratedNetworking": {
2375+
"$ref": "./examples/PoolGet_AcceleratedNetworking.json"
23702376
}
23712377
},
23722378
"parameters": [
@@ -3115,7 +3121,7 @@
31153121
"properties": {
31163122
"keyIdentifier": {
31173123
"type": "string",
3118-
"description": "Full path to the versioned secret. Example https://mykeyvault.vault.azure.net/keys/testkey/6e34a81fef704045975661e297a4c053. To be usable the following prerequisites must be met:\n\n The Batch Account has a System Assigned identity\n The account identity has been granted Key/Get, Key/Unwrap and Key/Wrap permissions\n The KeyVault has soft-delete and purge protection enabled"
3124+
"description": "Full path to the secret with or without version. Example https://mykeyvault.vault.azure.net/keys/testkey/6e34a81fef704045975661e297a4c053. or https://mykeyvault.vault.azure.net/keys/testkey. To be usable the following prerequisites must be met:\n\n The Batch Account has a System Assigned identity\n The account identity has been granted Key/Get, Key/Unwrap and Key/Wrap permissions\n The KeyVault has soft-delete and purge protection enabled"
31193125
}
31203126
},
31213127
"description": "KeyVault configuration when using an encryption KeySource of Microsoft.KeyVault."
@@ -4754,15 +4760,20 @@
47544760
"type": "string",
47554761
"title": "The container technology to be used.",
47564762
"enum": [
4757-
"DockerCompatible"
4763+
"DockerCompatible",
4764+
"CriCompatible"
47584765
],
47594766
"x-ms-enum": {
47604767
"name": "ContainerType",
4761-
"modelAsString": false,
4768+
"modelAsString": true,
47624769
"values": [
47634770
{
47644771
"value": "DockerCompatible",
47654772
"description": "A Docker compatible container technology will be used to launch the containers."
4773+
},
4774+
{
4775+
"value": "CriCompatible",
4776+
"description": "A CRI based technology will be used to launch the containers."
47664777
}
47674778
]
47684779
}
@@ -4851,6 +4862,10 @@
48514862
"type": "boolean",
48524863
"description": "Indicates whether the extension should use a newer minor version if one is available at deployment time. Once deployed, however, the extension will not upgrade minor versions unless redeployed, even with this property set to true."
48534864
},
4865+
"enableAutomaticUpgrade": {
4866+
"type": "boolean",
4867+
"description": "Indicates whether the extension should be automatically upgraded by the platform if there is a newer version of the extension available."
4868+
},
48544869
"settings": {
48554870
"type": "object",
48564871
"title": "JSON formatted public settings for the extension."
@@ -5500,6 +5515,15 @@
55005515
"$ref": "#/definitions/PublicIPAddressConfiguration",
55015516
"title": "The Public IPAddress configuration for Compute Nodes in the Batch Pool.",
55025517
"description": "This property is only supported on Pools with the virtualMachineConfiguration property."
5518+
},
5519+
"enableAcceleratedNetworking": {
5520+
"type": "boolean",
5521+
"title": "Whether this pool should enable accelerated networking.",
5522+
"description": "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.",
5523+
"externalDocs": {
5524+
"url": "https://learn.microsoft.com/azure/virtual-network/accelerated-networking-overview",
5525+
"description": "Create a VM with Accelerated Networking."
5526+
}
55035527
}
55045528
},
55055529
"description": "The network configuration for a pool."

‎specification/batch/resource-manager/Microsoft.Batch/stable/2023-05-01/examples/PoolCreate_AcceleratedNetworking.json

Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"resourceGroupName": "default-azurebatch-japaneast",
5+
"accountName": "sampleacct",
6+
"poolName": "testpool",
7+
"api-version": "2023-05-01",
8+
"parameters": {
9+
"properties": {
10+
"vmSize": "STANDARD_D1_V2",
11+
"networkConfiguration": {
12+
"subnetId": "/subscriptions/subid/resourceGroups/rg1234/providers/Microsoft.Network/virtualNetworks/network1234/subnets/subnet123",
13+
"enableAcceleratedNetworking": true
14+
},
15+
"deploymentConfiguration": {
16+
"virtualMachineConfiguration": {
17+
"imageReference": {
18+
"publisher": "MicrosoftWindowsServer",
19+
"offer": "WindowsServer",
20+
"sku": "2016-datacenter-smalldisk",
21+
"version": "latest"
22+
},
23+
"nodeAgentSkuId": "batch.node.windows amd64"
24+
}
25+
},
26+
"scaleSettings": {
27+
"fixedScale": {
28+
"targetDedicatedNodes": 1,
29+
"targetLowPriorityNodes": 0
30+
}
31+
}
32+
}
33+
}
34+
},
35+
"responses": {
36+
"200": {
37+
"headers": {
38+
"ETag": "W/\"0x8DB46CB72A227E2\""
39+
},
40+
"body": {
41+
"id": "/subscriptions/subid/resourceGroups/default-azurebatch-japaneast/providers/Microsoft.Batch/batchAccounts/sampleacct/pools/testpool",
42+
"name": "testpool",
43+
"type": "Microsoft.Batch/batchAccounts/pools",
44+
"etag": "W/\"0x8DB46CB72A227E2\"",
45+
"properties": {
46+
"lastModified": "2023-04-27T02:59:41.8592226Z",
47+
"creationTime": "2023-04-27T02:59:41.8592226Z",
48+
"provisioningState": "Succeeded",
49+
"provisioningStateTransitionTime": "2023-04-27T02:59:41.8592226Z",
50+
"allocationState": "Steady",
51+
"allocationStateTransitionTime": "2023-04-27T03:00:34.0646502Z",
52+
"vmSize": "STANDARD_D1_V2",
53+
"interNodeCommunication": "Disabled",
54+
"taskSlotsPerNode": 1,
55+
"taskSchedulingPolicy": {
56+
"nodeFillType": "Spread"
57+
},
58+
"deploymentConfiguration": {
59+
"virtualMachineConfiguration": {
60+
"imageReference": {
61+
"publisher": "MicrosoftWindowsServer",
62+
"offer": "WindowsServer",
63+
"sku": "2016-datacenter-smalldisk",
64+
"version": "latest"
65+
},
66+
"nodeAgentSkuId": "batch.node.windows amd64"
67+
}
68+
},
69+
"networkConfiguration": {
70+
"subnetId": "/subscriptions/subid/resourceGroups/rg1234/providers/Microsoft.Network/virtualNetworks/network1234/subnets/subnet123",
71+
"dynamicVnetAssignmentScope": "none",
72+
"enableAcceleratedNetworking": true
73+
},
74+
"scaleSettings": {
75+
"fixedScale": {
76+
"targetDedicatedNodes": 1,
77+
"targetLowPriorityNodes": 0,
78+
"resizeTimeout": "PT15M"
79+
}
80+
},
81+
"resizeOperationStatus": {
82+
"targetDedicatedNodes": 1,
83+
"nodeDeallocationOption": "Requeue",
84+
"resizeTimeout": "PT15M",
85+
"startTime": "2023-04-27T02:59:41.8592226Z"
86+
},
87+
"currentDedicatedNodes": 1,
88+
"currentLowPriorityNodes": 0,
89+
"currentNodeCommunicationMode": "Classic"
90+
}
91+
}
92+
}
93+
}
94+
}

‎specification/batch/resource-manager/Microsoft.Batch/stable/2023-05-01/examples/PoolCreate_VirtualMachineConfiguration_Extensions.json

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,14 @@
2525
"extensions": [
2626
{
2727
"name": "batchextension1",
28-
"type": "SecurityMonitoringForLinux",
29-
"publisher": "Microsoft.Azure.Security.Monitoring",
30-
"typeHandlerVersion": "1.0",
28+
"type": "KeyVaultForLinux",
29+
"publisher": "Microsoft.Azure.KeyVault",
30+
"typeHandlerVersion": "2.0",
3131
"autoUpgradeMinorVersion": true,
32+
"enableAutomaticUpgrade": true,
3233
"settings": {
33-
"settingsKey": "settingsValue"
34-
},
35-
"protectedSettings": {
36-
"protectedSettingsKey": "protectedSettingsValue"
34+
"secretsManagementSettingsKey": "secretsManagementSettingsValue",
35+
"authenticationSettingsKey": "authenticationSettingsValue"
3736
}
3837
}
3938
]
@@ -85,12 +84,14 @@
8584
"extensions": [
8685
{
8786
"name": "batchextension1",
88-
"type": "SecurityMonitoringForLinux",
89-
"publisher": "Microsoft.Azure.Security.Monitoring",
90-
"typeHandlerVersion": "1.0",
87+
"type": "KeyVaultForLinux",
88+
"publisher": "Microsoft.Azure.KeyVault",
89+
"typeHandlerVersion": "2.0",
9190
"autoUpgradeMinorVersion": true,
91+
"enableAutomaticUpgrade": true,
9292
"settings": {
93-
"settingsKey": "settingsValue"
93+
"secretsManagementSettingsKey": "secretsManagementSettingsValue",
94+
"authenticationSettingsKey": "authenticationSettingsValue"
9495
}
9596
}
9697
]

‎specification/batch/resource-manager/Microsoft.Batch/stable/2023-05-01/examples/PoolGet_AcceleratedNetworking.json

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"resourceGroupName": "default-azurebatch-japaneast",
5+
"accountName": "sampleacct",
6+
"poolName": "testpool",
7+
"api-version": "2023-05-01"
8+
},
9+
"responses": {
10+
"200": {
11+
"headers": {
12+
"ETag": "W/\"0x8D4EDFEBFADF4AB\""
13+
},
14+
"body": {
15+
"id": "/subscriptions/subid/resourceGroups/default-azurebatch-japaneast/providers/Microsoft.Batch/batchAccounts/sampleacct/pools/testpool",
16+
"name": "testpool",
17+
"type": "Microsoft.Batch/batchAccounts/pools",
18+
"etag": "W/\"0x8D4EDFEBFADF4AB\"",
19+
"properties": {
20+
"lastModified": "2023-04-28T02:32:32.8696419Z",
21+
"creationTime": "2023-04-28T02:32:32.8696419Z",
22+
"provisioningState": "Succeeded",
23+
"provisioningStateTransitionTime": "2023-04-28T02:32:32.8696419Z",
24+
"allocationState": "Steady",
25+
"allocationStateTransitionTime": "2023-04-28T02:33:40.82831Z",
26+
"vmSize": "STANDARD_D1_V2",
27+
"interNodeCommunication": "Disabled",
28+
"taskSlotsPerNode": 1,
29+
"taskSchedulingPolicy": {
30+
"nodeFillType": "Spread"
31+
},
32+
"deploymentConfiguration": {
33+
"virtualMachineConfiguration": {
34+
"imageReference": {
35+
"publisher": "MicrosoftWindowsServer",
36+
"offer": "WindowsServer",
37+
"sku": "2016-datacenter-smalldisk",
38+
"version": "latest"
39+
},
40+
"nodeAgentSkuId": "batch.node.windows amd64"
41+
}
42+
},
43+
"networkConfiguration": {
44+
"dynamicVnetAssignmentScope": "none",
45+
"enableAcceleratedNetworking": true
46+
},
47+
"scaleSettings": {
48+
"fixedScale": {
49+
"targetDedicatedNodes": 1,
50+
"targetLowPriorityNodes": 0,
51+
"resizeTimeout": "PT15M"
52+
}
53+
},
54+
"resizeOperationStatus": {
55+
"targetDedicatedNodes": 1,
56+
"nodeDeallocationOption": "Requeue",
57+
"resizeTimeout": "PT15M",
58+
"startTime": "2023-04-28T02:32:32.8696419Z"
59+
},
60+
"currentDedicatedNodes": 1,
61+
"currentLowPriorityNodes": 0,
62+
"currentNodeCommunicationMode": "Classic"
63+
}
64+
}
65+
}
66+
}
67+
}

‎specification/batch/resource-manager/Microsoft.Batch/stable/2023-05-01/examples/PoolGet_VirtualMachineConfiguration_Extensions.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,14 @@
5656
"extensions": [
5757
{
5858
"name": "batchextension1",
59-
"type": "SecurityMonitoringForLinux",
60-
"publisher": "Microsoft.Azure.Security.Monitoring",
61-
"typeHandlerVersion": "1.0",
59+
"type": "KeyVaultForLinux",
60+
"publisher": "Microsoft.Azure.KeyVault",
61+
"typeHandlerVersion": "2.0",
6262
"autoUpgradeMinorVersion": true,
63+
"enableAutomaticUpgrade": true,
6364
"settings": {
64-
"settingsKey": "settingsValue"
65+
"secretsManagementSettingsKey": "secretsManagementSettingsValue",
66+
"authenticationSettingsKey": "authenticationSettingsValue"
6567
}
6668
}
6769
]

0 commit comments

Comments
 (0)