diff --git a/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/BatchManagementClient.cs b/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/BatchManagementClient.cs index a19713799d67..0b484dde5f6a 100644 --- a/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/BatchManagementClient.cs +++ b/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/BatchManagementClient.cs @@ -368,7 +368,7 @@ private void Initialize() PrivateEndpointConnection = new PrivateEndpointConnectionOperations(this); Pool = new PoolOperations(this); BaseUri = new System.Uri("https://management.azure.com"); - ApiVersion = "2020-05-01"; + ApiVersion = "2020-09-01"; AcceptLanguage = "en-US"; LongRunningOperationRetryTimeout = 30; GenerateClientRequestId = true; diff --git a/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/ComputeNodeFillType.cs b/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/ComputeNodeFillType.cs index d759273b6aa7..3c5dca39c0f9 100644 --- a/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/ComputeNodeFillType.cs +++ b/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/ComputeNodeFillType.cs @@ -27,7 +27,7 @@ public enum ComputeNodeFillType [EnumMember(Value = "Spread")] Spread, /// - /// As many tasks as possible (maxTasksPerNode) should be assigned to + /// As many tasks as possible (taskSlotsPerNode) should be assigned to /// each node in the pool before any tasks are assigned to the next /// node in the pool. /// diff --git a/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/DataDisk.cs b/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/DataDisk.cs index 0967f85e4404..ac9d28438e52 100644 --- a/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/DataDisk.cs +++ b/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/DataDisk.cs @@ -57,7 +57,8 @@ public DataDisk() /// /// /// The lun is used to uniquely identify each data disk. If attaching - /// multiple disks, each should have a distinct lun. + /// multiple disks, each should have a distinct lun. The value must be + /// between 0 and 63, inclusive. /// [JsonProperty(PropertyName = "lun")] public int Lun { get; set; } diff --git a/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/Pool.cs b/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/Pool.cs index 6f76584237b1..eef1c00cb953 100644 --- a/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/Pool.cs +++ b/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/Pool.cs @@ -67,8 +67,9 @@ public Pool() /// direct communication between nodes. /// The network configuration for /// the pool. - /// The maximum number of tasks that can - /// run concurrently on a single compute node in the pool. + /// The number of task slots that can be + /// used to run concurrent tasks on a single compute node in the + /// pool. /// How tasks are distributed across /// compute nodes in a pool. /// The list of user accounts to be created @@ -88,7 +89,7 @@ public Pool() /// current or last completed resize operation. /// A list of file systems to mount on /// each node in the pool. - public Pool(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), string displayName = default(string), System.DateTime? lastModified = default(System.DateTime?), System.DateTime? creationTime = default(System.DateTime?), PoolProvisioningState? provisioningState = default(PoolProvisioningState?), System.DateTime? provisioningStateTransitionTime = default(System.DateTime?), AllocationState? allocationState = default(AllocationState?), System.DateTime? allocationStateTransitionTime = default(System.DateTime?), string vmSize = default(string), DeploymentConfiguration deploymentConfiguration = default(DeploymentConfiguration), int? currentDedicatedNodes = default(int?), int? currentLowPriorityNodes = default(int?), ScaleSettings scaleSettings = default(ScaleSettings), AutoScaleRun autoScaleRun = default(AutoScaleRun), InterNodeCommunicationState? interNodeCommunication = default(InterNodeCommunicationState?), NetworkConfiguration networkConfiguration = default(NetworkConfiguration), int? maxTasksPerNode = default(int?), TaskSchedulingPolicy taskSchedulingPolicy = default(TaskSchedulingPolicy), IList userAccounts = default(IList), IList metadata = default(IList), StartTask startTask = default(StartTask), IList certificates = default(IList), IList applicationPackages = default(IList), IList applicationLicenses = default(IList), ResizeOperationStatus resizeOperationStatus = default(ResizeOperationStatus), IList mountConfiguration = default(IList)) + public Pool(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), string displayName = default(string), System.DateTime? lastModified = default(System.DateTime?), System.DateTime? creationTime = default(System.DateTime?), PoolProvisioningState? provisioningState = default(PoolProvisioningState?), System.DateTime? provisioningStateTransitionTime = default(System.DateTime?), AllocationState? allocationState = default(AllocationState?), System.DateTime? allocationStateTransitionTime = default(System.DateTime?), string vmSize = default(string), DeploymentConfiguration deploymentConfiguration = default(DeploymentConfiguration), int? currentDedicatedNodes = default(int?), int? currentLowPriorityNodes = default(int?), ScaleSettings scaleSettings = default(ScaleSettings), AutoScaleRun autoScaleRun = default(AutoScaleRun), InterNodeCommunicationState? interNodeCommunication = default(InterNodeCommunicationState?), NetworkConfiguration networkConfiguration = default(NetworkConfiguration), int? taskSlotsPerNode = default(int?), TaskSchedulingPolicy taskSchedulingPolicy = default(TaskSchedulingPolicy), IList userAccounts = default(IList), IList metadata = default(IList), StartTask startTask = default(StartTask), IList certificates = default(IList), IList applicationPackages = default(IList), IList applicationLicenses = default(IList), ResizeOperationStatus resizeOperationStatus = default(ResizeOperationStatus), IList mountConfiguration = default(IList)) : base(id, name, type, etag) { DisplayName = displayName; @@ -106,7 +107,7 @@ public Pool() AutoScaleRun = autoScaleRun; InterNodeCommunication = interNodeCommunication; NetworkConfiguration = networkConfiguration; - MaxTasksPerNode = maxTasksPerNode; + TaskSlotsPerNode = taskSlotsPerNode; TaskSchedulingPolicy = taskSchedulingPolicy; UserAccounts = userAccounts; Metadata = metadata; @@ -269,15 +270,15 @@ public Pool() public NetworkConfiguration NetworkConfiguration { get; set; } /// - /// Gets or sets the maximum number of tasks that can run concurrently - /// on a single compute node in the pool. + /// Gets or sets the number of task slots that can be used to run + /// concurrent tasks on a single compute node in the pool. /// /// /// The default value is 1. The maximum value is the smaller of 4 times /// the number of cores of the vmSize of the pool or 256. /// - [JsonProperty(PropertyName = "properties.maxTasksPerNode")] - public int? MaxTasksPerNode { get; set; } + [JsonProperty(PropertyName = "properties.taskSlotsPerNode")] + public int? TaskSlotsPerNode { get; set; } /// /// Gets or sets how tasks are distributed across compute nodes in a diff --git a/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/PoolEndpointConfiguration.cs b/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/PoolEndpointConfiguration.cs index 6b9ac1a7844c..ca40e269e263 100644 --- a/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/PoolEndpointConfiguration.cs +++ b/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/PoolEndpointConfiguration.cs @@ -53,7 +53,8 @@ public PoolEndpointConfiguration(IList inboundNatPools) /// /// 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. + /// with HTTP status code 400. This cannot be specified if the + /// IPAddressProvisioningType is NoPublicIPAddresses. /// [JsonProperty(PropertyName = "inboundNatPools")] public IList InboundNatPools { get; set; } diff --git a/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/PublicIPAddressConfiguration.cs b/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/PublicIPAddressConfiguration.cs index d825fce8233d..5811754febd8 100644 --- a/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/PublicIPAddressConfiguration.cs +++ b/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/Models/PublicIPAddressConfiguration.cs @@ -67,10 +67,10 @@ public PublicIPAddressConfiguration() /// /// /// The number of IPs specified here limits the maximum size of the - /// Pool - 50 dedicated nodes or 20 low-priority nodes can be allocated - /// for each public IP. For example, a pool needing 150 dedicated VMs - /// would need at least 3 public IPs specified. Each element of this - /// collection is of the form: + /// Pool - 100 dedicated nodes or 100 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}. /// [JsonProperty(PropertyName = "ipAddressIds")] diff --git a/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/SdkInfo_BatchManagement.cs b/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/SdkInfo_BatchManagement.cs index ca1181fc1e84..a031ad48cecd 100644 --- a/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/SdkInfo_BatchManagement.cs +++ b/sdk/batch/Microsoft.Azure.Management.Batch/src/Generated/SdkInfo_BatchManagement.cs @@ -19,28 +19,17 @@ public static IEnumerable> ApiInfo_BatchManagement { return new Tuple[] { - new Tuple("Batch", "Application", "2020-05-01"), - new Tuple("Batch", "ApplicationPackage", "2020-05-01"), - new Tuple("Batch", "BatchAccount", "2020-05-01"), - new Tuple("Batch", "Certificate", "2020-05-01"), - new Tuple("Batch", "Location", "2020-05-01"), - new Tuple("Batch", "Operations", "2020-05-01"), - new Tuple("Batch", "Pool", "2020-05-01"), - new Tuple("Batch", "PrivateEndpointConnection", "2020-05-01"), - new Tuple("Batch", "PrivateLinkResource", "2020-05-01"), + new Tuple("Batch", "Application", "2020-09-01"), + new Tuple("Batch", "ApplicationPackage", "2020-09-01"), + new Tuple("Batch", "BatchAccount", "2020-09-01"), + new Tuple("Batch", "Certificate", "2020-09-01"), + new Tuple("Batch", "Location", "2020-09-01"), + new Tuple("Batch", "Operations", "2020-09-01"), + new Tuple("Batch", "Pool", "2020-09-01"), + new Tuple("Batch", "PrivateEndpointConnection", "2020-09-01"), + new Tuple("Batch", "PrivateLinkResource", "2020-09-01"), }.AsEnumerable(); } } - // BEGIN: Code Generation Metadata Section - public static readonly String AutoRestVersion = "v2"; - public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4413"; - public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/batch/resource-manager/readme.md --csharp --version=v2 --reflect-api-versions --csharp-sdks-folder=C:\\Users\\jafreck.REDMOND\\source\\azure-sdk-for-net\\sdk"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "358aade743f3b749da5aee9394f34b55466f3b14"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } -