diff --git a/src/Batch/Batch.Management.Sdk/Generated/ApplicationPackageOperations.cs b/src/Batch/Batch.Management.Sdk/Generated/ApplicationPackageOperations.cs
index 709c9e26f6b6..528cccd10319 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/ApplicationPackageOperations.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/ApplicationPackageOperations.cs
@@ -349,6 +349,9 @@ internal ApplicationPackageOperations (BatchManagementClient client)
///
/// The version of the application.
///
+ ///
+ /// The tags of the resource.
+ ///
///
/// Headers that will be added to request.
///
@@ -370,7 +373,7 @@ internal ApplicationPackageOperations (BatchManagementClient client)
///
/// A response object containing the response body and response headers.
///
- public async System.Threading.Tasks.Task> CreateWithHttpMessagesAsync(string resourceGroupName, string accountName, string applicationName, string versionName, System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+ public async System.Threading.Tasks.Task> CreateWithHttpMessagesAsync(string resourceGroupName, string accountName, string applicationName, string versionName, System.Collections.Generic.IDictionary tags = default(System.Collections.Generic.IDictionary), System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
{
@@ -449,6 +452,10 @@ internal ApplicationPackageOperations (BatchManagementClient client)
}
ApplicationPackage parameters = new ApplicationPackage();
+ if(tags != null)
+ {
+ parameters.Tags = tags;
+ }
// Tracing
bool _shouldTrace = Microsoft.Rest.ServiceClientTracing.IsEnabled;
string _invocationId = null;
diff --git a/src/Batch/Batch.Management.Sdk/Generated/ApplicationPackageOperationsExtensions.cs b/src/Batch/Batch.Management.Sdk/Generated/ApplicationPackageOperationsExtensions.cs
index 34c9024b3036..724c4c711e8b 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/ApplicationPackageOperationsExtensions.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/ApplicationPackageOperationsExtensions.cs
@@ -89,9 +89,9 @@ public static ApplicationPackage Activate(this IApplicationPackageOperations ope
///
/// The version of the application.
///
- public static ApplicationPackage Create(this IApplicationPackageOperations operations, string resourceGroupName, string accountName, string applicationName, string versionName)
+ public static ApplicationPackage Create(this IApplicationPackageOperations operations, string resourceGroupName, string accountName, string applicationName, string versionName, System.Collections.Generic.IDictionary tags = default(System.Collections.Generic.IDictionary))
{
- return ((IApplicationPackageOperations)operations).CreateAsync(resourceGroupName, accountName, applicationName, versionName).GetAwaiter().GetResult();
+ return ((IApplicationPackageOperations)operations).CreateAsync(resourceGroupName, accountName, applicationName, versionName, tags).GetAwaiter().GetResult();
}
///
@@ -119,9 +119,9 @@ public static ApplicationPackage Create(this IApplicationPackageOperations opera
///
/// The cancellation token.
///
- public static async System.Threading.Tasks.Task CreateAsync(this IApplicationPackageOperations operations, string resourceGroupName, string accountName, string applicationName, string versionName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+ public static async System.Threading.Tasks.Task CreateAsync(this IApplicationPackageOperations operations, string resourceGroupName, string accountName, string applicationName, string versionName, System.Collections.Generic.IDictionary tags = default(System.Collections.Generic.IDictionary), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
{
- using (var _result = await operations.CreateWithHttpMessagesAsync(resourceGroupName, accountName, applicationName, versionName, null, cancellationToken).ConfigureAwait(false))
+ using (var _result = await operations.CreateWithHttpMessagesAsync(resourceGroupName, accountName, applicationName, versionName, tags, null, cancellationToken).ConfigureAwait(false))
{
return _result.Body;
}
diff --git a/src/Batch/Batch.Management.Sdk/Generated/BatchAccountOperations.cs b/src/Batch/Batch.Management.Sdk/Generated/BatchAccountOperations.cs
index b470cb9da37c..40c384cc58db 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/BatchAccountOperations.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/BatchAccountOperations.cs
@@ -2111,7 +2111,7 @@ internal BatchAccountOperations (BatchManagementClient client)
/// network allows outbound access to these endpoints. Failure to allow access
/// to these endpoints may cause Batch to mark the affected nodes as unusable.
/// For more information about creating a pool inside of a virtual network, see
- /// https://docs.microsoft.com/en-us/azure/batch/batch-virtual-network.
+ /// https://learn.microsoft.com/azure/batch/batch-virtual-network.
///
///
/// The name of the resource group that contains the Batch account.
@@ -3375,7 +3375,7 @@ internal BatchAccountOperations (BatchManagementClient client)
/// network allows outbound access to these endpoints. Failure to allow access
/// to these endpoints may cause Batch to mark the affected nodes as unusable.
/// For more information about creating a pool inside of a virtual network, see
- /// https://docs.microsoft.com/en-us/azure/batch/batch-virtual-network.
+ /// https://learn.microsoft.com/azure/batch/batch-virtual-network.
///
///
/// The NextLink from the previous successful call to List operation.
diff --git a/src/Batch/Batch.Management.Sdk/Generated/BatchAccountOperationsExtensions.cs b/src/Batch/Batch.Management.Sdk/Generated/BatchAccountOperationsExtensions.cs
index 1ceac9aca4ca..1e7f5c1fcf5d 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/BatchAccountOperationsExtensions.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/BatchAccountOperationsExtensions.cs
@@ -471,7 +471,7 @@ public static DetectorResponse GetDetector(this IBatchAccountOperations operatio
/// network allows outbound access to these endpoints. Failure to allow access
/// to these endpoints may cause Batch to mark the affected nodes as unusable.
/// For more information about creating a pool inside of a virtual network, see
- /// https://docs.microsoft.com/en-us/azure/batch/batch-virtual-network.
+ /// https://learn.microsoft.com/azure/batch/batch-virtual-network.
///
///
/// The operations group for this extension method.
@@ -494,7 +494,7 @@ public static Microsoft.Rest.Azure.IPage ListOutbou
/// network allows outbound access to these endpoints. Failure to allow access
/// to these endpoints may cause Batch to mark the affected nodes as unusable.
/// For more information about creating a pool inside of a virtual network, see
- /// https://docs.microsoft.com/en-us/azure/batch/batch-virtual-network.
+ /// https://learn.microsoft.com/azure/batch/batch-virtual-network.
///
///
/// The operations group for this extension method.
@@ -715,7 +715,7 @@ public static Microsoft.Rest.Azure.IPage ListDetectorsNext(thi
/// network allows outbound access to these endpoints. Failure to allow access
/// to these endpoints may cause Batch to mark the affected nodes as unusable.
/// For more information about creating a pool inside of a virtual network, see
- /// https://docs.microsoft.com/en-us/azure/batch/batch-virtual-network.
+ /// https://learn.microsoft.com/azure/batch/batch-virtual-network.
///
///
/// The operations group for this extension method.
@@ -735,7 +735,7 @@ public static Microsoft.Rest.Azure.IPage ListOutbou
/// network allows outbound access to these endpoints. Failure to allow access
/// to these endpoints may cause Batch to mark the affected nodes as unusable.
/// For more information about creating a pool inside of a virtual network, see
- /// https://docs.microsoft.com/en-us/azure/batch/batch-virtual-network.
+ /// https://learn.microsoft.com/azure/batch/batch-virtual-network.
///
///
/// The operations group for this extension method.
diff --git a/src/Batch/Batch.Management.Sdk/Generated/BatchManagementClient.cs b/src/Batch/Batch.Management.Sdk/Generated/BatchManagementClient.cs
index d0654bb16452..80b6eb71a1ce 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/BatchManagementClient.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/BatchManagementClient.cs
@@ -98,6 +98,10 @@ public partial class BatchManagementClient : Microsoft.Rest.ServiceClient
public virtual IPoolOperations Pool { get; private set; }
///
+ /// Gets the INetworkSecurityPerimeterOperations
+ ///
+ public virtual INetworkSecurityPerimeterOperations NetworkSecurityPerimeter { get; private set; }
+ ///
/// Initializes a new instance of the BatchManagementClient class.
///
///
@@ -301,6 +305,9 @@ public BatchManagementClient(System.Uri baseUri, Microsoft.Rest.ServiceClientCre
///
/// Optional. The http client handler used to handle http transport.
///
+ ///
+ /// Optional. The delegating handlers to add to the http client pipeline.
+ ///
///
/// Thrown when a required parameter is null
///
@@ -341,8 +348,9 @@ private void Initialize()
this.PrivateLinkResource = new PrivateLinkResourceOperations(this);
this.PrivateEndpointConnection = new PrivateEndpointConnectionOperations(this);
this.Pool = new PoolOperations(this);
+ this.NetworkSecurityPerimeter = new NetworkSecurityPerimeterOperations(this);
this.BaseUri = new System.Uri("https://management.azure.com");
- this.ApiVersion = "2022-10-01";
+ this.ApiVersion = "2024-07-01";
this.AcceptLanguage = "en-US";
this.LongRunningOperationRetryTimeout = 30;
this.GenerateClientRequestId = true;
diff --git a/src/Batch/Batch.Management.Sdk/Generated/IApplicationPackageOperations.cs b/src/Batch/Batch.Management.Sdk/Generated/IApplicationPackageOperations.cs
index 85c81fa9f7ca..ef9cbb09fac1 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/IApplicationPackageOperations.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/IApplicationPackageOperations.cs
@@ -78,6 +78,9 @@ public partial interface IApplicationPackageOperations
///
/// The version of the application.
///
+ ///
+ /// The tags of the resource.
+ ///
///
/// The headers that will be added to request.
///
@@ -90,7 +93,7 @@ public partial interface IApplicationPackageOperations
///
/// Thrown when unable to deserialize the response
///
- System.Threading.Tasks.Task> CreateWithHttpMessagesAsync(string resourceGroupName, string accountName, string applicationName, string versionName, System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+ System.Threading.Tasks.Task> CreateWithHttpMessagesAsync(string resourceGroupName, string accountName, string applicationName, string versionName, System.Collections.Generic.IDictionary tags = default(System.Collections.Generic.IDictionary), System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
///
/// Deletes an application package record and its associated binary file.
diff --git a/src/Batch/Batch.Management.Sdk/Generated/IBatchAccountOperations.cs b/src/Batch/Batch.Management.Sdk/Generated/IBatchAccountOperations.cs
index 7bbb53b99291..2139fa6dfcfb 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/IBatchAccountOperations.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/IBatchAccountOperations.cs
@@ -336,7 +336,7 @@ public partial interface IBatchAccountOperations
/// network allows outbound access to these endpoints. Failure to allow access
/// to these endpoints may cause Batch to mark the affected nodes as unusable.
/// For more information about creating a pool inside of a virtual network, see
- /// https://docs.microsoft.com/en-us/azure/batch/batch-virtual-network.
+ /// https://learn.microsoft.com/azure/batch/batch-virtual-network.
///
///
/// Lists the endpoints that a Batch Compute Node under this Batch Account may
@@ -345,7 +345,7 @@ public partial interface IBatchAccountOperations
/// network allows outbound access to these endpoints. Failure to allow access
/// to these endpoints may cause Batch to mark the affected nodes as unusable.
/// For more information about creating a pool inside of a virtual network, see
- /// https://docs.microsoft.com/en-us/azure/batch/batch-virtual-network.
+ /// https://learn.microsoft.com/azure/batch/batch-virtual-network.
///
///
/// The name of the resource group that contains the Batch account.
@@ -506,7 +506,7 @@ public partial interface IBatchAccountOperations
/// network allows outbound access to these endpoints. Failure to allow access
/// to these endpoints may cause Batch to mark the affected nodes as unusable.
/// For more information about creating a pool inside of a virtual network, see
- /// https://docs.microsoft.com/en-us/azure/batch/batch-virtual-network.
+ /// https://learn.microsoft.com/azure/batch/batch-virtual-network.
///
///
/// Lists the endpoints that a Batch Compute Node under this Batch Account may
@@ -515,7 +515,7 @@ public partial interface IBatchAccountOperations
/// network allows outbound access to these endpoints. Failure to allow access
/// to these endpoints may cause Batch to mark the affected nodes as unusable.
/// For more information about creating a pool inside of a virtual network, see
- /// https://docs.microsoft.com/en-us/azure/batch/batch-virtual-network.
+ /// https://learn.microsoft.com/azure/batch/batch-virtual-network.
///
///
/// The NextLink from the previous successful call to List operation.
diff --git a/src/Batch/Batch.Management.Sdk/Generated/IBatchManagementClient.cs b/src/Batch/Batch.Management.Sdk/Generated/IBatchManagementClient.cs
index 83562fff68f6..066fc167d4aa 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/IBatchManagementClient.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/IBatchManagementClient.cs
@@ -114,5 +114,10 @@ public partial interface IBatchManagementClient : System.IDisposable
///
IPoolOperations Pool { get; }
+ ///
+ /// Gets the INetworkSecurityPerimeterOperations
+ ///
+ INetworkSecurityPerimeterOperations NetworkSecurityPerimeter { get; }
+
}
}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/ILocationOperations.cs b/src/Batch/Batch.Management.Sdk/Generated/ILocationOperations.cs
index d9c71c0a6ca9..71606ba55c87 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/ILocationOperations.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/ILocationOperations.cs
@@ -69,37 +69,6 @@ public partial interface ILocationOperations
///
System.Threading.Tasks.Task>> ListSupportedVirtualMachineSkusWithHttpMessagesAsync(string locationName, int? maxresults = default(int?), string filter = default(string), System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
- ///
- /// Gets the list of Batch supported Cloud Service VM sizes available at the
- /// given location.
- ///
- ///
- /// Gets the list of Batch supported Cloud Service VM sizes available at the
- /// given location.
- ///
- ///
- /// The region for which to retrieve Batch service supported SKUs.
- ///
- ///
- /// The maximum number of items to return in the response.
- ///
- ///
- /// OData filter expression. Valid properties for filtering are "familyName".
- ///
- ///
- /// The headers that will be added to request.
- ///
- ///
- /// The cancellation token.
- ///
- ///
- /// Thrown when the operation returned an invalid status code
- ///
- ///
- /// Thrown when unable to deserialize the response
- ///
- System.Threading.Tasks.Task>> ListSupportedCloudServiceSkusWithHttpMessagesAsync(string locationName, int? maxresults = default(int?), string filter = default(string), System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
-
///
/// Checks whether the Batch account name is available in the specified region.
///
@@ -151,30 +120,5 @@ public partial interface ILocationOperations
///
System.Threading.Tasks.Task>> ListSupportedVirtualMachineSkusNextWithHttpMessagesAsync(string nextPageLink, System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
- ///
- /// Gets the list of Batch supported Cloud Service VM sizes available at the
- /// given location.
- ///
- ///
- /// Gets the list of Batch supported Cloud Service VM sizes available at the
- /// given location.
- ///
- ///
- /// The NextLink from the previous successful call to List operation.
- ///
- ///
- /// The headers that will be added to request.
- ///
- ///
- /// The cancellation token.
- ///
- ///
- /// Thrown when the operation returned an invalid status code
- ///
- ///
- /// Thrown when unable to deserialize the response
- ///
- System.Threading.Tasks.Task>> ListSupportedCloudServiceSkusNextWithHttpMessagesAsync(string nextPageLink, System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
-
}
}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/INetworkSecurityPerimeterOperations.cs b/src/Batch/Batch.Management.Sdk/Generated/INetworkSecurityPerimeterOperations.cs
new file mode 100644
index 000000000000..49871b57073c
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/INetworkSecurityPerimeterOperations.cs
@@ -0,0 +1,147 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch
+{
+ using Microsoft.Rest.Azure;
+ using Models;
+
+ ///
+ /// NetworkSecurityPerimeterOperations operations.
+ ///
+ public partial interface INetworkSecurityPerimeterOperations
+ {
+ ///
+ /// Lists all of the NSP configurations in the specified account.
+ ///
+ ///
+ /// Lists all of the NSP configurations in the specified account.
+ ///
+ ///
+ /// The name of the resource group that contains the Batch account.
+ ///
+ ///
+ /// The name of the Batch account.
+ ///
+ ///
+ /// The headers that will be added to request.
+ ///
+ ///
+ /// The cancellation token.
+ ///
+ ///
+ /// Thrown when the operation returned an invalid status code
+ ///
+ ///
+ /// Thrown when unable to deserialize the response
+ ///
+ System.Threading.Tasks.Task>> ListConfigurationsWithHttpMessagesAsync(string resourceGroupName, string accountName, System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+
+ ///
+ /// Gets information about the specified NSP configuration.
+ ///
+ ///
+ /// Gets information about the specified NSP configuration.
+ ///
+ ///
+ /// The name of the resource group that contains the Batch account.
+ ///
+ ///
+ /// The name of the Batch account.
+ ///
+ ///
+ /// The name for Network Security Perimeter configuration
+ ///
+ ///
+ /// The headers that will be added to request.
+ ///
+ ///
+ /// The cancellation token.
+ ///
+ ///
+ /// Thrown when the operation returned an invalid status code
+ ///
+ ///
+ /// Thrown when unable to deserialize the response
+ ///
+ System.Threading.Tasks.Task> GetConfigurationWithHttpMessagesAsync(string resourceGroupName, string accountName, string networkSecurityPerimeterConfigurationName, System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+
+ ///
+ /// Reconciles the specified NSP configuration.
+ ///
+ ///
+ /// Reconciles the specified NSP configuration.
+ ///
+ ///
+ /// The name of the resource group that contains the Batch account.
+ ///
+ ///
+ /// The name of the Batch account.
+ ///
+ ///
+ /// The name for Network Security Perimeter configuration
+ ///
+ ///
+ /// The headers that will be added to request.
+ ///
+ ///
+ /// The cancellation token.
+ ///
+ ///
+ /// Thrown when the operation returned an invalid status code
+ ///
+ System.Threading.Tasks.Task> ReconcileConfigurationWithHttpMessagesAsync(string resourceGroupName, string accountName, string networkSecurityPerimeterConfigurationName, System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+
+ ///
+ /// Reconciles the specified NSP configuration.
+ ///
+ ///
+ /// Reconciles the specified NSP configuration.
+ ///
+ ///
+ /// The name of the resource group that contains the Batch account.
+ ///
+ ///
+ /// The name of the Batch account.
+ ///
+ ///
+ /// The name for Network Security Perimeter configuration
+ ///
+ ///
+ /// The headers that will be added to request.
+ ///
+ ///
+ /// The cancellation token.
+ ///
+ ///
+ /// Thrown when the operation returned an invalid status code
+ ///
+ System.Threading.Tasks.Task> BeginReconcileConfigurationWithHttpMessagesAsync(string resourceGroupName, string accountName, string networkSecurityPerimeterConfigurationName, System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+
+ ///
+ /// Lists all of the NSP configurations in the specified account.
+ ///
+ ///
+ /// Lists all of the NSP configurations in the specified account.
+ ///
+ ///
+ /// The NextLink from the previous successful call to List operation.
+ ///
+ ///
+ /// The headers that will be added to request.
+ ///
+ ///
+ /// The cancellation token.
+ ///
+ ///
+ /// Thrown when the operation returned an invalid status code
+ ///
+ ///
+ /// Thrown when unable to deserialize the response
+ ///
+ System.Threading.Tasks.Task>> ListConfigurationsNextWithHttpMessagesAsync(string nextPageLink, System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/IPrivateEndpointConnectionOperations.cs b/src/Batch/Batch.Management.Sdk/Generated/IPrivateEndpointConnectionOperations.cs
index 233a6afc572b..8a5caf1d7593 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/IPrivateEndpointConnectionOperations.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/IPrivateEndpointConnectionOperations.cs
@@ -92,9 +92,10 @@ public partial interface IPrivateEndpointConnectionOperations
/// The state (ETag) version of the private endpoint connection to update. This
/// value can be omitted or set to "*" to apply the operation unconditionally.
///
- ///
- /// The private link service connection state of the private endpoint
- /// connection
+ ///
+ /// PrivateEndpointConnection properties that should be updated. Properties
+ /// that are supplied will be updated, any property not supplied will be
+ /// unchanged.
///
///
/// The headers that will be added to request.
@@ -108,7 +109,7 @@ public partial interface IPrivateEndpointConnectionOperations
///
/// Thrown when unable to deserialize the response
///
- System.Threading.Tasks.Task> UpdateWithHttpMessagesAsync(string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateLinkServiceConnectionState privateLinkServiceConnectionState = default(PrivateLinkServiceConnectionState), string ifMatch = default(string), System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+ System.Threading.Tasks.Task> UpdateWithHttpMessagesAsync(string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateEndpointConnection parameters, string ifMatch = default(string), System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
///
/// Deletes the specified private endpoint connection.
@@ -157,9 +158,10 @@ public partial interface IPrivateEndpointConnectionOperations
/// The state (ETag) version of the private endpoint connection to update. This
/// value can be omitted or set to "*" to apply the operation unconditionally.
///
- ///
- /// The private link service connection state of the private endpoint
- /// connection
+ ///
+ /// PrivateEndpointConnection properties that should be updated. Properties
+ /// that are supplied will be updated, any property not supplied will be
+ /// unchanged.
///
///
/// The headers that will be added to request.
@@ -173,7 +175,7 @@ public partial interface IPrivateEndpointConnectionOperations
///
/// Thrown when unable to deserialize the response
///
- System.Threading.Tasks.Task> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateLinkServiceConnectionState privateLinkServiceConnectionState = default(PrivateLinkServiceConnectionState), string ifMatch = default(string), System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+ System.Threading.Tasks.Task> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateEndpointConnection parameters, string ifMatch = default(string), System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
///
/// Deletes the specified private endpoint connection.
diff --git a/src/Batch/Batch.Management.Sdk/Generated/LocationOperations.cs b/src/Batch/Batch.Management.Sdk/Generated/LocationOperations.cs
index 6ccb5b76ea2d..24fce390fb61 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/LocationOperations.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/LocationOperations.cs
@@ -463,228 +463,6 @@ internal LocationOperations (BatchManagementClient client)
- }
- ///
- /// Gets the list of Batch supported Cloud Service VM sizes available at the
- /// given location.
- ///
- ///
- /// The region for which to retrieve Batch service supported SKUs.
- ///
- ///
- /// The maximum number of items to return in the response.
- ///
- ///
- /// OData filter expression. Valid properties for filtering are "familyName".
- ///
- ///
- /// Headers that will be added to request.
- ///
- ///
- /// The cancellation token.
- ///
- ///
- /// Thrown when the operation returned an invalid status code
- ///
- ///
- /// Thrown when unable to deserialize the response
- ///
- ///
- /// Thrown when a required parameter is null
- ///
- ///
- /// Thrown when a required parameter is null
- ///
- ///
- /// A response object containing the response body and response headers.
- ///
- public async System.Threading.Tasks.Task>> ListSupportedCloudServiceSkusWithHttpMessagesAsync(string locationName, int? maxresults = default(int?), string filter = default(string), System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
- {
-
-
-
-
- if (locationName == null)
- {
- throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "locationName");
- }
-
-
-
- if (this.Client.ApiVersion == null)
- {
- throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "this.Client.ApiVersion");
- }
-
- if (this.Client.SubscriptionId == null)
- {
- throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
- }
-
- // Tracing
- bool _shouldTrace = Microsoft.Rest.ServiceClientTracing.IsEnabled;
- string _invocationId = null;
- if (_shouldTrace)
- {
- _invocationId = Microsoft.Rest.ServiceClientTracing.NextInvocationId.ToString();
- System.Collections.Generic.Dictionary tracingParameters = new System.Collections.Generic.Dictionary();
- tracingParameters.Add("locationName", locationName);
- tracingParameters.Add("maxresults", maxresults);
- tracingParameters.Add("filter", filter);
-
-
- tracingParameters.Add("cancellationToken", cancellationToken);
- Microsoft.Rest.ServiceClientTracing.Enter(_invocationId, this, "ListSupportedCloudServiceSkus", tracingParameters);
- }
- // Construct URL
-
- var _baseUrl = this.Client.BaseUri.AbsoluteUri;
- var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/providers/Microsoft.Batch/locations/{locationName}/cloudServiceSkus").ToString();
- _url = _url.Replace("{locationName}", System.Uri.EscapeDataString(locationName));
- _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(this.Client.SubscriptionId));
-
- System.Collections.Generic.List _queryParameters = new System.Collections.Generic.List();
- if (maxresults != null)
- {
- _queryParameters.Add(string.Format("maxresults={0}", System.Uri.EscapeDataString(Microsoft.Rest.Serialization.SafeJsonConvert.SerializeObject(maxresults, this.Client.SerializationSettings).Trim('"'))));
- }
- if (filter != null)
- {
- _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter)));
- }
- if (this.Client.ApiVersion != null)
- {
- _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(this.Client.ApiVersion)));
- }
- if (_queryParameters.Count > 0)
- {
- _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
- }
- // Create HTTP transport objects
- var _httpRequest = new System.Net.Http.HttpRequestMessage();
- System.Net.Http.HttpResponseMessage _httpResponse = null;
- _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
- _httpRequest.RequestUri = new System.Uri(_url);
- // Set Headers
- if (this.Client.GenerateClientRequestId != null && this.Client.GenerateClientRequestId.Value)
- {
- _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
- }
- if (this.Client.AcceptLanguage != null)
- {
- if (_httpRequest.Headers.Contains("accept-language"))
- {
- _httpRequest.Headers.Remove("accept-language");
- }
- _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.Client.AcceptLanguage);
- }
-
- if (customHeaders != null)
- {
- foreach(var _header in customHeaders)
- {
- if (_httpRequest.Headers.Contains(_header.Key))
- {
- _httpRequest.Headers.Remove(_header.Key);
- }
- _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
- }
- }
- // Serialize Request
- string _requestContent = null;
- // Set Credentials
- if (this.Client.Credentials != null)
- {
- cancellationToken.ThrowIfCancellationRequested();
- await this.Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
- }
- // Send Request
- if (_shouldTrace)
- {
- Microsoft.Rest.ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
- }
- cancellationToken.ThrowIfCancellationRequested();
- _httpResponse = await this.Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
- if (_shouldTrace)
- {
- Microsoft.Rest.ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
- }
-
- System.Net.HttpStatusCode _statusCode = _httpResponse.StatusCode;
- cancellationToken.ThrowIfCancellationRequested();
- string _responseContent = null;
-
- if ((int)_statusCode != 200)
- {
- var ex = new Microsoft.Rest.Azure.CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
- try
- {
- _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
- CloudError _errorBody = Microsoft.Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, this.Client.DeserializationSettings);
- if (_errorBody != null)
- {
- ex = new Microsoft.Rest.Azure.CloudException(_errorBody.Message);
- ex.Body = _errorBody;
- }
- }
- catch (Newtonsoft.Json.JsonException)
- {
- // Ignore the exception
- }
- ex.Request = new Microsoft.Rest.HttpRequestMessageWrapper(_httpRequest, _requestContent);
- ex.Response = new Microsoft.Rest.HttpResponseMessageWrapper(_httpResponse, _responseContent);
- if (_httpResponse.Headers.Contains("x-ms-request-id"))
- {
- ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
- }
- if (_shouldTrace)
- {
- Microsoft.Rest.ServiceClientTracing.Error(_invocationId, ex);
- }
- _httpRequest.Dispose();
- if (_httpResponse != null)
- {
- _httpResponse.Dispose();
- }
- throw ex;
- }
- // Create Result
- var _result = new Microsoft.Rest.Azure.AzureOperationResponse>();
- _result.Request = _httpRequest;
- _result.Response = _httpResponse;
-
- if (_httpResponse.Headers.Contains("x-ms-request-id"))
- {
- _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
- }
- // Deserialize Response
- if ((int)_statusCode == 200)
- {
- _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
- try
- {
- _result.Body = Microsoft.Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, this.Client.DeserializationSettings);
- }
- catch (Newtonsoft.Json.JsonException ex)
- {
- _httpRequest.Dispose();
- if (_httpResponse != null)
- {
- _httpResponse.Dispose();
- }
- throw new Microsoft.Rest.SerializationException("Unable to deserialize the response.", _responseContent, ex);
- }
- }
- if (_shouldTrace)
- {
- Microsoft.Rest.ServiceClientTracing.Exit(_invocationId, _result);
- }
- return _result;
-
-
-
-
-
}
///
/// Checks whether the Batch account name is available in the specified region.
@@ -1086,189 +864,6 @@ internal LocationOperations (BatchManagementClient client)
- }
- ///
- /// Gets the list of Batch supported Cloud Service VM sizes available at the
- /// given location.
- ///
- ///
- /// The NextLink from the previous successful call to List operation.
- ///
- ///
- /// Headers that will be added to request.
- ///
- ///
- /// The cancellation token.
- ///
- ///
- /// Thrown when the operation returned an invalid status code
- ///
- ///
- /// Thrown when unable to deserialize the response
- ///
- ///
- /// Thrown when a required parameter is null
- ///
- ///
- /// Thrown when a required parameter is null
- ///
- ///
- /// A response object containing the response body and response headers.
- ///
- public async System.Threading.Tasks.Task>> ListSupportedCloudServiceSkusNextWithHttpMessagesAsync(string nextPageLink, System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
- {
-
- if (nextPageLink == null)
- {
- throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "nextPageLink");
- }
- // Tracing
- bool _shouldTrace = Microsoft.Rest.ServiceClientTracing.IsEnabled;
- string _invocationId = null;
- if (_shouldTrace)
- {
- _invocationId = Microsoft.Rest.ServiceClientTracing.NextInvocationId.ToString();
- System.Collections.Generic.Dictionary tracingParameters = new System.Collections.Generic.Dictionary();
- tracingParameters.Add("nextPageLink", nextPageLink);
-
-
- tracingParameters.Add("cancellationToken", cancellationToken);
- Microsoft.Rest.ServiceClientTracing.Enter(_invocationId, this, "ListSupportedCloudServiceSkusNext", tracingParameters);
- }
- // Construct URL
- string _url = "{nextLink}";
- _url = _url.Replace("{nextLink}", nextPageLink);
-
- System.Collections.Generic.List _queryParameters = new System.Collections.Generic.List();
- if (_queryParameters.Count > 0)
- {
- _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
- }
- // Create HTTP transport objects
- var _httpRequest = new System.Net.Http.HttpRequestMessage();
- System.Net.Http.HttpResponseMessage _httpResponse = null;
- _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
- _httpRequest.RequestUri = new System.Uri(_url);
- // Set Headers
- if (this.Client.GenerateClientRequestId != null && this.Client.GenerateClientRequestId.Value)
- {
- _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
- }
- if (this.Client.AcceptLanguage != null)
- {
- if (_httpRequest.Headers.Contains("accept-language"))
- {
- _httpRequest.Headers.Remove("accept-language");
- }
- _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.Client.AcceptLanguage);
- }
-
- if (customHeaders != null)
- {
- foreach(var _header in customHeaders)
- {
- if (_httpRequest.Headers.Contains(_header.Key))
- {
- _httpRequest.Headers.Remove(_header.Key);
- }
- _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
- }
- }
- // Serialize Request
- string _requestContent = null;
- // Set Credentials
- if (this.Client.Credentials != null)
- {
- cancellationToken.ThrowIfCancellationRequested();
- await this.Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
- }
- // Send Request
- if (_shouldTrace)
- {
- Microsoft.Rest.ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
- }
- cancellationToken.ThrowIfCancellationRequested();
- _httpResponse = await this.Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
- if (_shouldTrace)
- {
- Microsoft.Rest.ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
- }
-
- System.Net.HttpStatusCode _statusCode = _httpResponse.StatusCode;
- cancellationToken.ThrowIfCancellationRequested();
- string _responseContent = null;
-
- if ((int)_statusCode != 200)
- {
- var ex = new Microsoft.Rest.Azure.CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
- try
- {
- _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
- CloudError _errorBody = Microsoft.Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, this.Client.DeserializationSettings);
- if (_errorBody != null)
- {
- ex = new Microsoft.Rest.Azure.CloudException(_errorBody.Message);
- ex.Body = _errorBody;
- }
- }
- catch (Newtonsoft.Json.JsonException)
- {
- // Ignore the exception
- }
- ex.Request = new Microsoft.Rest.HttpRequestMessageWrapper(_httpRequest, _requestContent);
- ex.Response = new Microsoft.Rest.HttpResponseMessageWrapper(_httpResponse, _responseContent);
- if (_httpResponse.Headers.Contains("x-ms-request-id"))
- {
- ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
- }
- if (_shouldTrace)
- {
- Microsoft.Rest.ServiceClientTracing.Error(_invocationId, ex);
- }
- _httpRequest.Dispose();
- if (_httpResponse != null)
- {
- _httpResponse.Dispose();
- }
- throw ex;
- }
- // Create Result
- var _result = new Microsoft.Rest.Azure.AzureOperationResponse>();
- _result.Request = _httpRequest;
- _result.Response = _httpResponse;
-
- if (_httpResponse.Headers.Contains("x-ms-request-id"))
- {
- _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
- }
- // Deserialize Response
- if ((int)_statusCode == 200)
- {
- _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
- try
- {
- _result.Body = Microsoft.Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, this.Client.DeserializationSettings);
- }
- catch (Newtonsoft.Json.JsonException ex)
- {
- _httpRequest.Dispose();
- if (_httpResponse != null)
- {
- _httpResponse.Dispose();
- }
- throw new Microsoft.Rest.SerializationException("Unable to deserialize the response.", _responseContent, ex);
- }
- }
- if (_shouldTrace)
- {
- Microsoft.Rest.ServiceClientTracing.Exit(_invocationId, _result);
- }
- return _result;
-
-
-
-
-
}
}
}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/LocationOperationsExtensions.cs b/src/Batch/Batch.Management.Sdk/Generated/LocationOperationsExtensions.cs
index 0d664da956bc..34fb2c6e958c 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/LocationOperationsExtensions.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/LocationOperationsExtensions.cs
@@ -95,53 +95,6 @@ public static BatchLocationQuota GetQuotas(this ILocationOperations operations,
}
}
///
- /// Gets the list of Batch supported Cloud Service VM sizes available at the
- /// given location.
- ///
- ///
- /// The operations group for this extension method.
- ///
- ///
- /// The region for which to retrieve Batch service supported SKUs.
- ///
- ///
- /// The maximum number of items to return in the response.
- ///
- ///
- /// OData filter expression. Valid properties for filtering are "familyName".
- ///
- public static Microsoft.Rest.Azure.IPage ListSupportedCloudServiceSkus(this ILocationOperations operations, string locationName, int? maxresults = default(int?), string filter = default(string))
- {
- return ((ILocationOperations)operations).ListSupportedCloudServiceSkusAsync(locationName, maxresults, filter).GetAwaiter().GetResult();
- }
-
- ///
- /// Gets the list of Batch supported Cloud Service VM sizes available at the
- /// given location.
- ///
- ///
- /// The operations group for this extension method.
- ///
- ///
- /// The region for which to retrieve Batch service supported SKUs.
- ///
- ///
- /// The maximum number of items to return in the response.
- ///
- ///
- /// OData filter expression. Valid properties for filtering are "familyName".
- ///
- ///
- /// The cancellation token.
- ///
- public static async System.Threading.Tasks.Task> ListSupportedCloudServiceSkusAsync(this ILocationOperations operations, string locationName, int? maxresults = default(int?), string filter = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
- {
- using (var _result = await operations.ListSupportedCloudServiceSkusWithHttpMessagesAsync(locationName, maxresults, filter, null, cancellationToken).ConfigureAwait(false))
- {
- return _result.Body;
- }
- }
- ///
/// Checks whether the Batch account name is available in the specified region.
///
///
@@ -209,40 +162,5 @@ public static Microsoft.Rest.Azure.IPage ListSupportedVirtualMachi
return _result.Body;
}
}
- ///
- /// Gets the list of Batch supported Cloud Service VM sizes available at the
- /// given location.
- ///
- ///
- /// The operations group for this extension method.
- ///
- ///
- /// The NextLink from the previous successful call to List operation.
- ///
- public static Microsoft.Rest.Azure.IPage ListSupportedCloudServiceSkusNext(this ILocationOperations operations, string nextPageLink)
- {
- return ((ILocationOperations)operations).ListSupportedCloudServiceSkusNextAsync(nextPageLink).GetAwaiter().GetResult();
- }
-
- ///
- /// Gets the list of Batch supported Cloud Service VM sizes available at the
- /// given location.
- ///
- ///
- /// The operations group for this extension method.
- ///
- ///
- /// The NextLink from the previous successful call to List operation.
- ///
- ///
- /// The cancellation token.
- ///
- public static async System.Threading.Tasks.Task> ListSupportedCloudServiceSkusNextAsync(this ILocationOperations operations, string nextPageLink, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
- {
- using (var _result = await operations.ListSupportedCloudServiceSkusNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
- {
- return _result.Body;
- }
- }
}
}
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/AccessRule.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/AccessRule.cs
new file mode 100644
index 000000000000..c20cab9a1ffa
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/AccessRule.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// Access rule in a network security perimeter configuration profile
+ ///
+ public partial class AccessRule
+ {
+ ///
+ /// Initializes a new instance of the AccessRule class.
+ ///
+ public AccessRule()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the AccessRule class.
+ ///
+
+ /// Name of the access rule
+ ///
+
+ /// Properties of Access Rule
+ ///
+ public AccessRule(string name = default(string), AccessRuleProperties properties = default(AccessRuleProperties))
+
+ {
+ this.Name = name;
+ this.Properties = properties;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets name of the access rule
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "name")]
+ public string Name {get; set; }
+
+ ///
+ /// Gets or sets properties of Access Rule
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "properties")]
+ public AccessRuleProperties Properties {get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/AccessRuleDirection.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/AccessRuleDirection.cs
new file mode 100644
index 000000000000..4b8ae08415fb
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/AccessRuleDirection.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+
+ ///
+ /// Defines values for AccessRuleDirection.
+ ///
+
+
+ public static class AccessRuleDirection
+ {
+ ///
+ /// Applies to inbound network traffic to the secured resources.
+ ///
+ public const string Inbound = "Inbound";
+ ///
+ /// Applies to outbound network traffic from the secured resources
+ ///
+ public const string Outbound = "Outbound";
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/AccessRuleProperties.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/AccessRuleProperties.cs
new file mode 100644
index 000000000000..b3ab0cd63661
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/AccessRuleProperties.cs
@@ -0,0 +1,108 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// Properties of Access Rule
+ ///
+ public partial class AccessRuleProperties
+ {
+ ///
+ /// Initializes a new instance of the AccessRuleProperties class.
+ ///
+ public AccessRuleProperties()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the AccessRuleProperties class.
+ ///
+
+ /// Direction of Access Rule
+ /// Possible values include: 'Inbound', 'Outbound'
+
+ /// Address prefixes in the CIDR format for inbound rules
+ ///
+
+ /// Subscriptions for inbound rules
+ ///
+
+ /// Network security perimeters for inbound rules
+ ///
+
+ /// Fully qualified domain names (FQDN) for outbound rules
+ ///
+
+ /// Email addresses for outbound rules
+ ///
+
+ /// Phone numbers for outbound rules
+ ///
+ public AccessRuleProperties(string direction = default(string), System.Collections.Generic.IList addressPrefixes = default(System.Collections.Generic.IList), System.Collections.Generic.IList subscriptions = default(System.Collections.Generic.IList), System.Collections.Generic.IList networkSecurityPerimeters = default(System.Collections.Generic.IList), System.Collections.Generic.IList fullyQualifiedDomainNames = default(System.Collections.Generic.IList), System.Collections.Generic.IList emailAddresses = default(System.Collections.Generic.IList), System.Collections.Generic.IList phoneNumbers = default(System.Collections.Generic.IList))
+
+ {
+ this.Direction = direction;
+ this.AddressPrefixes = addressPrefixes;
+ this.Subscriptions = subscriptions;
+ this.NetworkSecurityPerimeters = networkSecurityPerimeters;
+ this.FullyQualifiedDomainNames = fullyQualifiedDomainNames;
+ this.EmailAddresses = emailAddresses;
+ this.PhoneNumbers = phoneNumbers;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets direction of Access Rule Possible values include: 'Inbound', 'Outbound'
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "direction")]
+ public string Direction {get; set; }
+
+ ///
+ /// Gets or sets address prefixes in the CIDR format for inbound rules
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "addressPrefixes")]
+ public System.Collections.Generic.IList AddressPrefixes {get; set; }
+
+ ///
+ /// Gets or sets subscriptions for inbound rules
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "subscriptions")]
+ public System.Collections.Generic.IList Subscriptions {get; set; }
+
+ ///
+ /// Gets or sets network security perimeters for inbound rules
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "networkSecurityPerimeters")]
+ public System.Collections.Generic.IList NetworkSecurityPerimeters {get; set; }
+
+ ///
+ /// Gets or sets fully qualified domain names (FQDN) for outbound rules
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "fullyQualifiedDomainNames")]
+ public System.Collections.Generic.IList FullyQualifiedDomainNames {get; set; }
+
+ ///
+ /// Gets or sets email addresses for outbound rules
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "emailAddresses")]
+ public System.Collections.Generic.IList EmailAddresses {get; set; }
+
+ ///
+ /// Gets or sets phone numbers for outbound rules
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "phoneNumbers")]
+ public System.Collections.Generic.IList PhoneNumbers {get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/AccessRulePropertiesSubscriptionsItem.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/AccessRulePropertiesSubscriptionsItem.cs
new file mode 100644
index 000000000000..eea37adc4545
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/AccessRulePropertiesSubscriptionsItem.cs
@@ -0,0 +1,50 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// Subscription identifiers
+ ///
+ public partial class AccessRulePropertiesSubscriptionsItem
+ {
+ ///
+ /// Initializes a new instance of the AccessRulePropertiesSubscriptionsItem class.
+ ///
+ public AccessRulePropertiesSubscriptionsItem()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the AccessRulePropertiesSubscriptionsItem class.
+ ///
+
+ /// The fully qualified Azure resource ID of the subscription e.g.
+ /// ('/subscriptions/00000000-0000-0000-0000-000000000000')
+ ///
+ public AccessRulePropertiesSubscriptionsItem(string id = default(string))
+
+ {
+ this.Id = id;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets the fully qualified Azure resource ID of the subscription e.g.
+ /// ('/subscriptions/00000000-0000-0000-0000-000000000000')
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "id")]
+ public string Id {get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/Application.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/Application.cs
index 0ce1fc8ab1e7..3bf992b1f1d5 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/Application.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/Application.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Azure.Management.Batch.Models
/// Contains information about an application in a Batch account.
///
[Microsoft.Rest.Serialization.JsonTransformation]
- public partial class Application : ProxyResource
+ public partial class Application : AzureProxyResource
{
///
/// Initializes a new instance of the Application class.
@@ -37,6 +37,9 @@ public Application()
/// The ETag of the resource, used for concurrency statements.
///
+ /// The tags of the resource.
+ ///
+
/// The display name for the application.
///
@@ -48,9 +51,9 @@ public Application()
/// specify a version. This property can only be set to the name of an existing
/// package.
///
- public Application(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), string displayName = default(string), bool? allowUpdates = default(bool?), string defaultVersion = default(string))
+ public Application(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), System.Collections.Generic.IDictionary tags = default(System.Collections.Generic.IDictionary), string displayName = default(string), bool? allowUpdates = default(bool?), string defaultVersion = default(string))
- : base(id, name, type, etag)
+ : base(id, name, type, etag, tags)
{
this.DisplayName = displayName;
this.AllowUpdates = allowUpdates;
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/ApplicationPackage.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/ApplicationPackage.cs
index 4232032b173c..b2479702cfd9 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/ApplicationPackage.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/ApplicationPackage.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Azure.Management.Batch.Models
/// application.
///
[Microsoft.Rest.Serialization.JsonTransformation]
- public partial class ApplicationPackage : ProxyResource
+ public partial class ApplicationPackage : AzureProxyResource
{
///
/// Initializes a new instance of the ApplicationPackage class.
@@ -38,6 +38,9 @@ public ApplicationPackage()
/// The ETag of the resource, used for concurrency statements.
///
+ /// The tags of the resource.
+ ///
+
/// The current state of the application package.
/// Possible values include: 'Pending', 'Active'
@@ -52,9 +55,9 @@ public ApplicationPackage()
/// The time at which the package was last activated, if the package is active.
///
- public ApplicationPackage(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), PackageState? state = default(PackageState?), string format = default(string), string storageUrl = default(string), System.DateTime? storageUrlExpiry = default(System.DateTime?), System.DateTime? lastActivationTime = default(System.DateTime?))
+ public ApplicationPackage(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), System.Collections.Generic.IDictionary tags = default(System.Collections.Generic.IDictionary), PackageState? state = default(PackageState?), string format = default(string), string storageUrl = default(string), System.DateTime? storageUrlExpiry = default(System.DateTime?), System.DateTime? lastActivationTime = default(System.DateTime?))
- : base(id, name, type, etag)
+ : base(id, name, type, etag, tags)
{
this.State = state;
this.Format = format;
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/AuthenticationMode.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/AuthenticationMode.cs
index 558bda075764..c58b2c4916f7 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/AuthenticationMode.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/AuthenticationMode.cs
@@ -20,7 +20,7 @@ public enum AuthenticationMode
[System.Runtime.Serialization.EnumMember(Value = "SharedKey")]
SharedKey,
///
- /// The authentication mode using Azure Active Directory.
+ /// The authentication mode using Microsoft Entra ID.
///
[System.Runtime.Serialization.EnumMember(Value = "AAD")]
AAD,
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/AutomaticOSUpgradePolicy.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/AutomaticOSUpgradePolicy.cs
new file mode 100644
index 000000000000..123c638629e5
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/AutomaticOSUpgradePolicy.cs
@@ -0,0 +1,91 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// The configuration parameters used for performing automatic OS upgrade.
+ ///
+ public partial class AutomaticOSUpgradePolicy
+ {
+ ///
+ /// Initializes a new instance of the AutomaticOSUpgradePolicy class.
+ ///
+ public AutomaticOSUpgradePolicy()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the AutomaticOSUpgradePolicy class.
+ ///
+
+ /// Whether OS image rollback feature should be disabled.
+ ///
+
+ /// Indicates whether OS upgrades should automatically be applied to scale set
+ /// instances in a rolling fashion when a newer version of the OS image becomes
+ /// available. <br /><br /> If this is set to true for Windows based pools,
+ /// [WindowsConfiguration.enableAutomaticUpdates](https://learn.microsoft.com/rest/api/batchmanagement/pool/create?tabs=HTTP#windowsconfiguration)
+ /// cannot be set to true.
+ ///
+
+ /// Indicates whether rolling upgrade policy should be used during Auto OS
+ /// Upgrade. Auto OS Upgrade will fallback to the default policy if no policy
+ /// is defined on the VMSS.
+ ///
+
+ /// Defer OS upgrades on the TVMs if they are running tasks.
+ ///
+ public AutomaticOSUpgradePolicy(bool? disableAutomaticRollback = default(bool?), bool? enableAutomaticOSUpgrade = default(bool?), bool? useRollingUpgradePolicy = default(bool?), bool? osRollingUpgradeDeferral = default(bool?))
+
+ {
+ this.DisableAutomaticRollback = disableAutomaticRollback;
+ this.EnableAutomaticOSUpgrade = enableAutomaticOSUpgrade;
+ this.UseRollingUpgradePolicy = useRollingUpgradePolicy;
+ this.OSRollingUpgradeDeferral = osRollingUpgradeDeferral;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets whether OS image rollback feature should be disabled.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "disableAutomaticRollback")]
+ public bool? DisableAutomaticRollback {get; set; }
+
+ ///
+ /// Gets or sets indicates whether OS upgrades should automatically be applied
+ /// to scale set instances in a rolling fashion when a newer version of the OS
+ /// image becomes available. <br /><br /> If this is set to true for Windows
+ /// based pools,
+ /// [WindowsConfiguration.enableAutomaticUpdates](https://learn.microsoft.com/rest/api/batchmanagement/pool/create?tabs=HTTP#windowsconfiguration)
+ /// cannot be set to true.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "enableAutomaticOSUpgrade")]
+ public bool? EnableAutomaticOSUpgrade {get; set; }
+
+ ///
+ /// Gets or sets indicates whether rolling upgrade policy should be used during
+ /// Auto OS Upgrade. Auto OS Upgrade will fallback to the default policy if no
+ /// policy is defined on the VMSS.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "useRollingUpgradePolicy")]
+ public bool? UseRollingUpgradePolicy {get; set; }
+
+ ///
+ /// Gets or sets defer OS upgrades on the TVMs if they are running tasks.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "osRollingUpgradeDeferral")]
+ public bool? OSRollingUpgradeDeferral {get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/AzureProxyResource.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/AzureProxyResource.cs
new file mode 100644
index 000000000000..0fa2913c89be
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/AzureProxyResource.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// A definition of an Azure resource.
+ ///
+ public partial class AzureProxyResource : Microsoft.Rest.Azure.IResource
+ {
+ ///
+ /// Initializes a new instance of the AzureProxyResource class.
+ ///
+ public AzureProxyResource()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the AzureProxyResource class.
+ ///
+
+ /// The ID of the resource.
+ ///
+
+ /// The name of the resource.
+ ///
+
+ /// The type of the resource.
+ ///
+
+ /// The ETag of the resource, used for concurrency statements.
+ ///
+
+ /// The tags of the resource.
+ ///
+ public AzureProxyResource(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), System.Collections.Generic.IDictionary tags = default(System.Collections.Generic.IDictionary))
+
+ {
+ this.Id = id;
+ this.Name = name;
+ this.Type = type;
+ this.Etag = etag;
+ this.Tags = tags;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets the ID of the resource.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "id")]
+ public string Id {get; private set; }
+
+ ///
+ /// Gets the name of the resource.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "name")]
+ public string Name {get; private set; }
+
+ ///
+ /// Gets the type of the resource.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "type")]
+ public string Type {get; private set; }
+
+ ///
+ /// Gets the ETag of the resource, used for concurrency statements.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "etag")]
+ public string Etag {get; private set; }
+
+ ///
+ /// Gets or sets the tags of the resource.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "tags")]
+ public System.Collections.Generic.IDictionary Tags {get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/AzureResource.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/AzureResource.cs
new file mode 100644
index 000000000000..14d6861ac366
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/AzureResource.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// A definition of an Azure resource.
+ ///
+ public partial class AzureResource : Microsoft.Rest.Azure.IResource
+ {
+ ///
+ /// Initializes a new instance of the AzureResource class.
+ ///
+ public AzureResource()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the AzureResource class.
+ ///
+
+ /// The ID of the resource.
+ ///
+
+ /// The name of the resource.
+ ///
+
+ /// The type of the resource.
+ ///
+
+ /// The location of the resource.
+ ///
+
+ /// The tags of the resource.
+ ///
+ public AzureResource(string id = default(string), string name = default(string), string type = default(string), string location = default(string), System.Collections.Generic.IDictionary tags = default(System.Collections.Generic.IDictionary))
+
+ {
+ this.Id = id;
+ this.Name = name;
+ this.Type = type;
+ this.Location = location;
+ this.Tags = tags;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets the ID of the resource.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "id")]
+ public string Id {get; private set; }
+
+ ///
+ /// Gets the name of the resource.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "name")]
+ public string Name {get; private set; }
+
+ ///
+ /// Gets the type of the resource.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "type")]
+ public string Type {get; private set; }
+
+ ///
+ /// Gets the location of the resource.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "location")]
+ public string Location {get; private set; }
+
+ ///
+ /// Gets the tags of the resource.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "tags")]
+ public System.Collections.Generic.IDictionary Tags {get; private set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccount.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccount.cs
index 5b7157cd85c4..06c40549dfae 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccount.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccount.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Azure.Management.Batch.Models
/// Contains information about an Azure Batch account.
///
[Microsoft.Rest.Serialization.JsonTransformation]
- public partial class BatchAccount : Resource
+ public partial class BatchAccount : AzureResource
{
///
/// Initializes a new instance of the BatchAccount class.
@@ -64,7 +64,7 @@ public BatchAccount()
///
/// If not specified, the default value is 'enabled'.
- /// Possible values include: 'Enabled', 'Disabled'
+ /// Possible values include: 'Enabled', 'Disabled', 'SecuredByPerimeter'
/// List of private endpoint connections associated with the Batch account
///
@@ -184,7 +184,7 @@ public BatchAccount()
public KeyVaultReference KeyVaultReference {get; private set; }
///
- /// Gets or sets if not specified, the default value is 'enabled'. Possible values include: 'Enabled', 'Disabled'
+ /// Gets or sets if not specified, the default value is 'enabled'. Possible values include: 'Enabled', 'Disabled', 'SecuredByPerimeter'
///
[Newtonsoft.Json.JsonProperty(PropertyName = "properties.publicNetworkAccess")]
public PublicNetworkAccessType? PublicNetworkAccess {get; set; }
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountCreateParameters.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountCreateParameters.cs
index 783f56b8fd8d..98849e001f31 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountCreateParameters.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountCreateParameters.cs
@@ -42,16 +42,15 @@ public BatchAccountCreateParameters()
/// The pool allocation mode also affects how clients may authenticate to the
/// Batch Service API. If the mode is BatchService, clients may authenticate
- /// using access keys or Azure Active Directory. If the mode is
- /// UserSubscription, clients must use Azure Active Directory. The default is
- /// BatchService.
+ /// using access keys or Microsoft Entra ID. If the mode is UserSubscription,
+ /// clients must use Microsoft Entra ID. The default is BatchService.
/// Possible values include: 'BatchService', 'UserSubscription'
/// A reference to the Azure key vault associated with the Batch account.
///
/// If not specified, the default value is 'enabled'.
- /// Possible values include: 'Enabled', 'Disabled'
+ /// Possible values include: 'Enabled', 'Disabled', 'SecuredByPerimeter'
/// Configures how customer data is encrypted inside the Batch account. By
/// default, accounts are encrypted using a Microsoft managed key. For
@@ -118,9 +117,9 @@ public BatchAccountCreateParameters()
///
/// Gets or sets the pool allocation mode also affects how clients may
/// authenticate to the Batch Service API. If the mode is BatchService, clients
- /// may authenticate using access keys or Azure Active Directory. If the mode
- /// is UserSubscription, clients must use Azure Active Directory. The default
- /// is BatchService. Possible values include: 'BatchService', 'UserSubscription'
+ /// may authenticate using access keys or Microsoft Entra ID. If the mode is
+ /// UserSubscription, clients must use Microsoft Entra ID. The default is
+ /// BatchService. Possible values include: 'BatchService', 'UserSubscription'
///
[Newtonsoft.Json.JsonProperty(PropertyName = "properties.poolAllocationMode")]
public PoolAllocationMode? PoolAllocationMode {get; set; }
@@ -133,7 +132,7 @@ public BatchAccountCreateParameters()
public KeyVaultReference KeyVaultReference {get; set; }
///
- /// Gets or sets if not specified, the default value is 'enabled'. Possible values include: 'Enabled', 'Disabled'
+ /// Gets or sets if not specified, the default value is 'enabled'. Possible values include: 'Enabled', 'Disabled', 'SecuredByPerimeter'
///
[Newtonsoft.Json.JsonProperty(PropertyName = "properties.publicNetworkAccess")]
public PublicNetworkAccessType? PublicNetworkAccess {get; set; }
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountCreateProperties.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountCreateProperties.cs
index df5d35605c39..69cbdf0e6ce6 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountCreateProperties.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountCreateProperties.cs
@@ -29,16 +29,15 @@ public BatchAccountCreateProperties()
/// The pool allocation mode also affects how clients may authenticate to the
/// Batch Service API. If the mode is BatchService, clients may authenticate
- /// using access keys or Azure Active Directory. If the mode is
- /// UserSubscription, clients must use Azure Active Directory. The default is
- /// BatchService.
+ /// using access keys or Microsoft Entra ID. If the mode is UserSubscription,
+ /// clients must use Microsoft Entra ID. The default is BatchService.
/// Possible values include: 'BatchService', 'UserSubscription'
/// A reference to the Azure key vault associated with the Batch account.
///
/// If not specified, the default value is 'enabled'.
- /// Possible values include: 'Enabled', 'Disabled'
+ /// Possible values include: 'Enabled', 'Disabled', 'SecuredByPerimeter'
/// The network profile only takes effect when publicNetworkAccess is enabled.
///
@@ -80,9 +79,9 @@ public BatchAccountCreateProperties()
///
/// Gets or sets the pool allocation mode also affects how clients may
/// authenticate to the Batch Service API. If the mode is BatchService, clients
- /// may authenticate using access keys or Azure Active Directory. If the mode
- /// is UserSubscription, clients must use Azure Active Directory. The default
- /// is BatchService. Possible values include: 'BatchService', 'UserSubscription'
+ /// may authenticate using access keys or Microsoft Entra ID. If the mode is
+ /// UserSubscription, clients must use Microsoft Entra ID. The default is
+ /// BatchService. Possible values include: 'BatchService', 'UserSubscription'
///
[Newtonsoft.Json.JsonProperty(PropertyName = "poolAllocationMode")]
public PoolAllocationMode? PoolAllocationMode {get; set; }
@@ -95,7 +94,7 @@ public BatchAccountCreateProperties()
public KeyVaultReference KeyVaultReference {get; set; }
///
- /// Gets or sets if not specified, the default value is 'enabled'. Possible values include: 'Enabled', 'Disabled'
+ /// Gets or sets if not specified, the default value is 'enabled'. Possible values include: 'Enabled', 'Disabled', 'SecuredByPerimeter'
///
[Newtonsoft.Json.JsonProperty(PropertyName = "publicNetworkAccess")]
public PublicNetworkAccessType? PublicNetworkAccess {get; set; }
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountProperties.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountProperties.cs
index 513e40d74b8b..249e66e4ba98 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountProperties.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountProperties.cs
@@ -42,7 +42,7 @@ public BatchAccountProperties()
///
/// If not specified, the default value is 'enabled'.
- /// Possible values include: 'Enabled', 'Disabled'
+ /// Possible values include: 'Enabled', 'Disabled', 'SecuredByPerimeter'
/// The network profile only takes effect when publicNetworkAccess is enabled.
///
@@ -150,7 +150,7 @@ public BatchAccountProperties()
public KeyVaultReference KeyVaultReference {get; private set; }
///
- /// Gets or sets if not specified, the default value is 'enabled'. Possible values include: 'Enabled', 'Disabled'
+ /// Gets or sets if not specified, the default value is 'enabled'. Possible values include: 'Enabled', 'Disabled', 'SecuredByPerimeter'
///
[Newtonsoft.Json.JsonProperty(PropertyName = "publicNetworkAccess")]
public PublicNetworkAccessType? PublicNetworkAccess {get; set; }
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountUpdateParameters.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountUpdateParameters.cs
index 9ee28dbdaa03..aa51742f814c 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountUpdateParameters.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountUpdateParameters.cs
@@ -48,7 +48,7 @@ public BatchAccountUpdateParameters()
///
/// If not specified, the default value is 'enabled'.
- /// Possible values include: 'Enabled', 'Disabled'
+ /// Possible values include: 'Enabled', 'Disabled', 'SecuredByPerimeter'
public BatchAccountUpdateParameters(System.Collections.Generic.IDictionary tags = default(System.Collections.Generic.IDictionary), BatchAccountIdentity identity = default(BatchAccountIdentity), NetworkProfile networkProfile = default(NetworkProfile), AutoStorageBaseProperties autoStorage = default(AutoStorageBaseProperties), EncryptionProperties encryption = default(EncryptionProperties), System.Collections.Generic.IList allowedAuthenticationModes = default(System.Collections.Generic.IList), PublicNetworkAccessType? publicNetworkAccess = default(PublicNetworkAccessType?))
{
@@ -110,7 +110,7 @@ public BatchAccountUpdateParameters()
public System.Collections.Generic.IList AllowedAuthenticationModes {get; set; }
///
- /// Gets or sets if not specified, the default value is 'enabled'. Possible values include: 'Enabled', 'Disabled'
+ /// Gets or sets if not specified, the default value is 'enabled'. Possible values include: 'Enabled', 'Disabled', 'SecuredByPerimeter'
///
[Newtonsoft.Json.JsonProperty(PropertyName = "properties.publicNetworkAccess")]
public PublicNetworkAccessType? PublicNetworkAccess {get; set; }
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountUpdateProperties.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountUpdateProperties.cs
index 9e5f363926dc..eda5c11df711 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountUpdateProperties.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/BatchAccountUpdateProperties.cs
@@ -38,7 +38,7 @@ public BatchAccountUpdateProperties()
///
/// If not specified, the default value is 'enabled'.
- /// Possible values include: 'Enabled', 'Disabled'
+ /// Possible values include: 'Enabled', 'Disabled', 'SecuredByPerimeter'
/// The network profile only takes effect when publicNetworkAccess is enabled.
///
@@ -82,7 +82,7 @@ public BatchAccountUpdateProperties()
public System.Collections.Generic.IList AllowedAuthenticationModes {get; set; }
///
- /// Gets or sets if not specified, the default value is 'enabled'. Possible values include: 'Enabled', 'Disabled'
+ /// Gets or sets if not specified, the default value is 'enabled'. Possible values include: 'Enabled', 'Disabled', 'SecuredByPerimeter'
///
[Newtonsoft.Json.JsonProperty(PropertyName = "publicNetworkAccess")]
public PublicNetworkAccessType? PublicNetworkAccess {get; set; }
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/Certificate.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/Certificate.cs
index 8974dad97b76..3303a3657588 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/Certificate.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/Certificate.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Azure.Management.Batch.Models
/// Contains information about a certificate.
///
[Microsoft.Rest.Serialization.JsonTransformation]
- public partial class Certificate : ProxyResource
+ public partial class Certificate : AzureProxyResource
{
///
/// Initializes a new instance of the Certificate class.
@@ -37,6 +37,9 @@ public Certificate()
/// The ETag of the resource, used for concurrency statements.
///
+ /// The tags of the resource.
+ ///
+
/// This must match the first portion of the certificate name. Currently
/// required to be 'SHA1'.
///
@@ -65,9 +68,9 @@ public Certificate()
/// This is only returned when the certificate provisioningState is 'Failed'.
///
- public Certificate(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), string thumbprintAlgorithm = default(string), string thumbprint = default(string), CertificateFormat format = default(CertificateFormat), CertificateProvisioningState? provisioningState = default(CertificateProvisioningState?), System.DateTime? provisioningStateTransitionTime = default(System.DateTime?), CertificateProvisioningState? previousProvisioningState = default(CertificateProvisioningState?), System.DateTime? previousProvisioningStateTransitionTime = default(System.DateTime?), string publicData = default(string), DeleteCertificateError deleteCertificateError = default(DeleteCertificateError))
+ public Certificate(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), System.Collections.Generic.IDictionary tags = default(System.Collections.Generic.IDictionary), string thumbprintAlgorithm = default(string), string thumbprint = default(string), CertificateFormat format = default(CertificateFormat), CertificateProvisioningState? provisioningState = default(CertificateProvisioningState?), System.DateTime? provisioningStateTransitionTime = default(System.DateTime?), CertificateProvisioningState? previousProvisioningState = default(CertificateProvisioningState?), System.DateTime? previousProvisioningStateTransitionTime = default(System.DateTime?), string publicData = default(string), DeleteCertificateError deleteCertificateError = default(DeleteCertificateError))
- : base(id, name, type, etag)
+ : base(id, name, type, etag, tags)
{
this.ThumbprintAlgorithm = thumbprintAlgorithm;
this.Thumbprint = thumbprint;
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/CertificateCreateOrUpdateParameters.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/CertificateCreateOrUpdateParameters.cs
index da14eb6115ed..2412e603fe41 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/CertificateCreateOrUpdateParameters.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/CertificateCreateOrUpdateParameters.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Azure.Management.Batch.Models
/// Contains information about a certificate.
///
[Microsoft.Rest.Serialization.JsonTransformation]
- public partial class CertificateCreateOrUpdateParameters : ProxyResource
+ public partial class CertificateCreateOrUpdateParameters : AzureProxyResource
{
///
/// Initializes a new instance of the CertificateCreateOrUpdateParameters class.
@@ -37,6 +37,9 @@ public CertificateCreateOrUpdateParameters()
/// The ETag of the resource, used for concurrency statements.
///
+ /// The tags of the resource.
+ ///
+
/// This must match the first portion of the certificate name. Currently
/// required to be 'SHA1'.
///
@@ -53,9 +56,9 @@ public CertificateCreateOrUpdateParameters()
/// This must not be specified if the certificate format is Cer.
///
- public CertificateCreateOrUpdateParameters(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), string thumbprintAlgorithm = default(string), string thumbprint = default(string), CertificateFormat format = default(CertificateFormat), string data = default(string), string password = default(string))
+ public CertificateCreateOrUpdateParameters(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), System.Collections.Generic.IDictionary tags = default(System.Collections.Generic.IDictionary), string thumbprintAlgorithm = default(string), string thumbprint = default(string), CertificateFormat format = default(CertificateFormat), string data = default(string), string password = default(string))
- : base(id, name, type, etag)
+ : base(id, name, type, etag, tags)
{
this.ThumbprintAlgorithm = thumbprintAlgorithm;
this.Thumbprint = thumbprint;
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/CertificateReference.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/CertificateReference.cs
index c7a713bb6250..13a22682858d 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/CertificateReference.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/CertificateReference.cs
@@ -38,22 +38,19 @@ public CertificateReference()
///
/// The default value is currentUser. This property is applicable only for
- /// pools configured with Windows nodes (that is, created with
- /// cloudServiceConfiguration, or with virtualMachineConfiguration using a
- /// Windows image reference). For Linux compute nodes, the certificates are
- /// stored in a directory inside the task working directory and an environment
- /// variable AZ_BATCH_CERTIFICATES_DIR is supplied to the task to query for
- /// this location. For certificates with visibility of 'remoteUser', a 'certs'
- /// directory is created in the user's home directory (e.g.,
- /// /home/{user-name}/certs) and certificates are placed in that directory.
+ /// pools configured with Windows compute nodes. For Linux compute nodes, the
+ /// certificates are stored in a directory inside the task working directory
+ /// and an environment variable AZ_BATCH_CERTIFICATES_DIR is supplied to the
+ /// task to query for this location. For certificates with visibility of
+ /// 'remoteUser', a 'certs' directory is created in the user's home directory
+ /// (e.g., /home/{user-name}/certs) and certificates are placed in that
+ /// directory.
/// Possible values include: 'CurrentUser', 'LocalMachine'
- /// This property is applicable only for pools configured with Windows nodes
- /// (that is, created with cloudServiceConfiguration, or with
- /// virtualMachineConfiguration using a Windows image reference). Common store
- /// names include: My, Root, CA, Trust, Disallowed, TrustedPeople,
- /// TrustedPublisher, AuthRoot, AddressBook, but any custom store name can also
- /// be used. The default value is My.
+ /// This property is applicable only for pools configured with Windows compute
+ /// nodes. Common store names include: My, Root, CA, Trust, Disallowed,
+ /// TrustedPeople, TrustedPublisher, AuthRoot, AddressBook, but any custom
+ /// store name can also be used. The default value is My.
///
/// Which user accounts on the compute node should have access to the private
@@ -84,25 +81,22 @@ public CertificateReference()
///
/// Gets or sets the default value is currentUser. This property is applicable
- /// only for pools configured with Windows nodes (that is, created with
- /// cloudServiceConfiguration, or with virtualMachineConfiguration using a
- /// Windows image reference). For Linux compute nodes, the certificates are
- /// stored in a directory inside the task working directory and an environment
- /// variable AZ_BATCH_CERTIFICATES_DIR is supplied to the task to query for
- /// this location. For certificates with visibility of 'remoteUser', a 'certs'
- /// directory is created in the user's home directory (e.g.,
- /// /home/{user-name}/certs) and certificates are placed in that directory. Possible values include: 'CurrentUser', 'LocalMachine'
+ /// only for pools configured with Windows compute nodes. For Linux compute
+ /// nodes, the certificates are stored in a directory inside the task working
+ /// directory and an environment variable AZ_BATCH_CERTIFICATES_DIR is supplied
+ /// to the task to query for this location. For certificates with visibility of
+ /// 'remoteUser', a 'certs' directory is created in the user's home directory
+ /// (e.g., /home/{user-name}/certs) and certificates are placed in that
+ /// directory. Possible values include: 'CurrentUser', 'LocalMachine'
///
[Newtonsoft.Json.JsonProperty(PropertyName = "storeLocation")]
public CertificateStoreLocation? StoreLocation {get; set; }
///
/// Gets or sets this property is applicable only for pools configured with
- /// Windows nodes (that is, created with cloudServiceConfiguration, or with
- /// virtualMachineConfiguration using a Windows image reference). Common store
- /// names include: My, Root, CA, Trust, Disallowed, TrustedPeople,
- /// TrustedPublisher, AuthRoot, AddressBook, but any custom store name can also
- /// be used. The default value is My.
+ /// Windows compute nodes. Common store names include: My, Root, CA, Trust,
+ /// Disallowed, TrustedPeople, TrustedPublisher, AuthRoot, AddressBook, but any
+ /// custom store name can also be used. The default value is My.
///
[Newtonsoft.Json.JsonProperty(PropertyName = "storeName")]
public string StoreName {get; set; }
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/CloudServiceConfiguration.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/CloudServiceConfiguration.cs
deleted file mode 100644
index 3d74c82058f7..000000000000
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/CloudServiceConfiguration.cs
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-// Code generated by Microsoft (R) AutoRest Code Generator.
-// Changes may cause incorrect behavior and will be lost if the code is regenerated.
-
-namespace Microsoft.Azure.Management.Batch.Models
-{
- using System.Linq;
-
- ///
- /// The configuration for nodes in a pool based on the Azure Cloud Services
- /// platform.
- ///
- ///
- /// The configuration for nodes in a pool based on the Azure Cloud Services
- /// platform.
- ///
- public partial class CloudServiceConfiguration
- {
- ///
- /// Initializes a new instance of the CloudServiceConfiguration class.
- ///
- public CloudServiceConfiguration()
- {
- CustomInit();
- }
-
- ///
- /// Initializes a new instance of the CloudServiceConfiguration class.
- ///
-
- /// Possible values are: 2 - OS Family 2, equivalent to Windows Server 2008 R2
- /// SP1. 3 - OS Family 3, equivalent to Windows Server 2012. 4 - OS Family 4,
- /// equivalent to Windows Server 2012 R2. 5 - OS Family 5, equivalent to
- /// Windows Server 2016. 6 - OS Family 6, equivalent to Windows Server 2019.
- /// For more information, see Azure Guest OS Releases
- /// (https://azure.microsoft.com/documentation/articles/cloud-services-guestos-update-matrix/#releases).
- ///
-
- /// The default value is * which specifies the latest operating system version
- /// for the specified OS family.
- ///
- public CloudServiceConfiguration(string osFamily, string osVersion = default(string))
-
- {
- this.OSFamily = osFamily;
- this.OSVersion = osVersion;
- CustomInit();
- }
-
- ///
- /// An initialization method that performs custom operations like setting defaults
- ///
- partial void CustomInit();
-
-
- ///
- /// Gets or sets possible values are: 2 - OS Family 2, equivalent to Windows
- /// Server 2008 R2 SP1. 3 - OS Family 3, equivalent to Windows Server 2012. 4 -
- /// OS Family 4, equivalent to Windows Server 2012 R2. 5 - OS Family 5,
- /// equivalent to Windows Server 2016. 6 - OS Family 6, equivalent to Windows
- /// Server 2019. For more information, see Azure Guest OS Releases
- /// (https://azure.microsoft.com/documentation/articles/cloud-services-guestos-update-matrix/#releases).
- ///
- [Newtonsoft.Json.JsonProperty(PropertyName = "osFamily")]
- public string OSFamily {get; set; }
-
- ///
- /// Gets or sets the default value is * which specifies the latest operating
- /// system version for the specified OS family.
- ///
- [Newtonsoft.Json.JsonProperty(PropertyName = "osVersion")]
- public string OSVersion {get; set; }
- ///
- /// Validate the object.
- ///
- ///
- /// Thrown if validation fails
- ///
- public virtual void Validate()
- {
- if (this.OSFamily == null)
- {
- throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "OSFamily");
- }
-
-
- }
- }
-}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/ComputeNodeDeallocationOption.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/ComputeNodeDeallocationOption.cs
index 5e3a40cf5f68..4bfe87b541e7 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/ComputeNodeDeallocationOption.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/ComputeNodeDeallocationOption.cs
@@ -35,9 +35,11 @@ public enum ComputeNodeDeallocationOption
[System.Runtime.Serialization.EnumMember(Value = "TaskCompletion")]
TaskCompletion,
///
- /// Allow currently running tasks to complete, then wait for all task data
- /// retention periods to expire. Schedule no new tasks while waiting. Remove
- /// nodes when all task retention periods have expired.
+ /// Deprecated, we encourage you to upload task data to Azure Storage in your
+ /// task and use `TaskCompletion` instead. Allow currently running tasks to
+ /// complete, then wait for all task data retention periods to expire. Schedule
+ /// no new tasks while waiting. Remove nodes when all task retention periods
+ /// have expired.
///
[System.Runtime.Serialization.EnumMember(Value = "RetainedData")]
RetainedData
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/ContainerConfiguration.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/ContainerConfiguration.cs
index 029b3717d3f7..1d2f6ed9da1a 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/ContainerConfiguration.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/ContainerConfiguration.cs
@@ -27,6 +27,9 @@ public ContainerConfiguration()
/// Initializes a new instance of the ContainerConfiguration class.
///
+ /// The container technology to be used.
+ /// Possible values include: 'DockerCompatible', 'CriCompatible'
+
/// 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.
@@ -35,20 +38,14 @@ public ContainerConfiguration()
/// If any images must be downloaded from a private registry which requires
/// credentials, then those credentials must be provided here.
///
- public ContainerConfiguration(System.Collections.Generic.IList containerImageNames = default(System.Collections.Generic.IList), System.Collections.Generic.IList containerRegistries = default(System.Collections.Generic.IList))
+ public ContainerConfiguration(string type, System.Collections.Generic.IList containerImageNames = default(System.Collections.Generic.IList), System.Collections.Generic.IList containerRegistries = default(System.Collections.Generic.IList))
{
+ this.Type = type;
this.ContainerImageNames = containerImageNames;
this.ContainerRegistries = containerRegistries;
CustomInit();
}
- ///
- /// Static constructor for ContainerConfiguration class.
- ///
- static ContainerConfiguration()
- {
- Type = "DockerCompatible";
- }
///
/// An initialization method that performs custom operations like setting defaults
@@ -56,6 +53,12 @@ static ContainerConfiguration()
partial void CustomInit();
+ ///
+ /// Gets or sets the container technology to be used. Possible values include: 'DockerCompatible', 'CriCompatible'
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "type")]
+ public string Type {get; set; }
+
///
/// Gets or sets this is the full image reference, as would be specified to
/// "docker pull". An image will be sourced from the default Docker registry
@@ -71,9 +74,20 @@ static ContainerConfiguration()
[Newtonsoft.Json.JsonProperty(PropertyName = "containerRegistries")]
public System.Collections.Generic.IList ContainerRegistries {get; set; }
///
- /// Gets or sets the container technology to be used.
+ /// Validate the object.
///
- [Newtonsoft.Json.JsonProperty(PropertyName = "type")]
- public static string Type {get; private set; }
+ ///
+ /// Thrown if validation fails
+ ///
+ public virtual void Validate()
+ {
+ if (this.Type == null)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "Type");
+ }
+
+
+
+ }
}
}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/ContainerHostBatchBindMountEntry.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/ContainerHostBatchBindMountEntry.cs
new file mode 100644
index 000000000000..13232061f856
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/ContainerHostBatchBindMountEntry.cs
@@ -0,0 +1,69 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// The entry of path and mount mode you want to mount into task container.
+ ///
+ ///
+ /// The entry of path and mount mode you want to mount into task container.
+ ///
+ public partial class ContainerHostBatchBindMountEntry
+ {
+ ///
+ /// Initializes a new instance of the ContainerHostBatchBindMountEntry class.
+ ///
+ public ContainerHostBatchBindMountEntry()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the ContainerHostBatchBindMountEntry class.
+ ///
+
+ /// The paths which will be mounted to container task's container.
+ /// Possible values include: 'Shared', 'Startup', 'VfsMounts', 'Task',
+ /// 'JobPrep', 'Applications'
+
+ /// For Linux, if you mount this path as a read/write mode, this does not mean
+ /// that all users in container have the read/write access for the path, it
+ /// depends on the access in host VM. If this path is mounted read-only, all
+ /// users within the container will not be able to modify the path.
+ ///
+ public ContainerHostBatchBindMountEntry(string source = default(string), bool? isReadOnly = default(bool?))
+
+ {
+ this.Source = source;
+ this.IsReadOnly = isReadOnly;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets the paths which will be mounted to container task's container. Possible values include: 'Shared', 'Startup', 'VfsMounts', 'Task', 'JobPrep', 'Applications'
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "source")]
+ public string Source {get; set; }
+
+ ///
+ /// Gets or sets for Linux, if you mount this path as a read/write mode, this
+ /// does not mean that all users in container have the read/write access for
+ /// the path, it depends on the access in host VM. If this path is mounted
+ /// read-only, all users within the container will not be able to modify the
+ /// path.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "isReadOnly")]
+ public bool? IsReadOnly {get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/ContainerHostDataPath.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/ContainerHostDataPath.cs
new file mode 100644
index 000000000000..b8f1d77ef4f2
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/ContainerHostDataPath.cs
@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+
+ ///
+ /// Defines values for ContainerHostDataPath.
+ ///
+
+
+ public static class ContainerHostDataPath
+ {
+ ///
+ /// The path for multi-instances task to shared their files.
+ ///
+ public const string Shared = "Shared";
+ ///
+ /// The path for start task.
+ ///
+ public const string Startup = "Startup";
+ ///
+ /// The path contains all virtual file systems are mounted on this node.
+ ///
+ public const string VfsMounts = "VfsMounts";
+ ///
+ /// The task path.
+ ///
+ public const string Task = "Task";
+ ///
+ /// The job-prep task path.
+ ///
+ public const string JobPrep = "JobPrep";
+ ///
+ /// The applications path.
+ ///
+ public const string Applications = "Applications";
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/ContainerType.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/ContainerType.cs
index ea371c85547c..647398cf05c4 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/ContainerType.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/ContainerType.cs
@@ -11,39 +11,16 @@ namespace Microsoft.Azure.Management.Batch.Models
///
- [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
- public enum ContainerType
+ public static class ContainerType
{
///
/// A Docker compatible container technology will be used to launch the
/// containers.
///
- [System.Runtime.Serialization.EnumMember(Value = "DockerCompatible")]
- DockerCompatible
- }
- internal static class ContainerTypeEnumExtension
- {
- internal static string ToSerializedValue(this ContainerType? value)
- {
- return value == null ? null : ((ContainerType)value).ToSerializedValue();
- }
- internal static string ToSerializedValue(this ContainerType value)
- {
- switch( value )
- {
- case ContainerType.DockerCompatible:
- return "DockerCompatible";
- }
- return null;
- }
- internal static ContainerType? ParseContainerType(this string value)
- {
- switch( value )
- {
- case "DockerCompatible":
- return ContainerType.DockerCompatible;
- }
- return null;
- }
+ public const string DockerCompatible = "DockerCompatible";
+ ///
+ /// A CRI based technology will be used to launch the containers.
+ ///
+ public const string CriCompatible = "CriCompatible";
}
}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/CreatedByType.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/CreatedByType.cs
new file mode 100644
index 000000000000..8f6dd6d3652c
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/CreatedByType.cs
@@ -0,0 +1,21 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+
+ ///
+ /// Defines values for CreatedByType.
+ ///
+
+
+ public static class CreatedByType
+ {
+ public const string User = "User";
+ public const string Application = "Application";
+ public const string ManagedIdentity = "ManagedIdentity";
+ public const string Key = "Key";
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/DataDisk.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/DataDisk.cs
index 231a8a36ddee..2840798cd47c 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/DataDisk.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/DataDisk.cs
@@ -46,7 +46,7 @@ public DataDisk()
/// If omitted, the default is "Standard_LRS". Values are:
/// Standard_LRS - The data disk should use standard locally redundant storage.
/// Premium_LRS - The data disk should use premium locally redundant storage.
- /// Possible values include: 'Standard_LRS', 'Premium_LRS'
+ /// Possible values include: 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'
public DataDisk(int lun, int diskSizeGb, CachingType? caching = default(CachingType?), StorageAccountType? storageAccountType = default(StorageAccountType?))
{
@@ -92,7 +92,7 @@ public DataDisk()
///
/// Gets or sets if omitted, the default is "Standard_LRS". Values are:
/// Standard_LRS - The data disk should use standard locally redundant storage.
- /// Premium_LRS - The data disk should use premium locally redundant storage. Possible values include: 'Standard_LRS', 'Premium_LRS'
+ /// Premium_LRS - The data disk should use premium locally redundant storage. Possible values include: 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'
///
[Newtonsoft.Json.JsonProperty(PropertyName = "storageAccountType")]
public StorageAccountType? StorageAccountType {get; set; }
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/DeploymentConfiguration.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/DeploymentConfiguration.cs
index 1f9b22e7fa58..8914f2b9eef5 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/DeploymentConfiguration.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/DeploymentConfiguration.cs
@@ -27,19 +27,12 @@ public DeploymentConfiguration()
/// Initializes a new instance of the DeploymentConfiguration class.
///
- /// This property and virtualMachineConfiguration are mutually exclusive and
- /// one of the properties must be specified. This property cannot be specified
- /// if the Batch account was created with its poolAllocationMode property set
- /// to 'UserSubscription'.
+ /// The configuration for compute nodes in a pool based on the Azure Virtual
+ /// Machines infrastructure.
///
-
- /// This property and cloudServiceConfiguration are mutually exclusive and one
- /// of the properties must be specified.
- ///
- public DeploymentConfiguration(CloudServiceConfiguration cloudServiceConfiguration = default(CloudServiceConfiguration), VirtualMachineConfiguration virtualMachineConfiguration = default(VirtualMachineConfiguration))
+ public DeploymentConfiguration(VirtualMachineConfiguration virtualMachineConfiguration = default(VirtualMachineConfiguration))
{
- this.CloudServiceConfiguration = cloudServiceConfiguration;
this.VirtualMachineConfiguration = virtualMachineConfiguration;
CustomInit();
}
@@ -51,17 +44,8 @@ public DeploymentConfiguration()
///
- /// Gets or sets this property and virtualMachineConfiguration are mutually
- /// exclusive and one of the properties must be specified. This property cannot
- /// be specified if the Batch account was created with its poolAllocationMode
- /// property set to 'UserSubscription'.
- ///
- [Newtonsoft.Json.JsonProperty(PropertyName = "cloudServiceConfiguration")]
- public CloudServiceConfiguration CloudServiceConfiguration {get; set; }
-
- ///
- /// Gets or sets this property and cloudServiceConfiguration are mutually
- /// exclusive and one of the properties must be specified.
+ /// Gets or sets the configuration for compute nodes in a pool based on the
+ /// Azure Virtual Machines infrastructure.
///
[Newtonsoft.Json.JsonProperty(PropertyName = "virtualMachineConfiguration")]
public VirtualMachineConfiguration VirtualMachineConfiguration {get; set; }
@@ -73,10 +57,6 @@ public DeploymentConfiguration()
///
public virtual void Validate()
{
- if (this.CloudServiceConfiguration != null)
- {
- this.CloudServiceConfiguration.Validate();
- }
if (this.VirtualMachineConfiguration != null)
{
this.VirtualMachineConfiguration.Validate();
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/DetectorResponse.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/DetectorResponse.cs
index 6772c6ea28ca..92616c0abf5c 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/DetectorResponse.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/DetectorResponse.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Azure.Management.Batch.Models
/// Contains the information for a detector.
///
[Microsoft.Rest.Serialization.JsonTransformation]
- public partial class DetectorResponse : ProxyResource
+ public partial class DetectorResponse : AzureProxyResource
{
///
/// Initializes a new instance of the DetectorResponse class.
@@ -37,11 +37,14 @@ public DetectorResponse()
/// The ETag of the resource, used for concurrency statements.
///
+ /// The tags of the resource.
+ ///
+
/// A base64 encoded string that represents the content of a detector.
///
- public DetectorResponse(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), string value = default(string))
+ public DetectorResponse(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), System.Collections.Generic.IDictionary tags = default(System.Collections.Generic.IDictionary), string value = default(string))
- : base(id, name, type, etag)
+ : base(id, name, type, etag, tags)
{
this.Value = value;
CustomInit();
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/DiffDiskSettings.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/DiffDiskSettings.cs
index 3251404abfc8..99a23ebec160 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/DiffDiskSettings.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/DiffDiskSettings.cs
@@ -34,9 +34,9 @@ public DiffDiskSettings()
/// disk provisioning. For more information on Ephemeral OS disk size
/// requirements, please refer to Ephemeral OS disk size requirements for
/// Windows VMs at
- /// https://docs.microsoft.com/en-us/azure/virtual-machines/windows/ephemeral-os-disks#size-requirements
+ /// https://learn.microsoft.com/azure/virtual-machines/windows/ephemeral-os-disks#size-requirements
/// and Linux VMs at
- /// https://docs.microsoft.com/en-us/azure/virtual-machines/linux/ephemeral-os-disks#size-requirements.
+ /// https://learn.microsoft.com/azure/virtual-machines/linux/ephemeral-os-disks#size-requirements.
/// Possible values include: 'CacheDisk'
public DiffDiskSettings(DiffDiskPlacement? placement = default(DiffDiskPlacement?))
@@ -57,9 +57,9 @@ public DiffDiskSettings()
/// 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://docs.microsoft.com/en-us/azure/virtual-machines/windows/ephemeral-os-disks#size-requirements
+ /// https://learn.microsoft.com/azure/virtual-machines/windows/ephemeral-os-disks#size-requirements
/// and Linux VMs at
- /// https://docs.microsoft.com/en-us/azure/virtual-machines/linux/ephemeral-os-disks#size-requirements. Possible values include: 'CacheDisk'
+ /// https://learn.microsoft.com/azure/virtual-machines/linux/ephemeral-os-disks#size-requirements. Possible values include: 'CacheDisk'
///
[Newtonsoft.Json.JsonProperty(PropertyName = "placement")]
public DiffDiskPlacement? Placement {get; set; }
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/DiskEncryptionConfiguration.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/DiskEncryptionConfiguration.cs
index 3b48b428f459..921c0887ea41 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/DiskEncryptionConfiguration.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/DiskEncryptionConfiguration.cs
@@ -10,7 +10,7 @@ namespace Microsoft.Azure.Management.Batch.Models
///
/// The disk encryption configuration applied on compute nodes in the pool.
/// Disk encryption configuration is not supported on Linux pool created with
- /// Virtual Machine Image or Shared Image Gallery Image.
+ /// Virtual Machine Image or Azure Compute Gallery Image.
///
public partial class DiskEncryptionConfiguration
{
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/ErrorAdditionalInfo.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/ErrorAdditionalInfo.cs
new file mode 100644
index 000000000000..c03d84b6f03e
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/ErrorAdditionalInfo.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// The resource management error additional info.
+ ///
+ public partial class ErrorAdditionalInfo
+ {
+ ///
+ /// Initializes a new instance of the ErrorAdditionalInfo class.
+ ///
+ public ErrorAdditionalInfo()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the ErrorAdditionalInfo class.
+ ///
+
+ /// The additional info type.
+ ///
+
+ /// The additional info.
+ ///
+ public ErrorAdditionalInfo(string type = default(string), object info = default(object))
+
+ {
+ this.Type = type;
+ this.Info = info;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets the additional info type.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "type")]
+ public string Type {get; private set; }
+
+ ///
+ /// Gets the additional info.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "info")]
+ public object Info {get; private set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/ErrorDetail.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/ErrorDetail.cs
new file mode 100644
index 000000000000..1e1e859e86f5
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/ErrorDetail.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// The error detail.
+ ///
+ public partial class ErrorDetail
+ {
+ ///
+ /// Initializes a new instance of the ErrorDetail class.
+ ///
+ public ErrorDetail()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the ErrorDetail class.
+ ///
+
+ /// The error code.
+ ///
+
+ /// The error message.
+ ///
+
+ /// The error target.
+ ///
+
+ /// The error details.
+ ///
+
+ /// The error additional info.
+ ///
+ public ErrorDetail(string code = default(string), string message = default(string), string target = default(string), System.Collections.Generic.IList details = default(System.Collections.Generic.IList), System.Collections.Generic.IList additionalInfo = default(System.Collections.Generic.IList))
+
+ {
+ this.Code = code;
+ this.Message = message;
+ this.Target = target;
+ this.Details = details;
+ this.AdditionalInfo = additionalInfo;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets the error code.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "code")]
+ public string Code {get; private set; }
+
+ ///
+ /// Gets the error message.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "message")]
+ public string Message {get; private set; }
+
+ ///
+ /// Gets the error target.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "target")]
+ public string Target {get; private set; }
+
+ ///
+ /// Gets the error details.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "details")]
+ public System.Collections.Generic.IList Details {get; private set; }
+
+ ///
+ /// Gets the error additional info.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "additionalInfo")]
+ public System.Collections.Generic.IList AdditionalInfo {get; private set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/ErrorResponse.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/ErrorResponse.cs
new file mode 100644
index 000000000000..d052775e919c
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/ErrorResponse.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// Common error response for all Azure Resource Manager APIs to return error
+ /// details for failed operations. (This also follows the OData error response
+ /// format.).
+ ///
+ ///
+ /// Common error response for all Azure Resource Manager APIs to return error
+ /// details for failed operations. (This also follows the OData error response
+ /// format.).
+ ///
+ public partial class ErrorResponse
+ {
+ ///
+ /// Initializes a new instance of the ErrorResponse class.
+ ///
+ public ErrorResponse()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the ErrorResponse class.
+ ///
+
+ /// The error object.
+ ///
+ public ErrorResponse(ErrorDetail error = default(ErrorDetail))
+
+ {
+ this.Error = error;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets the error object.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "error")]
+ public ErrorDetail Error {get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/ErrorResponseException.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/ErrorResponseException.cs
new file mode 100644
index 000000000000..7d1319007228
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/ErrorResponseException.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+
+ ///
+ /// Exception thrown for an invalid response with ErrorResponse information.
+ ///
+ public partial class ErrorResponseException : Microsoft.Rest.RestException
+ {
+ ///
+ /// Gets information about the associated HTTP request.
+ ///
+ public Microsoft.Rest.HttpRequestMessageWrapper Request { get; set; }
+
+ ///
+ /// Gets information about the associated HTTP response.
+ ///
+ public Microsoft.Rest.HttpResponseMessageWrapper Response { get; set; }
+
+ ///
+ /// Gets or sets the body object.
+ ///
+ public ErrorResponse Body { get; set; }
+
+ ///
+ /// Initializes a new instance of the ErrorResponseException class.
+ ///
+ public ErrorResponseException()
+ {
+ }
+
+ ///
+ /// Initializes a new instance of the ErrorResponse class.
+ ///
+ /// The exception message.
+ public ErrorResponseException(string message)
+ : this(message, null)
+ {
+ }
+
+ ///
+ /// Initializes a new instance of the ErrorResponse class.
+ ///
+ /// The exception message.
+ /// Inner exception.
+ public ErrorResponseException(string message, System.Exception innerException)
+ : base(message, innerException)
+ {
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/ImageReference.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/ImageReference.cs
index e4a5704db903..3b796bea11be 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/ImageReference.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/ImageReference.cs
@@ -46,13 +46,21 @@ public ImageReference()
/// image. If omitted, the default is 'latest'.
///
- /// This property is mutually exclusive with other properties. The Shared Image
- /// Gallery image must have replicas in the same region as the Azure Batch
- /// account. For information about the firewall settings for the Batch node
- /// agent to communicate with the Batch service see
- /// https://docs.microsoft.com/en-us/azure/batch/batch-api-basics#virtual-network-vnet-and-firewall-configuration.
+ /// This property is mutually exclusive with other properties. The Azure
+ /// Compute Gallery Image must have replicas in the same region as the Azure
+ /// Batch account. For information about the firewall settings for the Batch
+ /// node agent to communicate with the Batch service see
+ /// https://learn.microsoft.com/azure/batch/batch-api-basics#virtual-network-vnet-and-firewall-configuration.
///
- public ImageReference(string publisher = default(string), string offer = default(string), string sku = default(string), string version = default(string), string id = default(string))
+
+ /// This property is mutually exclusive with other properties and can be
+ /// fetched from shared gallery image GET call.
+ ///
+
+ /// This property is mutually exclusive with other properties and can be
+ /// fetched from community gallery image GET call.
+ ///
+ public ImageReference(string publisher = default(string), string offer = default(string), string sku = default(string), string version = default(string), string id = default(string), string sharedGalleryImageId = default(string), string communityGalleryImageId = default(string))
{
this.Publisher = publisher;
@@ -60,6 +68,8 @@ public ImageReference()
this.Sku = sku;
this.Version = version;
this.Id = id;
+ this.SharedGalleryImageId = sharedGalleryImageId;
+ this.CommunityGalleryImageId = communityGalleryImageId;
CustomInit();
}
@@ -96,12 +106,26 @@ public ImageReference()
///
/// Gets or sets this property is mutually exclusive with other properties. The
- /// Shared Image Gallery image must have replicas in the same region as the
+ /// Azure Compute Gallery Image must have replicas in the same region as the
/// Azure Batch account. For information about the firewall settings for the
/// Batch node agent to communicate with the Batch service see
- /// https://docs.microsoft.com/en-us/azure/batch/batch-api-basics#virtual-network-vnet-and-firewall-configuration.
+ /// https://learn.microsoft.com/azure/batch/batch-api-basics#virtual-network-vnet-and-firewall-configuration.
///
[Newtonsoft.Json.JsonProperty(PropertyName = "id")]
public string Id {get; set; }
+
+ ///
+ /// Gets or sets this property is mutually exclusive with other properties and
+ /// can be fetched from shared gallery image GET call.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "sharedGalleryImageId")]
+ public string SharedGalleryImageId {get; set; }
+
+ ///
+ /// Gets or sets this property is mutually exclusive with other properties and
+ /// can be fetched from community gallery image GET call.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "communityGalleryImageId")]
+ public string CommunityGalleryImageId {get; set; }
}
}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/InboundNatPool.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/InboundNatPool.cs
index 34d0340ab5bd..4523d48c9f21 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/InboundNatPool.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/InboundNatPool.cs
@@ -40,9 +40,8 @@ public InboundNatPool()
/// Possible values include: 'TCP', 'UDP'
/// This must be unique within a Batch pool. Acceptable values are between 1
- /// and 65535 except for 22, 3389, 29876 and 29877 as these are reserved. If
- /// any reserved values are provided the request fails with HTTP status code
- /// 400.
+ /// 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.
///
/// Acceptable values range between 1 and 65534 except ports from 50000 to
@@ -99,9 +98,9 @@ public InboundNatPool()
///
/// Gets or sets this must be unique within a Batch pool. Acceptable values are
- /// between 1 and 65535 except for 22, 3389, 29876 and 29877 as these are
- /// reserved. If any reserved values are provided the request fails with HTTP
- /// status code 400.
+ /// 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.
///
[Newtonsoft.Json.JsonProperty(PropertyName = "backendPort")]
public int BackendPort {get; set; }
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/IssueType.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/IssueType.cs
new file mode 100644
index 000000000000..877cc16ddc5c
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/IssueType.cs
@@ -0,0 +1,39 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+
+ ///
+ /// Defines values for IssueType.
+ ///
+
+
+ public static class IssueType
+ {
+ ///
+ /// Unknown issue type
+ ///
+ public const string Unknown = "Unknown";
+ ///
+ /// An error occurred while applying the network security perimeter (NSP)
+ /// configuration.
+ ///
+ public const string ConfigurationPropagationFailure = "ConfigurationPropagationFailure";
+ ///
+ /// A network connectivity issue is happening on the resource which could be
+ /// addressed either by adding new resources to the network security perimeter
+ /// (NSP) or by modifying access rules.
+ ///
+ public const string MissingPerimeterConfiguration = "MissingPerimeterConfiguration";
+ ///
+ /// An managed identity hasn't been associated with the resource. The resource
+ /// will still be able to validate inbound traffic from the network security
+ /// perimeter (NSP) or matching inbound access rules, but it won't be able to
+ /// perform outbound access as a member of the NSP.
+ ///
+ public const string MissingIdentityConfiguration = "MissingIdentityConfiguration";
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/KeyVaultProperties.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/KeyVaultProperties.cs
index 88c6b8b6290f..f9679564ce89 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/KeyVaultProperties.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/KeyVaultProperties.cs
@@ -25,9 +25,10 @@ public KeyVaultProperties()
/// Initializes a new instance of the KeyVaultProperties class.
///
- /// Full path to the versioned secret. Example
+ /// Full path to the secret with or without version. Example
/// https://mykeyvault.vault.azure.net/keys/testkey/6e34a81fef704045975661e297a4c053.
- /// To be usable the following prerequisites must be met:
+ /// or https://mykeyvault.vault.azure.net/keys/testkey. To be usable the
+ /// following prerequisites must be met:
/// The Batch Account has a System Assigned identity
/// The account identity has been granted Key/Get, Key/Unwrap and Key/Wrap
/// permissions
@@ -47,9 +48,10 @@ public KeyVaultProperties()
///
- /// Gets or sets full path to the versioned secret. Example
+ /// Gets or sets full path to the secret with or without version. Example
/// https://mykeyvault.vault.azure.net/keys/testkey/6e34a81fef704045975661e297a4c053.
- /// To be usable the following prerequisites must be met:
+ /// or https://mykeyvault.vault.azure.net/keys/testkey. To be usable the
+ /// following prerequisites must be met:
/// The Batch Account has a System Assigned identity
/// The account identity has been granted Key/Get, Key/Unwrap and Key/Wrap
/// permissions
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/ManagedDisk.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/ManagedDisk.cs
new file mode 100644
index 000000000000..c124fafb28a5
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/ManagedDisk.cs
@@ -0,0 +1,60 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ public partial class ManagedDisk
+ {
+ ///
+ /// Initializes a new instance of the ManagedDisk class.
+ ///
+ public ManagedDisk()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the ManagedDisk class.
+ ///
+
+ /// The storage account type for use in creating data disks or OS disk.
+ /// Possible values include: 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'
+
+ /// Specifies the security profile settings for the managed disk. **Note**: It
+ /// can only be set for Confidential VMs and is required when using
+ /// Confidential VMs.
+ ///
+ public ManagedDisk(StorageAccountType? storageAccountType = default(StorageAccountType?), VMDiskSecurityProfile securityProfile = default(VMDiskSecurityProfile))
+
+ {
+ this.StorageAccountType = storageAccountType;
+ this.SecurityProfile = securityProfile;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets the storage account type for use in creating data disks or OS
+ /// disk. Possible values include: 'Standard_LRS', 'Premium_LRS', 'StandardSSD_LRS'
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "storageAccountType")]
+ public StorageAccountType? StorageAccountType {get; set; }
+
+ ///
+ /// Gets or sets specifies the security profile settings for the managed disk.
+ /// **Note**: It can only be set for Confidential VMs and is required when
+ /// using Confidential VMs.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "securityProfile")]
+ public VMDiskSecurityProfile SecurityProfile {get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkConfiguration.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkConfiguration.cs
index 0606bd92da94..7e91a6718fc8 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkConfiguration.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkConfiguration.cs
@@ -38,32 +38,34 @@ public NetworkConfiguration()
/// NSG, then the Batch service will set the state of the compute nodes to
/// unusable. If the specified VNet has any associated Network Security Groups
/// (NSG), then a few reserved system ports must be enabled for inbound
- /// communication. For pools created with a virtual machine configuration,
- /// enable ports 29876 and 29877, as well as port 22 for Linux and port 3389
- /// for Windows. For pools created with a cloud service configuration, enable
- /// ports 10100, 20100, and 30100. Also enable outbound connections to Azure
- /// Storage on port 443. For cloudServiceConfiguration pools, only 'classic'
- /// VNETs are supported. For more details see:
- /// https://docs.microsoft.com/en-us/azure/batch/batch-api-basics#virtual-network-vnet-and-firewall-configuration
+ /// communication,including ports 29876 and 29877. Also enable outbound
+ /// connections to Azure Storage on port 443. For more details see:
+ /// https://learn.microsoft.com/azure/batch/batch-api-basics#virtual-network-vnet-and-firewall-configuration
///
/// The scope of dynamic vnet assignment.
/// Possible values include: 'none', 'job'
- /// Pool endpoint configuration is only supported on pools with the
- /// virtualMachineConfiguration property.
+ /// The endpoint configuration for a pool.
///
- /// This property is only supported on Pools with the
- /// virtualMachineConfiguration property.
+ /// The public IP Address configuration of the networking configuration of a
+ /// Pool.
///
- public NetworkConfiguration(string subnetId = default(string), DynamicVNetAssignmentScope? dynamicVnetAssignmentScope = default(DynamicVNetAssignmentScope?), PoolEndpointConfiguration endpointConfiguration = default(PoolEndpointConfiguration), PublicIPAddressConfiguration publicIPAddressConfiguration = default(PublicIPAddressConfiguration))
+
+ /// 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.
+ ///
+ public NetworkConfiguration(string subnetId = default(string), DynamicVNetAssignmentScope? dynamicVnetAssignmentScope = default(DynamicVNetAssignmentScope?), PoolEndpointConfiguration endpointConfiguration = default(PoolEndpointConfiguration), PublicIPAddressConfiguration publicIPAddressConfiguration = default(PublicIPAddressConfiguration), bool? enableAcceleratedNetworking = default(bool?))
{
this.SubnetId = subnetId;
this.DynamicVnetAssignmentScope = dynamicVnetAssignmentScope;
this.EndpointConfiguration = endpointConfiguration;
this.PublicIPAddressConfiguration = publicIPAddressConfiguration;
+ this.EnableAcceleratedNetworking = enableAcceleratedNetworking;
CustomInit();
}
@@ -88,13 +90,10 @@ public NetworkConfiguration()
/// specified subnet is denied by an NSG, then the Batch service will set the
/// state of the compute nodes to unusable. If the specified VNet has any
/// associated Network Security Groups (NSG), then a few reserved system ports
- /// must be enabled for inbound communication. For pools created with a virtual
- /// machine configuration, enable ports 29876 and 29877, as well as port 22 for
- /// Linux and port 3389 for Windows. For pools created with a cloud service
- /// configuration, enable ports 10100, 20100, and 30100. Also enable outbound
- /// connections to Azure Storage on port 443. For cloudServiceConfiguration
- /// pools, only 'classic' VNETs are supported. For more details see:
- /// https://docs.microsoft.com/en-us/azure/batch/batch-api-basics#virtual-network-vnet-and-firewall-configuration
+ /// must be enabled for inbound communication,including ports 29876 and 29877.
+ /// Also enable outbound connections to Azure Storage on port 443. For more
+ /// details see:
+ /// https://learn.microsoft.com/azure/batch/batch-api-basics#virtual-network-vnet-and-firewall-configuration
///
[Newtonsoft.Json.JsonProperty(PropertyName = "subnetId")]
public string SubnetId {get; set; }
@@ -106,18 +105,26 @@ public NetworkConfiguration()
public DynamicVNetAssignmentScope? DynamicVnetAssignmentScope {get; set; }
///
- /// Gets or sets pool endpoint configuration is only supported on pools with
- /// the virtualMachineConfiguration property.
+ /// Gets or sets the endpoint configuration for a pool.
///
[Newtonsoft.Json.JsonProperty(PropertyName = "endpointConfiguration")]
public PoolEndpointConfiguration EndpointConfiguration {get; set; }
///
- /// Gets or sets this property is only supported on Pools with the
- /// virtualMachineConfiguration property.
+ /// Gets or sets the public IP Address configuration of the networking
+ /// configuration of a Pool.
///
[Newtonsoft.Json.JsonProperty(PropertyName = "publicIPAddressConfiguration")]
public PublicIPAddressConfiguration PublicIPAddressConfiguration {get; set; }
+
+ ///
+ /// Gets or sets 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.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "enableAcceleratedNetworking")]
+ public bool? EnableAcceleratedNetworking {get; set; }
///
/// Validate the object.
///
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkSecurityPerimeter.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkSecurityPerimeter.cs
new file mode 100644
index 000000000000..df9f421ebaa8
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkSecurityPerimeter.cs
@@ -0,0 +1,68 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// Information about a network security perimeter (NSP)
+ ///
+ public partial class NetworkSecurityPerimeter
+ {
+ ///
+ /// Initializes a new instance of the NetworkSecurityPerimeter class.
+ ///
+ public NetworkSecurityPerimeter()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the NetworkSecurityPerimeter class.
+ ///
+
+ /// Fully qualified Azure resource ID of the NSP resource
+ ///
+
+ /// Universal unique ID (UUID) of the network security perimeter
+ ///
+
+ /// Location of the network security perimeter
+ ///
+ public NetworkSecurityPerimeter(string id = default(string), System.Guid? perimeterGuid = default(System.Guid?), string location = default(string))
+
+ {
+ this.Id = id;
+ this.PerimeterGuid = perimeterGuid;
+ this.Location = location;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets fully qualified Azure resource ID of the NSP resource
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "id")]
+ public string Id {get; set; }
+
+ ///
+ /// Gets or sets universal unique ID (UUID) of the network security perimeter
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "perimeterGuid")]
+ public System.Guid? PerimeterGuid {get; set; }
+
+ ///
+ /// Gets or sets location of the network security perimeter
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "location")]
+ public string Location {get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkSecurityPerimeterConfiguration.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkSecurityPerimeterConfiguration.cs
new file mode 100644
index 000000000000..65ca39f79a9b
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkSecurityPerimeterConfiguration.cs
@@ -0,0 +1,64 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// Network security perimeter (NSP) configuration resource
+ ///
+ public partial class NetworkSecurityPerimeterConfiguration : ProxyResource
+ {
+ ///
+ /// Initializes a new instance of the NetworkSecurityPerimeterConfiguration class.
+ ///
+ public NetworkSecurityPerimeterConfiguration()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the NetworkSecurityPerimeterConfiguration class.
+ ///
+
+ /// Fully qualified resource ID for the resource. E.g.
+ /// "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}"
+ ///
+
+ /// The name of the resource
+ ///
+
+ /// The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+ /// "Microsoft.Storage/storageAccounts"
+ ///
+
+ /// Azure Resource Manager metadata containing createdBy and modifiedBy
+ /// information.
+ ///
+
+ /// Network security configuration properties.
+ ///
+ public NetworkSecurityPerimeterConfiguration(string id = default(string), string name = default(string), string type = default(string), SystemData systemData = default(SystemData), NetworkSecurityPerimeterConfigurationProperties properties = default(NetworkSecurityPerimeterConfigurationProperties))
+
+ : base(id, name, type, systemData)
+ {
+ this.Properties = properties;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets network security configuration properties.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "properties")]
+ public NetworkSecurityPerimeterConfigurationProperties Properties {get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkSecurityPerimeterConfigurationProperties.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkSecurityPerimeterConfigurationProperties.cs
new file mode 100644
index 000000000000..cbe57291b0b8
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkSecurityPerimeterConfigurationProperties.cs
@@ -0,0 +1,91 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// Network security configuration properties.
+ ///
+ public partial class NetworkSecurityPerimeterConfigurationProperties
+ {
+ ///
+ /// Initializes a new instance of the NetworkSecurityPerimeterConfigurationProperties class.
+ ///
+ public NetworkSecurityPerimeterConfigurationProperties()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the NetworkSecurityPerimeterConfigurationProperties class.
+ ///
+
+ /// Provisioning state of a network security perimeter configuration that is
+ /// being created or updated.
+ /// Possible values include: 'Succeeded', 'Creating', 'Updating', 'Deleting',
+ /// 'Accepted', 'Failed', 'Canceled'
+
+ /// List of provisioning issues, if any
+ ///
+
+ /// Information about a network security perimeter (NSP)
+ ///
+
+ /// Information about resource association
+ ///
+
+ /// Network security perimeter configuration profile
+ ///
+ public NetworkSecurityPerimeterConfigurationProperties(string provisioningState = default(string), System.Collections.Generic.IList provisioningIssues = default(System.Collections.Generic.IList), NetworkSecurityPerimeter networkSecurityPerimeter = default(NetworkSecurityPerimeter), ResourceAssociation resourceAssociation = default(ResourceAssociation), NetworkSecurityProfile profile = default(NetworkSecurityProfile))
+
+ {
+ this.ProvisioningState = provisioningState;
+ this.ProvisioningIssues = provisioningIssues;
+ this.NetworkSecurityPerimeter = networkSecurityPerimeter;
+ this.ResourceAssociation = resourceAssociation;
+ this.Profile = profile;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets provisioning state of a network security perimeter configuration that
+ /// is being created or updated. Possible values include: 'Succeeded', 'Creating', 'Updating', 'Deleting', 'Accepted', 'Failed', 'Canceled'
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "provisioningState")]
+ public string ProvisioningState {get; private set; }
+
+ ///
+ /// Gets list of provisioning issues, if any
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "provisioningIssues")]
+ public System.Collections.Generic.IList ProvisioningIssues {get; private set; }
+
+ ///
+ /// Gets or sets information about a network security perimeter (NSP)
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "networkSecurityPerimeter")]
+ public NetworkSecurityPerimeter NetworkSecurityPerimeter {get; set; }
+
+ ///
+ /// Gets or sets information about resource association
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "resourceAssociation")]
+ public ResourceAssociation ResourceAssociation {get; set; }
+
+ ///
+ /// Gets or sets network security perimeter configuration profile
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "profile")]
+ public NetworkSecurityProfile Profile {get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkSecurityPerimeterConfigurationProvisioningState.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkSecurityPerimeterConfigurationProvisioningState.cs
new file mode 100644
index 000000000000..983ab2758ba9
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkSecurityPerimeterConfigurationProvisioningState.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+
+ ///
+ /// Defines values for NetworkSecurityPerimeterConfigurationProvisioningState.
+ ///
+
+
+ public static class NetworkSecurityPerimeterConfigurationProvisioningState
+ {
+ public const string Succeeded = "Succeeded";
+ public const string Creating = "Creating";
+ public const string Updating = "Updating";
+ public const string Deleting = "Deleting";
+ public const string Accepted = "Accepted";
+ public const string Failed = "Failed";
+ public const string Canceled = "Canceled";
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkSecurityPerimeterReconcileConfigurationHeaders.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkSecurityPerimeterReconcileConfigurationHeaders.cs
new file mode 100644
index 000000000000..460063e8e070
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkSecurityPerimeterReconcileConfigurationHeaders.cs
@@ -0,0 +1,55 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ public partial class NetworkSecurityPerimeterReconcileConfigurationHeaders
+ {
+ ///
+ /// Initializes a new instance of the NetworkSecurityPerimeterReconcileConfigurationHeaders class.
+ ///
+ public NetworkSecurityPerimeterReconcileConfigurationHeaders()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the NetworkSecurityPerimeterReconcileConfigurationHeaders class.
+ ///
+
+ ///
+ ///
+
+ ///
+ ///
+ public NetworkSecurityPerimeterReconcileConfigurationHeaders(string location = default(string), int? retryAfter = default(int?))
+
+ {
+ this.Location = location;
+ this.RetryAfter = retryAfter;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "Location")]
+ public string Location {get; set; }
+
+ ///
+ /// Gets or sets
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "Retry-After")]
+ public int? RetryAfter {get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkSecurityProfile.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkSecurityProfile.cs
new file mode 100644
index 000000000000..ef326f14f54e
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/NetworkSecurityProfile.cs
@@ -0,0 +1,88 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// Network security perimeter configuration profile
+ ///
+ public partial class NetworkSecurityProfile
+ {
+ ///
+ /// Initializes a new instance of the NetworkSecurityProfile class.
+ ///
+ public NetworkSecurityProfile()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the NetworkSecurityProfile class.
+ ///
+
+ /// Name of the profile
+ ///
+
+ /// Current access rules version
+ ///
+
+ /// List of Access Rules
+ ///
+
+ /// Current diagnostic settings version
+ ///
+
+ /// List of log categories that are enabled
+ ///
+ public NetworkSecurityProfile(string name = default(string), int? accessRulesVersion = default(int?), System.Collections.Generic.IList accessRules = default(System.Collections.Generic.IList), int? diagnosticSettingsVersion = default(int?), System.Collections.Generic.IList enabledLogCategories = default(System.Collections.Generic.IList))
+
+ {
+ this.Name = name;
+ this.AccessRulesVersion = accessRulesVersion;
+ this.AccessRules = accessRules;
+ this.DiagnosticSettingsVersion = diagnosticSettingsVersion;
+ this.EnabledLogCategories = enabledLogCategories;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets name of the profile
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "name")]
+ public string Name {get; set; }
+
+ ///
+ /// Gets or sets current access rules version
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "accessRulesVersion")]
+ public int? AccessRulesVersion {get; set; }
+
+ ///
+ /// Gets or sets list of Access Rules
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "accessRules")]
+ public System.Collections.Generic.IList AccessRules {get; set; }
+
+ ///
+ /// Gets or sets current diagnostic settings version
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "diagnosticSettingsVersion")]
+ public int? DiagnosticSettingsVersion {get; set; }
+
+ ///
+ /// Gets or sets list of log categories that are enabled
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "enabledLogCategories")]
+ public System.Collections.Generic.IList EnabledLogCategories {get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/OSDisk.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/OSDisk.cs
index f55a582a9387..db610851e614 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/OSDisk.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/OSDisk.cs
@@ -30,10 +30,27 @@ public OSDisk()
/// Specifies the ephemeral Disk Settings for the operating system disk used by
/// the virtual machine.
///
- public OSDisk(DiffDiskSettings ephemeralOSDiskSettings = default(DiffDiskSettings))
+
+ /// The type of caching to enable for the disk.
+ /// Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+
+ ///
+ ///
+
+ /// The initial disk size in GB when creating new OS disk.
+ ///
+
+ /// Specifies whether writeAccelerator should be enabled or disabled on the
+ /// disk.
+ ///
+ public OSDisk(DiffDiskSettings ephemeralOSDiskSettings = default(DiffDiskSettings), CachingType? caching = default(CachingType?), ManagedDisk managedDisk = default(ManagedDisk), int? diskSizeGb = default(int?), bool? writeAcceleratorEnabled = default(bool?))
{
this.EphemeralOSDiskSettings = ephemeralOSDiskSettings;
+ this.Caching = caching;
+ this.ManagedDisk = managedDisk;
+ this.DiskSizeGb = diskSizeGb;
+ this.WriteAcceleratorEnabled = writeAcceleratorEnabled;
CustomInit();
}
@@ -49,5 +66,30 @@ public OSDisk()
///
[Newtonsoft.Json.JsonProperty(PropertyName = "ephemeralOSDiskSettings")]
public DiffDiskSettings EphemeralOSDiskSettings {get; set; }
+
+ ///
+ /// Gets or sets the type of caching to enable for the disk. Possible values include: 'None', 'ReadOnly', 'ReadWrite'
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "caching")]
+ public CachingType? Caching {get; set; }
+
+ ///
+ /// Gets or sets
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "managedDisk")]
+ public ManagedDisk ManagedDisk {get; set; }
+
+ ///
+ /// Gets or sets the initial disk size in GB when creating new OS disk.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "diskSizeGB")]
+ public int? DiskSizeGb {get; set; }
+
+ ///
+ /// Gets or sets specifies whether writeAccelerator should be enabled or
+ /// disabled on the disk.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "writeAcceleratorEnabled")]
+ public bool? WriteAcceleratorEnabled {get; set; }
}
}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/Pool.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/Pool.cs
index c2b8172b2761..6425c52395b5 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/Pool.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/Pool.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Azure.Management.Batch.Models
/// Contains information about a pool.
///
[Microsoft.Rest.Serialization.JsonTransformation]
- public partial class Pool : ProxyResource
+ public partial class Pool : AzureProxyResource
{
///
/// Initializes a new instance of the Pool class.
@@ -37,15 +37,16 @@ public Pool()
/// The ETag of the resource, used for concurrency statements.
///
+ /// The tags of the resource.
+ ///
+
/// The type of identity used for the Batch Pool.
///
/// Whether the pool is resizing.
/// Possible values include: 'Steady', 'Resizing', 'Stopping'
- /// Using CloudServiceConfiguration specifies that the nodes should be creating
- /// using Azure Cloud Services (PaaS), while VirtualMachineConfiguration uses
- /// Azure Virtual Machines (IaaS).
+ /// Deployment configuration properties.
///
/// Defines the desired size of the pool. This can either be 'fixedScale' where
@@ -62,6 +63,9 @@ public Pool()
/// to remove the start task from the pool.
///
+ /// Describes an upgrade policy - automatic, manual, or rolling.
+ ///
+
/// The display name need not be unique and can contain any Unicode characters
/// up to a maximum length of 1024.
///
@@ -83,17 +87,8 @@ public Pool()
/// The time at which the pool entered its current allocation state.
///
- /// 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. 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/).
+ /// For information about available VM sizes, see Sizes for Virtual Machines in
+ /// Azure (https://learn.microsoft.com/azure/virtual-machines/sizes/overview).
/// Batch supports all Azure VM sizes except STANDARD_A0 and those with premium
/// storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series).
///
@@ -166,9 +161,9 @@ public Pool()
/// Determines how a pool communicates with the Batch service.
/// Possible values include: 'Default', 'Classic', 'Simplified'
- public Pool(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), BatchPoolIdentity identity = default(BatchPoolIdentity), AllocationState? allocationState = default(AllocationState?), DeploymentConfiguration deploymentConfiguration = default(DeploymentConfiguration), ScaleSettings scaleSettings = default(ScaleSettings), NetworkConfiguration networkConfiguration = default(NetworkConfiguration), StartTask startTask = default(StartTask), 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?), System.DateTime? allocationStateTransitionTime = default(System.DateTime?), string vmSize = default(string), int? currentDedicatedNodes = default(int?), int? currentLowPriorityNodes = default(int?), AutoScaleRun autoScaleRun = default(AutoScaleRun), InterNodeCommunicationState? interNodeCommunication = default(InterNodeCommunicationState?), int? taskSlotsPerNode = default(int?), TaskSchedulingPolicy taskSchedulingPolicy = default(TaskSchedulingPolicy), System.Collections.Generic.IList userAccounts = default(System.Collections.Generic.IList), System.Collections.Generic.IList metadata = default(System.Collections.Generic.IList), System.Collections.Generic.IList certificates = default(System.Collections.Generic.IList), System.Collections.Generic.IList applicationPackages = default(System.Collections.Generic.IList), System.Collections.Generic.IList applicationLicenses = default(System.Collections.Generic.IList), ResizeOperationStatus resizeOperationStatus = default(ResizeOperationStatus), System.Collections.Generic.IList mountConfiguration = default(System.Collections.Generic.IList), NodeCommunicationMode? targetNodeCommunicationMode = default(NodeCommunicationMode?), NodeCommunicationMode? currentNodeCommunicationMode = default(NodeCommunicationMode?))
+ public Pool(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), System.Collections.Generic.IDictionary tags = default(System.Collections.Generic.IDictionary), BatchPoolIdentity identity = default(BatchPoolIdentity), AllocationState? allocationState = default(AllocationState?), DeploymentConfiguration deploymentConfiguration = default(DeploymentConfiguration), ScaleSettings scaleSettings = default(ScaleSettings), NetworkConfiguration networkConfiguration = default(NetworkConfiguration), StartTask startTask = default(StartTask), UpgradePolicy upgradePolicy = default(UpgradePolicy), 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?), System.DateTime? allocationStateTransitionTime = default(System.DateTime?), string vmSize = default(string), int? currentDedicatedNodes = default(int?), int? currentLowPriorityNodes = default(int?), AutoScaleRun autoScaleRun = default(AutoScaleRun), InterNodeCommunicationState? interNodeCommunication = default(InterNodeCommunicationState?), int? taskSlotsPerNode = default(int?), TaskSchedulingPolicy taskSchedulingPolicy = default(TaskSchedulingPolicy), System.Collections.Generic.IList userAccounts = default(System.Collections.Generic.IList), System.Collections.Generic.IList metadata = default(System.Collections.Generic.IList), System.Collections.Generic.IList certificates = default(System.Collections.Generic.IList), System.Collections.Generic.IList applicationPackages = default(System.Collections.Generic.IList), System.Collections.Generic.IList applicationLicenses = default(System.Collections.Generic.IList), ResizeOperationStatus resizeOperationStatus = default(ResizeOperationStatus), System.Collections.Generic.IList mountConfiguration = default(System.Collections.Generic.IList), NodeCommunicationMode? targetNodeCommunicationMode = default(NodeCommunicationMode?), NodeCommunicationMode? currentNodeCommunicationMode = default(NodeCommunicationMode?))
- : base(id, name, type, etag)
+ : base(id, name, type, etag, tags)
{
this.Identity = identity;
this.AllocationState = allocationState;
@@ -176,6 +171,7 @@ public Pool()
this.ScaleSettings = scaleSettings;
this.NetworkConfiguration = networkConfiguration;
this.StartTask = startTask;
+ this.UpgradePolicy = upgradePolicy;
this.DisplayName = displayName;
this.LastModified = lastModified;
this.CreationTime = creationTime;
@@ -220,9 +216,7 @@ public Pool()
public AllocationState? AllocationState {get; private set; }
///
- /// Gets or sets using CloudServiceConfiguration specifies that the nodes
- /// should be creating using Azure Cloud Services (PaaS), while
- /// VirtualMachineConfiguration uses Azure Virtual Machines (IaaS).
+ /// Gets or sets deployment configuration properties.
///
[Newtonsoft.Json.JsonProperty(PropertyName = "properties.deploymentConfiguration")]
public DeploymentConfiguration DeploymentConfiguration {get; set; }
@@ -250,6 +244,12 @@ public Pool()
[Newtonsoft.Json.JsonProperty(PropertyName = "properties.startTask")]
public StartTask StartTask {get; set; }
+ ///
+ /// Gets or sets describes an upgrade policy - automatic, manual, or rolling.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "properties.upgradePolicy")]
+ public UpgradePolicy UpgradePolicy {get; set; }
+
///
/// Gets or sets the display name need not be unique and can contain any
/// Unicode characters up to a maximum length of 1024.
@@ -290,18 +290,10 @@ public Pool()
public System.DateTime? AllocationStateTransitionTime {get; private set; }
///
- /// Gets or sets 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. 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
+ /// Gets or sets for information about available VM sizes, see Sizes for
+ /// Virtual Machines in Azure
+ /// (https://learn.microsoft.com/azure/virtual-machines/sizes/overview). Batch
+ /// supports all Azure VM sizes except STANDARD_A0 and those with premium
/// storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series).
///
[Newtonsoft.Json.JsonProperty(PropertyName = "properties.vmSize")]
@@ -421,6 +413,7 @@ public Pool()
///
[Newtonsoft.Json.JsonProperty(PropertyName = "properties.currentNodeCommunicationMode")]
public NodeCommunicationMode? CurrentNodeCommunicationMode {get; private set; }
+
///
/// Validate the object.
///
@@ -450,6 +443,10 @@ public virtual void Validate()
{
this.StartTask.Validate();
}
+ if (this.UpgradePolicy != null)
+ {
+ this.UpgradePolicy.Validate();
+ }
@@ -516,6 +513,7 @@ public virtual void Validate()
}
+
}
}
}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/PoolProperties.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/PoolProperties.cs
index ca5e18f1baa5..fbfd3b993f9b 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/PoolProperties.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/PoolProperties.cs
@@ -48,24 +48,13 @@ public PoolProperties()
/// The time at which the pool entered its current allocation state.
///
- /// 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. 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/).
+ /// For information about available VM sizes, see Sizes for Virtual Machines in
+ /// Azure (https://learn.microsoft.com/azure/virtual-machines/sizes/overview).
/// Batch supports all Azure VM sizes except STANDARD_A0 and those with premium
/// storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series).
///
- /// Using CloudServiceConfiguration specifies that the nodes should be creating
- /// using Azure Cloud Services (PaaS), while VirtualMachineConfiguration uses
- /// Azure Virtual Machines (IaaS).
+ /// Deployment configuration properties.
///
/// The number of dedicated compute nodes currently in the pool.
@@ -150,7 +139,10 @@ public PoolProperties()
/// Determines how a pool communicates with the Batch service.
/// Possible values include: 'Default', 'Classic', 'Simplified'
- public PoolProperties(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), System.Collections.Generic.IList userAccounts = default(System.Collections.Generic.IList), System.Collections.Generic.IList metadata = default(System.Collections.Generic.IList), StartTask startTask = default(StartTask), System.Collections.Generic.IList certificates = default(System.Collections.Generic.IList), System.Collections.Generic.IList applicationPackages = default(System.Collections.Generic.IList), System.Collections.Generic.IList applicationLicenses = default(System.Collections.Generic.IList), ResizeOperationStatus resizeOperationStatus = default(ResizeOperationStatus), System.Collections.Generic.IList mountConfiguration = default(System.Collections.Generic.IList), NodeCommunicationMode? targetNodeCommunicationMode = default(NodeCommunicationMode?), NodeCommunicationMode? currentNodeCommunicationMode = default(NodeCommunicationMode?))
+
+ /// Describes an upgrade policy - automatic, manual, or rolling.
+ ///
+ public PoolProperties(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), System.Collections.Generic.IList userAccounts = default(System.Collections.Generic.IList), System.Collections.Generic.IList metadata = default(System.Collections.Generic.IList), StartTask startTask = default(StartTask), System.Collections.Generic.IList certificates = default(System.Collections.Generic.IList), System.Collections.Generic.IList applicationPackages = default(System.Collections.Generic.IList), System.Collections.Generic.IList applicationLicenses = default(System.Collections.Generic.IList), ResizeOperationStatus resizeOperationStatus = default(ResizeOperationStatus), System.Collections.Generic.IList mountConfiguration = default(System.Collections.Generic.IList), NodeCommunicationMode? targetNodeCommunicationMode = default(NodeCommunicationMode?), NodeCommunicationMode? currentNodeCommunicationMode = default(NodeCommunicationMode?), UpgradePolicy upgradePolicy = default(UpgradePolicy))
{
this.DisplayName = displayName;
@@ -180,6 +172,7 @@ public PoolProperties()
this.MountConfiguration = mountConfiguration;
this.TargetNodeCommunicationMode = targetNodeCommunicationMode;
this.CurrentNodeCommunicationMode = currentNodeCommunicationMode;
+ this.UpgradePolicy = upgradePolicy;
CustomInit();
}
@@ -235,27 +228,17 @@ public PoolProperties()
public System.DateTime? AllocationStateTransitionTime {get; private set; }
///
- /// Gets or sets 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. 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
+ /// Gets or sets for information about available VM sizes, see Sizes for
+ /// Virtual Machines in Azure
+ /// (https://learn.microsoft.com/azure/virtual-machines/sizes/overview). Batch
+ /// supports all Azure VM sizes except STANDARD_A0 and those with premium
/// storage (STANDARD_GS, STANDARD_DS, and STANDARD_DSV2 series).
///
[Newtonsoft.Json.JsonProperty(PropertyName = "vmSize")]
public string VMSize {get; set; }
///
- /// Gets or sets using CloudServiceConfiguration specifies that the nodes
- /// should be creating using Azure Cloud Services (PaaS), while
- /// VirtualMachineConfiguration uses Azure Virtual Machines (IaaS).
+ /// Gets or sets deployment configuration properties.
///
[Newtonsoft.Json.JsonProperty(PropertyName = "deploymentConfiguration")]
public DeploymentConfiguration DeploymentConfiguration {get; set; }
@@ -397,6 +380,13 @@ public PoolProperties()
///
[Newtonsoft.Json.JsonProperty(PropertyName = "currentNodeCommunicationMode")]
public NodeCommunicationMode? CurrentNodeCommunicationMode {get; private set; }
+
+ ///
+ /// Gets or sets describes an upgrade policy - automatic, manual, or rolling.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "upgradePolicy")]
+ public UpgradePolicy UpgradePolicy {get; set; }
+
///
/// Validate the object.
///
@@ -488,6 +478,11 @@ public virtual void Validate()
}
+ if (this.UpgradePolicy != null)
+ {
+ this.UpgradePolicy.Validate();
+ }
+
}
}
}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/PrivateEndpointConnection.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/PrivateEndpointConnection.cs
index 4d64a0b175fd..5577ba145701 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/PrivateEndpointConnection.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/PrivateEndpointConnection.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Azure.Management.Batch.Models
/// Contains information about a private link resource.
///
[Microsoft.Rest.Serialization.JsonTransformation]
- public partial class PrivateEndpointConnection : ProxyResource
+ public partial class PrivateEndpointConnection : AzureProxyResource
{
///
/// Initializes a new instance of the PrivateEndpointConnection class.
@@ -37,6 +37,9 @@ public PrivateEndpointConnection()
/// The ETag of the resource, used for concurrency statements.
///
+ /// The tags of the resource.
+ ///
+
/// The private endpoint of the private endpoint connection.
///
@@ -50,9 +53,9 @@ public PrivateEndpointConnection()
/// The private link service connection state of the private endpoint
/// connection
///
- public PrivateEndpointConnection(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), PrivateEndpoint privateEndpoint = default(PrivateEndpoint), PrivateEndpointConnectionProvisioningState provisioningState = default(PrivateEndpointConnectionProvisioningState), System.Collections.Generic.IList groupIds = default(System.Collections.Generic.IList), PrivateLinkServiceConnectionState privateLinkServiceConnectionState = default(PrivateLinkServiceConnectionState))
+ public PrivateEndpointConnection(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), System.Collections.Generic.IDictionary tags = default(System.Collections.Generic.IDictionary), PrivateEndpoint privateEndpoint = default(PrivateEndpoint), PrivateEndpointConnectionProvisioningState provisioningState = default(PrivateEndpointConnectionProvisioningState), System.Collections.Generic.IList groupIds = default(System.Collections.Generic.IList), PrivateLinkServiceConnectionState privateLinkServiceConnectionState = default(PrivateLinkServiceConnectionState))
- : base(id, name, type, etag)
+ : base(id, name, type, etag, tags)
{
this.PrivateEndpoint = privateEndpoint;
this.ProvisioningState = provisioningState;
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/PrivateLinkResource.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/PrivateLinkResource.cs
index d4a5fd1a64fc..4a98efcdd566 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/PrivateLinkResource.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/PrivateLinkResource.cs
@@ -11,7 +11,7 @@ namespace Microsoft.Azure.Management.Batch.Models
/// Contains information about a private link resource.
///
[Microsoft.Rest.Serialization.JsonTransformation]
- public partial class PrivateLinkResource : ProxyResource
+ public partial class PrivateLinkResource : AzureProxyResource
{
///
/// Initializes a new instance of the PrivateLinkResource class.
@@ -37,6 +37,9 @@ public PrivateLinkResource()
/// The ETag of the resource, used for concurrency statements.
///
+ /// The tags of the resource.
+ ///
+
/// The group id is used to establish the private link connection.
///
@@ -46,9 +49,9 @@ public PrivateLinkResource()
/// The list of required zone names for the private DNS resource name
///
- public PrivateLinkResource(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), string groupId = default(string), System.Collections.Generic.IList requiredMembers = default(System.Collections.Generic.IList), System.Collections.Generic.IList requiredZoneNames = default(System.Collections.Generic.IList))
+ public PrivateLinkResource(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), System.Collections.Generic.IDictionary tags = default(System.Collections.Generic.IDictionary), string groupId = default(string), System.Collections.Generic.IList requiredMembers = default(System.Collections.Generic.IList), System.Collections.Generic.IList requiredZoneNames = default(System.Collections.Generic.IList))
- : base(id, name, type, etag)
+ : base(id, name, type, etag, tags)
{
this.GroupId = groupId;
this.RequiredMembers = requiredMembers;
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/ProvisioningIssue.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/ProvisioningIssue.cs
new file mode 100644
index 000000000000..6b2df0c005d2
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/ProvisioningIssue.cs
@@ -0,0 +1,67 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// Describes a provisioning issue for a network security perimeter
+ /// configuration
+ ///
+ public partial class ProvisioningIssue
+ {
+ ///
+ /// Initializes a new instance of the ProvisioningIssue class.
+ ///
+ public ProvisioningIssue()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the ProvisioningIssue class.
+ ///
+
+ /// Name of the issue
+ ///
+
+ /// Details of a provisioning issue for a network security perimeter (NSP)
+ /// configuration. Resource providers should generate separate provisioning
+ /// issue elements for each separate issue detected, and include a meaningful
+ /// and distinctive description, as well as any appropriate
+ /// suggestedResourceIds and suggestedAccessRules
+ ///
+ public ProvisioningIssue(string name = default(string), ProvisioningIssueProperties properties = default(ProvisioningIssueProperties))
+
+ {
+ this.Name = name;
+ this.Properties = properties;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets name of the issue
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "name")]
+ public string Name {get; private set; }
+
+ ///
+ /// Gets details of a provisioning issue for a network security perimeter (NSP)
+ /// configuration. Resource providers should generate separate provisioning
+ /// issue elements for each separate issue detected, and include a meaningful
+ /// and distinctive description, as well as any appropriate
+ /// suggestedResourceIds and suggestedAccessRules
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "properties")]
+ public ProvisioningIssueProperties Properties {get; private set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/ProvisioningIssueProperties.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/ProvisioningIssueProperties.cs
new file mode 100644
index 000000000000..f488d64e66f7
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/ProvisioningIssueProperties.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// Details of a provisioning issue for a network security perimeter (NSP)
+ /// configuration. Resource providers should generate separate provisioning
+ /// issue elements for each separate issue detected, and include a meaningful
+ /// and distinctive description, as well as any appropriate
+ /// suggestedResourceIds and suggestedAccessRules
+ ///
+ public partial class ProvisioningIssueProperties
+ {
+ ///
+ /// Initializes a new instance of the ProvisioningIssueProperties class.
+ ///
+ public ProvisioningIssueProperties()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the ProvisioningIssueProperties class.
+ ///
+
+ /// Type of issue
+ /// Possible values include: 'Unknown', 'ConfigurationPropagationFailure',
+ /// 'MissingPerimeterConfiguration', 'MissingIdentityConfiguration'
+
+ /// Severity of the issue.
+ /// Possible values include: 'Warning', 'Error'
+
+ /// Description of the issue
+ ///
+
+ /// Fully qualified resource IDs of suggested resources that can be associated
+ /// to the network security perimeter (NSP) to remediate the issue.
+ ///
+
+ /// Access rules that can be added to the network security profile (NSP) to
+ /// remediate the issue.
+ ///
+ public ProvisioningIssueProperties(string issueType = default(string), string severity = default(string), string description = default(string), System.Collections.Generic.IList suggestedResourceIds = default(System.Collections.Generic.IList), System.Collections.Generic.IList suggestedAccessRules = default(System.Collections.Generic.IList))
+
+ {
+ this.IssueType = issueType;
+ this.Severity = severity;
+ this.Description = description;
+ this.SuggestedResourceIds = suggestedResourceIds;
+ this.SuggestedAccessRules = suggestedAccessRules;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets type of issue Possible values include: 'Unknown', 'ConfigurationPropagationFailure', 'MissingPerimeterConfiguration', 'MissingIdentityConfiguration'
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "issueType")]
+ public string IssueType {get; private set; }
+
+ ///
+ /// Gets severity of the issue. Possible values include: 'Warning', 'Error'
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "severity")]
+ public string Severity {get; private set; }
+
+ ///
+ /// Gets description of the issue
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "description")]
+ public string Description {get; private set; }
+
+ ///
+ /// Gets fully qualified resource IDs of suggested resources that can be
+ /// associated to the network security perimeter (NSP) to remediate the issue.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "suggestedResourceIds")]
+ public System.Collections.Generic.IList SuggestedResourceIds {get; private set; }
+
+ ///
+ /// Gets access rules that can be added to the network security profile (NSP)
+ /// to remediate the issue.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "suggestedAccessRules")]
+ public System.Collections.Generic.IList SuggestedAccessRules {get; private set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/ProxyResource.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/ProxyResource.cs
index e7f09870da88..ab83fa5d6336 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/ProxyResource.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/ProxyResource.cs
@@ -8,9 +8,14 @@ namespace Microsoft.Azure.Management.Batch.Models
using System.Linq;
///
- /// A definition of an Azure resource.
+ /// The resource model definition for a Azure Resource Manager proxy resource.
+ /// It will not have tags and a location
///
- public partial class ProxyResource : Microsoft.Rest.Azure.IResource
+ ///
+ /// The resource model definition for a Azure Resource Manager proxy resource.
+ /// It will not have tags and a location
+ ///
+ public partial class ProxyResource : Resource
{
///
/// Initializes a new instance of the ProxyResource class.
@@ -24,24 +29,24 @@ public ProxyResource()
/// Initializes a new instance of the ProxyResource class.
///
- /// The ID of the resource.
+ /// Fully qualified resource ID for the resource. E.g.
+ /// "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}"
///
- /// The name of the resource.
+ /// The name of the resource
///
- /// The type of the resource.
+ /// The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+ /// "Microsoft.Storage/storageAccounts"
///
- /// The ETag of the resource, used for concurrency statements.
+ /// Azure Resource Manager metadata containing createdBy and modifiedBy
+ /// information.
///
- public ProxyResource(string id = default(string), string name = default(string), string type = default(string), string etag = default(string))
+ public ProxyResource(string id = default(string), string name = default(string), string type = default(string), SystemData systemData = default(SystemData))
+ : base(id, name, type, systemData)
{
- this.Id = id;
- this.Name = name;
- this.Type = type;
- this.Etag = etag;
CustomInit();
}
@@ -50,29 +55,5 @@ public ProxyResource()
///
partial void CustomInit();
-
- ///
- /// Gets the ID of the resource.
- ///
- [Newtonsoft.Json.JsonProperty(PropertyName = "id")]
- public string Id {get; private set; }
-
- ///
- /// Gets the name of the resource.
- ///
- [Newtonsoft.Json.JsonProperty(PropertyName = "name")]
- public string Name {get; private set; }
-
- ///
- /// Gets the type of the resource.
- ///
- [Newtonsoft.Json.JsonProperty(PropertyName = "type")]
- public string Type {get; private set; }
-
- ///
- /// Gets the ETag of the resource, used for concurrency statements.
- ///
- [Newtonsoft.Json.JsonProperty(PropertyName = "etag")]
- public string Etag {get; private set; }
}
}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/PublicNetworkAccessType.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/PublicNetworkAccessType.cs
index b5ad2a4843e6..6a9b3b1839c8 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/PublicNetworkAccessType.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/PublicNetworkAccessType.cs
@@ -24,7 +24,12 @@ public enum PublicNetworkAccessType
/// Batch Service through private endpoint resource.
///
[System.Runtime.Serialization.EnumMember(Value = "Disabled")]
- Disabled
+ Disabled,
+ ///
+ /// Secures connectivity to Azure Batch through NSP configuration.
+ ///
+ [System.Runtime.Serialization.EnumMember(Value = "SecuredByPerimeter")]
+ SecuredByPerimeter
}
internal static class PublicNetworkAccessTypeEnumExtension
{
@@ -40,6 +45,8 @@ internal static string ToSerializedValue(this PublicNetworkAccessType value)
return "Enabled";
case PublicNetworkAccessType.Disabled:
return "Disabled";
+ case PublicNetworkAccessType.SecuredByPerimeter:
+ return "SecuredByPerimeter";
}
return null;
}
@@ -51,6 +58,8 @@ internal static string ToSerializedValue(this PublicNetworkAccessType value)
return PublicNetworkAccessType.Enabled;
case "Disabled":
return PublicNetworkAccessType.Disabled;
+ case "SecuredByPerimeter":
+ return PublicNetworkAccessType.SecuredByPerimeter;
}
return null;
}
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/Resource.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/Resource.cs
index 25175ff79f3c..180289d8e4f4 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/Resource.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/Resource.cs
@@ -8,8 +8,13 @@ namespace Microsoft.Azure.Management.Batch.Models
using System.Linq;
///
- /// A definition of an Azure resource.
+ /// Common fields that are returned in the response for all Azure Resource
+ /// Manager resources
///
+ ///
+ /// Common fields that are returned in the response for all Azure Resource
+ /// Manager resources
+ ///
public partial class Resource : Microsoft.Rest.Azure.IResource
{
///
@@ -24,28 +29,27 @@ public Resource()
/// Initializes a new instance of the Resource class.
///
- /// The ID of the resource.
+ /// Fully qualified resource ID for the resource. E.g.
+ /// "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}"
///
- /// The name of the resource.
+ /// The name of the resource
///
- /// The type of the resource.
+ /// The type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+ /// "Microsoft.Storage/storageAccounts"
///
- /// The location of the resource.
+ /// Azure Resource Manager metadata containing createdBy and modifiedBy
+ /// information.
///
-
- /// The tags of the resource.
- ///
- public Resource(string id = default(string), string name = default(string), string type = default(string), string location = default(string), System.Collections.Generic.IDictionary tags = default(System.Collections.Generic.IDictionary))
+ public Resource(string id = default(string), string name = default(string), string type = default(string), SystemData systemData = default(SystemData))
{
this.Id = id;
this.Name = name;
this.Type = type;
- this.Location = location;
- this.Tags = tags;
+ this.SystemData = systemData;
CustomInit();
}
@@ -56,33 +60,30 @@ public Resource()
///
- /// Gets the ID of the resource.
+ /// Gets fully qualified resource ID for the resource. E.g.
+ /// "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{resourceProviderNamespace}/{resourceType}/{resourceName}"
///
[Newtonsoft.Json.JsonProperty(PropertyName = "id")]
public string Id {get; private set; }
///
- /// Gets the name of the resource.
+ /// Gets the name of the resource
///
[Newtonsoft.Json.JsonProperty(PropertyName = "name")]
public string Name {get; private set; }
///
- /// Gets the type of the resource.
+ /// Gets the type of the resource. E.g. "Microsoft.Compute/virtualMachines" or
+ /// "Microsoft.Storage/storageAccounts"
///
[Newtonsoft.Json.JsonProperty(PropertyName = "type")]
public string Type {get; private set; }
///
- /// Gets the location of the resource.
- ///
- [Newtonsoft.Json.JsonProperty(PropertyName = "location")]
- public string Location {get; private set; }
-
- ///
- /// Gets the tags of the resource.
+ /// Gets azure Resource Manager metadata containing createdBy and modifiedBy
+ /// information.
///
- [Newtonsoft.Json.JsonProperty(PropertyName = "tags")]
- public System.Collections.Generic.IDictionary Tags {get; private set; }
+ [Newtonsoft.Json.JsonProperty(PropertyName = "systemData")]
+ public SystemData SystemData {get; private set; }
}
}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/ResourceAssociation.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/ResourceAssociation.cs
new file mode 100644
index 000000000000..4d4f84be10e9
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/ResourceAssociation.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// Information about resource association
+ ///
+ public partial class ResourceAssociation
+ {
+ ///
+ /// Initializes a new instance of the ResourceAssociation class.
+ ///
+ public ResourceAssociation()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the ResourceAssociation class.
+ ///
+
+ /// Name of the resource association
+ ///
+
+ /// Access mode of the resource association
+ /// Possible values include: 'Enforced', 'Learning', 'Audit'
+ public ResourceAssociation(string name = default(string), string accessMode = default(string))
+
+ {
+ this.Name = name;
+ this.AccessMode = accessMode;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets name of the resource association
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "name")]
+ public string Name {get; set; }
+
+ ///
+ /// Gets or sets access mode of the resource association Possible values include: 'Enforced', 'Learning', 'Audit'
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "accessMode")]
+ public string AccessMode {get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/ResourceAssociationAccessMode.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/ResourceAssociationAccessMode.cs
new file mode 100644
index 000000000000..e907269f6851
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/ResourceAssociationAccessMode.cs
@@ -0,0 +1,32 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+
+ ///
+ /// Defines values for ResourceAssociationAccessMode.
+ ///
+
+
+ public static class ResourceAssociationAccessMode
+ {
+ ///
+ /// Enforced access mode - traffic to the resource that failed access checks is
+ /// blocked
+ ///
+ public const string Enforced = "Enforced";
+ ///
+ /// Learning access mode - traffic to the resource is enabled for analysis but
+ /// not blocked
+ ///
+ public const string Learning = "Learning";
+ ///
+ /// Audit access mode - traffic to the resource that fails access checks is
+ /// logged but not blocked
+ ///
+ public const string Audit = "Audit";
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/RollingUpgradePolicy.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/RollingUpgradePolicy.cs
new file mode 100644
index 000000000000..6bb2529b49b0
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/RollingUpgradePolicy.cs
@@ -0,0 +1,209 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// The configuration parameters used while performing a rolling upgrade.
+ ///
+ public partial class RollingUpgradePolicy
+ {
+ ///
+ /// Initializes a new instance of the RollingUpgradePolicy class.
+ ///
+ public RollingUpgradePolicy()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the RollingUpgradePolicy class.
+ ///
+
+ /// Allow VMSS to ignore AZ boundaries when constructing upgrade batches. Take
+ /// into consideration the Update Domain and maxBatchInstancePercent to
+ /// determine the batch size. If this field is not set, Azure Azure Batch will
+ /// not set its default value. The value of enableCrossZoneUpgrade on the
+ /// created VirtualMachineScaleSet will be decided by the default
+ /// configurations on VirtualMachineScaleSet. This field is able to be set to
+ /// true or false only when using NodePlacementConfiguration as Zonal.
+ ///
+
+ /// The maximum percent of total virtual machine instances that will be
+ /// upgraded simultaneously by the rolling upgrade in one batch. As this is a
+ /// maximum, unhealthy instances in previous or future batches can cause the
+ /// percentage of instances in a batch to decrease to ensure higher
+ /// reliability. The value of this field should be between 5 and 100,
+ /// inclusive. If both maxBatchInstancePercent and maxUnhealthyInstancePercent
+ /// are assigned with value, the value of maxBatchInstancePercent should not be
+ /// more than maxUnhealthyInstancePercent.
+ ///
+
+ /// The maximum percentage of the total virtual machine instances in the scale
+ /// set that can be simultaneously unhealthy, either as a result of being
+ /// upgraded, or by being found in an unhealthy state by the virtual machine
+ /// health checks before the rolling upgrade aborts. This constraint will be
+ /// checked prior to starting any batch. The value of this field should be
+ /// between 5 and 100, inclusive. If both maxBatchInstancePercent and
+ /// maxUnhealthyInstancePercent are assigned with value, the value of
+ /// maxBatchInstancePercent should not be more than
+ /// maxUnhealthyInstancePercent.
+ ///
+
+ /// The maximum percentage of upgraded virtual machine instances that can be
+ /// found to be in an unhealthy state. This check will happen after each batch
+ /// is upgraded. If this percentage is ever exceeded, the rolling update
+ /// aborts. The value of this field should be between 0 and 100, inclusive.
+ ///
+
+ /// The wait time between completing the update for all virtual machines in one
+ /// batch and starting the next batch. The time duration should be specified in
+ /// ISO 8601 format.
+ ///
+
+ /// Upgrade all unhealthy instances in a scale set before any healthy
+ /// instances.
+ ///
+
+ /// Rollback failed instances to previous model if the Rolling Upgrade policy
+ /// is violated.
+ ///
+ public RollingUpgradePolicy(bool? enableCrossZoneUpgrade = default(bool?), int? maxBatchInstancePercent = default(int?), int? maxUnhealthyInstancePercent = default(int?), int? maxUnhealthyUpgradedInstancePercent = default(int?), string pauseTimeBetweenBatches = default(string), bool? prioritizeUnhealthyInstances = default(bool?), bool? rollbackFailedInstancesOnPolicyBreach = default(bool?))
+
+ {
+ this.EnableCrossZoneUpgrade = enableCrossZoneUpgrade;
+ this.MaxBatchInstancePercent = maxBatchInstancePercent;
+ this.MaxUnhealthyInstancePercent = maxUnhealthyInstancePercent;
+ this.MaxUnhealthyUpgradedInstancePercent = maxUnhealthyUpgradedInstancePercent;
+ this.PauseTimeBetweenBatches = pauseTimeBetweenBatches;
+ this.PrioritizeUnhealthyInstances = prioritizeUnhealthyInstances;
+ this.RollbackFailedInstancesOnPolicyBreach = rollbackFailedInstancesOnPolicyBreach;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets allow VMSS to ignore AZ boundaries when constructing upgrade
+ /// batches. Take into consideration the Update Domain and
+ /// maxBatchInstancePercent to determine the batch size. If this field is not
+ /// set, Azure Azure Batch will not set its default value. The value of
+ /// enableCrossZoneUpgrade on the created VirtualMachineScaleSet will be
+ /// decided by the default configurations on VirtualMachineScaleSet. This field
+ /// is able to be set to true or false only when using
+ /// NodePlacementConfiguration as Zonal.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "enableCrossZoneUpgrade")]
+ public bool? EnableCrossZoneUpgrade {get; set; }
+
+ ///
+ /// Gets or sets the maximum percent of total virtual machine instances that
+ /// will be upgraded simultaneously by the rolling upgrade in one batch. As
+ /// this is a maximum, unhealthy instances in previous or future batches can
+ /// cause the percentage of instances in a batch to decrease to ensure higher
+ /// reliability. The value of this field should be between 5 and 100,
+ /// inclusive. If both maxBatchInstancePercent and maxUnhealthyInstancePercent
+ /// are assigned with value, the value of maxBatchInstancePercent should not be
+ /// more than maxUnhealthyInstancePercent.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "maxBatchInstancePercent")]
+ public int? MaxBatchInstancePercent {get; set; }
+
+ ///
+ /// Gets or sets the maximum percentage of the total virtual machine instances
+ /// in the scale set that can be simultaneously unhealthy, either as a result
+ /// of being upgraded, or by being found in an unhealthy state by the virtual
+ /// machine health checks before the rolling upgrade aborts. This constraint
+ /// will be checked prior to starting any batch. The value of this field should
+ /// be between 5 and 100, inclusive. If both maxBatchInstancePercent and
+ /// maxUnhealthyInstancePercent are assigned with value, the value of
+ /// maxBatchInstancePercent should not be more than
+ /// maxUnhealthyInstancePercent.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "maxUnhealthyInstancePercent")]
+ public int? MaxUnhealthyInstancePercent {get; set; }
+
+ ///
+ /// Gets or sets the maximum percentage of upgraded virtual machine instances
+ /// that can be found to be in an unhealthy state. This check will happen after
+ /// each batch is upgraded. If this percentage is ever exceeded, the rolling
+ /// update aborts. The value of this field should be between 0 and 100,
+ /// inclusive.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "maxUnhealthyUpgradedInstancePercent")]
+ public int? MaxUnhealthyUpgradedInstancePercent {get; set; }
+
+ ///
+ /// Gets or sets the wait time between completing the update for all virtual
+ /// machines in one batch and starting the next batch. The time duration should
+ /// be specified in ISO 8601 format.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "pauseTimeBetweenBatches")]
+ public string PauseTimeBetweenBatches {get; set; }
+
+ ///
+ /// Gets or sets upgrade all unhealthy instances in a scale set before any
+ /// healthy instances.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "prioritizeUnhealthyInstances")]
+ public bool? PrioritizeUnhealthyInstances {get; set; }
+
+ ///
+ /// Gets or sets rollback failed instances to previous model if the Rolling
+ /// Upgrade policy is violated.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "rollbackFailedInstancesOnPolicyBreach")]
+ public bool? RollbackFailedInstancesOnPolicyBreach {get; set; }
+ ///
+ /// Validate the object.
+ ///
+ ///
+ /// Thrown if validation fails
+ ///
+ public virtual void Validate()
+ {
+ if (this.MaxBatchInstancePercent != null)
+ {
+ if (this.MaxBatchInstancePercent > 100)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.InclusiveMaximum, "MaxBatchInstancePercent", 100);
+ }
+ if (this.MaxBatchInstancePercent < 5)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.InclusiveMinimum, "MaxBatchInstancePercent", 5);
+ }
+ }
+ if (this.MaxUnhealthyInstancePercent != null)
+ {
+ if (this.MaxUnhealthyInstancePercent > 100)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.InclusiveMaximum, "MaxUnhealthyInstancePercent", 100);
+ }
+ if (this.MaxUnhealthyInstancePercent < 5)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.InclusiveMinimum, "MaxUnhealthyInstancePercent", 5);
+ }
+ }
+ if (this.MaxUnhealthyUpgradedInstancePercent != null)
+ {
+ if (this.MaxUnhealthyUpgradedInstancePercent > 100)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.InclusiveMaximum, "MaxUnhealthyUpgradedInstancePercent", 100);
+ }
+ if (this.MaxUnhealthyUpgradedInstancePercent < 0)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.InclusiveMinimum, "MaxUnhealthyUpgradedInstancePercent", 0);
+ }
+ }
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/SecurityEncryptionTypes.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/SecurityEncryptionTypes.cs
new file mode 100644
index 000000000000..f0e77ece1f69
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/SecurityEncryptionTypes.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+
+ ///
+ /// Defines values for SecurityEncryptionTypes.
+ ///
+
+
+ public static class SecurityEncryptionTypes
+ {
+ public const string NonPersistedTPM = "NonPersistedTPM";
+ public const string VMGuestStateOnly = "VMGuestStateOnly";
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/SecurityProfile.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/SecurityProfile.cs
new file mode 100644
index 000000000000..682fb4443df2
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/SecurityProfile.cs
@@ -0,0 +1,79 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// Specifies the security profile settings for the virtual machine or virtual
+ /// machine scale set.
+ ///
+ public partial class SecurityProfile
+ {
+ ///
+ /// Initializes a new instance of the SecurityProfile class.
+ ///
+ public SecurityProfile()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the SecurityProfile class.
+ ///
+
+ /// Specifies the SecurityType of the virtual machine. It has to be set to any
+ /// specified value to enable UefiSettings.
+ /// Possible values include: 'trustedLaunch', 'confidentialVM'
+
+ /// This property can be used by user in the request to enable or disable the
+ /// Host Encryption for the virtual machine or virtual machine scale set. This
+ /// will enable the encryption for all the disks including Resource/Temp disk
+ /// at host itself.
+ ///
+
+ /// Specifies the security settings like secure boot and vTPM used while
+ /// creating the virtual machine.
+ ///
+ public SecurityProfile(SecurityTypes? securityType = default(SecurityTypes?), bool? encryptionAtHost = default(bool?), UefiSettings uefiSettings = default(UefiSettings))
+
+ {
+ this.SecurityType = securityType;
+ this.EncryptionAtHost = encryptionAtHost;
+ this.UefiSettings = uefiSettings;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets specifies the SecurityType of the virtual machine. It has to
+ /// be set to any specified value to enable UefiSettings. Possible values include: 'trustedLaunch', 'confidentialVM'
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "securityType")]
+ public SecurityTypes? SecurityType {get; set; }
+
+ ///
+ /// Gets or sets this property can be used by user in the request to enable or
+ /// disable the Host Encryption for the virtual machine or virtual machine
+ /// scale set. This will enable the encryption for all the disks including
+ /// Resource/Temp disk at host itself.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "encryptionAtHost")]
+ public bool? EncryptionAtHost {get; set; }
+
+ ///
+ /// Gets or sets specifies the security settings like secure boot and vTPM used
+ /// while creating the virtual machine.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "uefiSettings")]
+ public UefiSettings UefiSettings {get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/SecurityTypes.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/SecurityTypes.cs
new file mode 100644
index 000000000000..4e7aad8c9ca1
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/SecurityTypes.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+
+ ///
+ /// Defines values for SecurityTypes.
+ ///
+
+
+ [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
+ public enum SecurityTypes
+ {
+ ///
+ /// Trusted launch protects against advanced and persistent attack techniques.
+ ///
+ [System.Runtime.Serialization.EnumMember(Value = "trustedLaunch")]
+ TrustedLaunch,
+ ///
+ /// Azure confidential computing offers confidential VMs are for tenants with
+ /// high security and confidentiality requirements. These VMs provide a strong,
+ /// hardware-enforced boundary to help meet your security needs. You can use
+ /// confidential VMs for migrations without making changes to your code, with
+ /// the platform protecting your VM's state from being read or modified.
+ ///
+ [System.Runtime.Serialization.EnumMember(Value = "confidentialVM")]
+ ConfidentialVM
+ }
+ internal static class SecurityTypesEnumExtension
+ {
+ internal static string ToSerializedValue(this SecurityTypes? value)
+ {
+ return value == null ? null : ((SecurityTypes)value).ToSerializedValue();
+ }
+ internal static string ToSerializedValue(this SecurityTypes value)
+ {
+ switch( value )
+ {
+ case SecurityTypes.TrustedLaunch:
+ return "trustedLaunch";
+ case SecurityTypes.ConfidentialVM:
+ return "confidentialVM";
+ }
+ return null;
+ }
+ internal static SecurityTypes? ParseSecurityTypes(this string value)
+ {
+ switch( value )
+ {
+ case "trustedLaunch":
+ return SecurityTypes.TrustedLaunch;
+ case "confidentialVM":
+ return SecurityTypes.ConfidentialVM;
+ }
+ return null;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/ServiceArtifactReference.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/ServiceArtifactReference.cs
new file mode 100644
index 000000000000..f6e8be8b61d1
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/ServiceArtifactReference.cs
@@ -0,0 +1,66 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// Specifies the service artifact reference id used to set same image version
+ /// for all virtual machines in the scale set when using 'latest' image
+ /// version.
+ ///
+ public partial class ServiceArtifactReference
+ {
+ ///
+ /// Initializes a new instance of the ServiceArtifactReference class.
+ ///
+ public ServiceArtifactReference()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the ServiceArtifactReference class.
+ ///
+
+ /// The service artifact reference id in the form of
+ /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/galleries/{galleryName}/serviceArtifacts/{serviceArtifactName}/vmArtifactsProfiles/{vmArtifactsProfilesName}
+ ///
+ public ServiceArtifactReference(string id)
+
+ {
+ this.Id = id;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets the service artifact reference id in the form of
+ /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/galleries/{galleryName}/serviceArtifacts/{serviceArtifactName}/vmArtifactsProfiles/{vmArtifactsProfilesName}
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "id")]
+ public string Id {get; set; }
+ ///
+ /// Validate the object.
+ ///
+ ///
+ /// Thrown if validation fails
+ ///
+ public virtual void Validate()
+ {
+ if (this.Id == null)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "Id");
+ }
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/Severity.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/Severity.cs
new file mode 100644
index 000000000000..30e4a7245e63
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/Severity.cs
@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+
+ ///
+ /// Defines values for Severity.
+ ///
+
+
+ public static class Severity
+ {
+ public const string Warning = "Warning";
+ public const string Error = "Error";
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/StartTask.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/StartTask.cs
index eaee7172f115..b86056506f62 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/StartTask.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/StartTask.cs
@@ -61,7 +61,7 @@ public StartTask()
/// if the maximum retry count is 3, Batch tries the task up to 4 times (one
/// initial try and 3 retries). If the maximum retry count is 0, the Batch
/// service does not retry the task. If the maximum retry count is -1, the
- /// Batch service retries the task without limit.
+ /// Batch service retries the task without limit. Default is 0
///
/// If true and the start task fails on a compute node, the Batch service
@@ -138,7 +138,7 @@ public StartTask()
/// example, if the maximum retry count is 3, Batch tries the task up to 4
/// times (one initial try and 3 retries). If the maximum retry count is 0, the
/// Batch service does not retry the task. If the maximum retry count is -1,
- /// the Batch service retries the task without limit.
+ /// the Batch service retries the task without limit. Default is 0
///
[Newtonsoft.Json.JsonProperty(PropertyName = "maxTaskRetryCount")]
public int? MaxTaskRetryCount {get; set; }
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/StorageAccountType.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/StorageAccountType.cs
index 599307db3e5e..eca13e513063 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/StorageAccountType.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/StorageAccountType.cs
@@ -15,15 +15,20 @@ namespace Microsoft.Azure.Management.Batch.Models
public enum StorageAccountType
{
///
- /// The data disk should use standard locally redundant storage.
+ /// The data disk / OS disk should use standard locally redundant storage.
///
[System.Runtime.Serialization.EnumMember(Value = "Standard_LRS")]
StandardLRS,
///
- /// The data disk should use premium locally redundant storage.
+ /// The data disk / OS disk should use premium locally redundant storage.
///
[System.Runtime.Serialization.EnumMember(Value = "Premium_LRS")]
- PremiumLRS
+ PremiumLRS,
+ ///
+ /// The data disk / OS disk should use standard SSD locally redundant storage.
+ ///
+ [System.Runtime.Serialization.EnumMember(Value = "StandardSSD_LRS")]
+ StandardSSDLRS
}
internal static class StorageAccountTypeEnumExtension
{
@@ -39,6 +44,8 @@ internal static string ToSerializedValue(this StorageAccountType value)
return "Standard_LRS";
case StorageAccountType.PremiumLRS:
return "Premium_LRS";
+ case StorageAccountType.StandardSSDLRS:
+ return "StandardSSD_LRS";
}
return null;
}
@@ -50,6 +57,8 @@ internal static string ToSerializedValue(this StorageAccountType value)
return StorageAccountType.StandardLRS;
case "Premium_LRS":
return StorageAccountType.PremiumLRS;
+ case "StandardSSD_LRS":
+ return StorageAccountType.StandardSSDLRS;
}
return null;
}
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/SupportedSku.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/SupportedSku.cs
index c93883d4f01f..44d43e001b00 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/SupportedSku.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/SupportedSku.cs
@@ -32,12 +32,16 @@ public SupportedSku()
/// A collection of capabilities which this SKU supports.
///
- public SupportedSku(string name = default(string), string familyName = default(string), System.Collections.Generic.IList capabilities = default(System.Collections.Generic.IList))
+
+ /// The time when Azure Batch service will retire this SKU.
+ ///
+ public SupportedSku(string name = default(string), string familyName = default(string), System.Collections.Generic.IList capabilities = default(System.Collections.Generic.IList), System.DateTime? batchSupportEndOfLife = default(System.DateTime?))
{
this.Name = name;
this.FamilyName = familyName;
this.Capabilities = capabilities;
+ this.BatchSupportEndOfLife = batchSupportEndOfLife;
CustomInit();
}
@@ -64,5 +68,11 @@ public SupportedSku()
///
[Newtonsoft.Json.JsonProperty(PropertyName = "capabilities")]
public System.Collections.Generic.IList Capabilities {get; private set; }
+
+ ///
+ /// Gets the time when Azure Batch service will retire this SKU.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "batchSupportEndOfLife")]
+ public System.DateTime? BatchSupportEndOfLife {get; private set; }
}
}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/SystemData.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/SystemData.cs
new file mode 100644
index 000000000000..abdbf6e3e228
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/SystemData.cs
@@ -0,0 +1,98 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// Metadata pertaining to creation and last modification of the resource.
+ ///
+ public partial class SystemData
+ {
+ ///
+ /// Initializes a new instance of the SystemData class.
+ ///
+ public SystemData()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the SystemData class.
+ ///
+
+ /// The identity that created the resource.
+ ///
+
+ /// The type of identity that created the resource.
+ /// Possible values include: 'User', 'Application', 'ManagedIdentity', 'Key'
+
+ /// The timestamp of resource creation (UTC).
+ ///
+
+ /// The identity that last modified the resource.
+ ///
+
+ /// The type of identity that last modified the resource.
+ /// Possible values include: 'User', 'Application', 'ManagedIdentity', 'Key'
+
+ /// The timestamp of resource last modification (UTC)
+ ///
+ public SystemData(string createdBy = default(string), string createdByType = default(string), System.DateTime? createdAt = default(System.DateTime?), string lastModifiedBy = default(string), string lastModifiedByType = default(string), System.DateTime? lastModifiedAt = default(System.DateTime?))
+
+ {
+ this.CreatedBy = createdBy;
+ this.CreatedByType = createdByType;
+ this.CreatedAt = createdAt;
+ this.LastModifiedBy = lastModifiedBy;
+ this.LastModifiedByType = lastModifiedByType;
+ this.LastModifiedAt = lastModifiedAt;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets the identity that created the resource.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "createdBy")]
+ public string CreatedBy {get; set; }
+
+ ///
+ /// Gets or sets the type of identity that created the resource. Possible values include: 'User', 'Application', 'ManagedIdentity', 'Key'
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "createdByType")]
+ public string CreatedByType {get; set; }
+
+ ///
+ /// Gets or sets the timestamp of resource creation (UTC).
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "createdAt")]
+ public System.DateTime? CreatedAt {get; set; }
+
+ ///
+ /// Gets or sets the identity that last modified the resource.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "lastModifiedBy")]
+ public string LastModifiedBy {get; set; }
+
+ ///
+ /// Gets or sets the type of identity that last modified the resource. Possible values include: 'User', 'Application', 'ManagedIdentity', 'Key'
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "lastModifiedByType")]
+ public string LastModifiedByType {get; set; }
+
+ ///
+ /// Gets or sets the timestamp of resource last modification (UTC)
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "lastModifiedAt")]
+ public System.DateTime? LastModifiedAt {get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/TaskContainerSettings.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/TaskContainerSettings.cs
index df502c074326..fd90ddbababa 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/TaskContainerSettings.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/TaskContainerSettings.cs
@@ -42,13 +42,19 @@ public TaskContainerSettings()
/// A flag to indicate where the container task working directory is. The
/// default is 'taskWorkingDirectory'.
/// Possible values include: 'TaskWorkingDirectory', 'ContainerImageDefault'
- public TaskContainerSettings(string imageName, string containerRunOptions = default(string), ContainerRegistry registry = default(ContainerRegistry), ContainerWorkingDirectory? workingDirectory = default(ContainerWorkingDirectory?))
+
+ /// If this array is null or be not present, container task will mount entire
+ /// temporary disk drive in windows (or AZ_BATCH_NODE_ROOT_DIR in Linux). It
+ /// won't' mount any data paths into container if this array is set as empty.
+ ///
+ public TaskContainerSettings(string imageName, string containerRunOptions = default(string), ContainerRegistry registry = default(ContainerRegistry), ContainerWorkingDirectory? workingDirectory = default(ContainerWorkingDirectory?), System.Collections.Generic.IList containerHostBatchBindMounts = default(System.Collections.Generic.IList))
{
this.ContainerRunOptions = containerRunOptions;
this.ImageName = imageName;
this.Registry = registry;
this.WorkingDirectory = workingDirectory;
+ this.ContainerHostBatchBindMounts = containerHostBatchBindMounts;
CustomInit();
}
@@ -87,6 +93,15 @@ public TaskContainerSettings()
///
[Newtonsoft.Json.JsonProperty(PropertyName = "workingDirectory")]
public ContainerWorkingDirectory? WorkingDirectory {get; set; }
+
+ ///
+ /// Gets or sets if this array is null or be not present, container task will
+ /// mount entire temporary disk drive in windows (or AZ_BATCH_NODE_ROOT_DIR in
+ /// Linux). It won't' mount any data paths into container if this array is set
+ /// as empty.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "containerHostBatchBindMounts")]
+ public System.Collections.Generic.IList ContainerHostBatchBindMounts {get; set; }
///
/// Validate the object.
///
@@ -103,6 +118,7 @@ public virtual void Validate()
+
}
}
}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/UefiSettings.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/UefiSettings.cs
new file mode 100644
index 000000000000..cca25ecf040a
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/UefiSettings.cs
@@ -0,0 +1,61 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// Specifies the security settings like secure boot and vTPM used while
+ /// creating the virtual machine.
+ ///
+ public partial class UefiSettings
+ {
+ ///
+ /// Initializes a new instance of the UefiSettings class.
+ ///
+ public UefiSettings()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the UefiSettings class.
+ ///
+
+ /// Specifies whether secure boot should be enabled on the virtual machine.
+ ///
+
+ /// Specifies whether vTPM should be enabled on the virtual machine.
+ ///
+ public UefiSettings(bool? secureBootEnabled = default(bool?), bool? vTpmEnabled = default(bool?))
+
+ {
+ this.SecureBootEnabled = secureBootEnabled;
+ this.VTpmEnabled = vTpmEnabled;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets specifies whether secure boot should be enabled on the virtual
+ /// machine.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "secureBootEnabled")]
+ public bool? SecureBootEnabled {get; set; }
+
+ ///
+ /// Gets or sets specifies whether vTPM should be enabled on the virtual
+ /// machine.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "vTpmEnabled")]
+ public bool? VTpmEnabled {get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/UpgradeMode.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/UpgradeMode.cs
new file mode 100644
index 000000000000..c1a9ce7f7047
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/UpgradeMode.cs
@@ -0,0 +1,71 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+
+ ///
+ /// Defines values for UpgradeMode.
+ ///
+
+
+ [Newtonsoft.Json.JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))]
+ public enum UpgradeMode
+ {
+ ///
+ /// All virtual machines in the scale set are automatically updated at the same
+ /// time.
+ ///
+ [System.Runtime.Serialization.EnumMember(Value = "automatic")]
+ Automatic,
+ ///
+ /// You control the application of updates to virtual machines in the scale
+ /// set. You do this by using the manualUpgrade action.
+ ///
+ [System.Runtime.Serialization.EnumMember(Value = "manual")]
+ Manual,
+ ///
+ /// The existing instances in a scale set are brought down in batches to be
+ /// upgraded. Once the upgraded batch is complete, the instances will begin
+ /// taking traffic again and the next batch will begin. This continues until
+ /// all instances brought up-to-date.
+ ///
+ [System.Runtime.Serialization.EnumMember(Value = "rolling")]
+ Rolling
+ }
+ internal static class UpgradeModeEnumExtension
+ {
+ internal static string ToSerializedValue(this UpgradeMode? value)
+ {
+ return value == null ? null : ((UpgradeMode)value).ToSerializedValue();
+ }
+ internal static string ToSerializedValue(this UpgradeMode value)
+ {
+ switch( value )
+ {
+ case UpgradeMode.Automatic:
+ return "automatic";
+ case UpgradeMode.Manual:
+ return "manual";
+ case UpgradeMode.Rolling:
+ return "rolling";
+ }
+ return null;
+ }
+ internal static UpgradeMode? ParseUpgradeMode(this string value)
+ {
+ switch( value )
+ {
+ case "automatic":
+ return UpgradeMode.Automatic;
+ case "manual":
+ return UpgradeMode.Manual;
+ case "rolling":
+ return UpgradeMode.Rolling;
+ }
+ return null;
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/UpgradePolicy.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/UpgradePolicy.cs
new file mode 100644
index 000000000000..64855c36ccfe
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/UpgradePolicy.cs
@@ -0,0 +1,97 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// Describes an upgrade policy - automatic, manual, or rolling.
+ ///
+ public partial class UpgradePolicy
+ {
+ ///
+ /// Initializes a new instance of the UpgradePolicy class.
+ ///
+ public UpgradePolicy()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the UpgradePolicy class.
+ ///
+
+ /// Specifies the mode of an upgrade to virtual machines in the scale set.<br
+ /// /><br /> Possible values are:<br /><br /> **Manual** - You control the
+ /// application of updates to virtual machines in the scale set. You do this by
+ /// using the manualUpgrade action.<br /><br /> **Automatic** - All virtual
+ /// machines in the scale set are automatically updated at the same time.<br
+ /// /><br /> **Rolling** - Scale set performs updates in batches with an
+ /// optional pause time in between.
+ /// Possible values include: 'automatic', 'manual', 'rolling'
+
+ /// The configuration parameters used for performing automatic OS upgrade.
+ ///
+
+ /// The configuration parameters used while performing a rolling upgrade.
+ ///
+ public UpgradePolicy(UpgradeMode mode, AutomaticOSUpgradePolicy automaticOSUpgradePolicy = default(AutomaticOSUpgradePolicy), RollingUpgradePolicy rollingUpgradePolicy = default(RollingUpgradePolicy))
+
+ {
+ this.Mode = mode;
+ this.AutomaticOSUpgradePolicy = automaticOSUpgradePolicy;
+ this.RollingUpgradePolicy = rollingUpgradePolicy;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets specifies the mode of an upgrade to virtual machines in the
+ /// scale set.<br /><br /> Possible values are:<br /><br /> **Manual** - You
+ /// control the application of updates to virtual machines in the scale set.
+ /// You do this by using the manualUpgrade action.<br /><br /> **Automatic** -
+ /// All virtual machines in the scale set are automatically updated at the same
+ /// time.<br /><br /> **Rolling** - Scale set performs updates in batches with
+ /// an optional pause time in between. Possible values include: 'automatic', 'manual', 'rolling'
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "mode")]
+ public UpgradeMode Mode {get; set; }
+
+ ///
+ /// Gets or sets the configuration parameters used for performing automatic OS
+ /// upgrade.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "automaticOSUpgradePolicy")]
+ public AutomaticOSUpgradePolicy AutomaticOSUpgradePolicy {get; set; }
+
+ ///
+ /// Gets or sets the configuration parameters used while performing a rolling
+ /// upgrade.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "rollingUpgradePolicy")]
+ public RollingUpgradePolicy RollingUpgradePolicy {get; set; }
+ ///
+ /// Validate the object.
+ ///
+ ///
+ /// Thrown if validation fails
+ ///
+ public virtual void Validate()
+ {
+
+
+ if (this.RollingUpgradePolicy != null)
+ {
+ this.RollingUpgradePolicy.Validate();
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/VMDiskSecurityProfile.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/VMDiskSecurityProfile.cs
new file mode 100644
index 000000000000..9fa165f24981
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/VMDiskSecurityProfile.cs
@@ -0,0 +1,58 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch.Models
+{
+ using System.Linq;
+
+ ///
+ /// Specifies the security profile settings for the managed disk. **Note**: It
+ /// can only be set for Confidential VMs and is required when using
+ /// Confidential VMs.
+ ///
+ public partial class VMDiskSecurityProfile
+ {
+ ///
+ /// Initializes a new instance of the VMDiskSecurityProfile class.
+ ///
+ public VMDiskSecurityProfile()
+ {
+ CustomInit();
+ }
+
+ ///
+ /// Initializes a new instance of the VMDiskSecurityProfile class.
+ ///
+
+ /// 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 required when using
+ /// Confidential VMs.
+ /// Possible values include: 'NonPersistedTPM', 'VMGuestStateOnly'
+ public VMDiskSecurityProfile(string securityEncryptionType = default(string))
+
+ {
+ this.SecurityEncryptionType = securityEncryptionType;
+ CustomInit();
+ }
+
+ ///
+ /// An initialization method that performs custom operations like setting defaults
+ ///
+ partial void CustomInit();
+
+
+ ///
+ /// Gets or sets 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 required when using
+ /// Confidential VMs. Possible values include: 'NonPersistedTPM', 'VMGuestStateOnly'
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "securityEncryptionType")]
+ public string SecurityEncryptionType {get; set; }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/VMExtension.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/VMExtension.cs
index 19bd78635852..2e249a4ba010 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/VMExtension.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/VMExtension.cs
@@ -45,6 +45,10 @@ public VMExtension()
/// to true.
///
+ /// Indicates whether the extension should be automatically upgraded by the
+ /// platform if there is a newer version of the extension available.
+ ///
+
/// JSON formatted public settings for the extension.
///
@@ -55,7 +59,7 @@ public VMExtension()
/// Collection of extension names after which this extension needs to be
/// provisioned.
///
- public VMExtension(string name, string publisher, string type, string typeHandlerVersion = default(string), bool? autoUpgradeMinorVersion = default(bool?), object settings = default(object), object protectedSettings = default(object), System.Collections.Generic.IList provisionAfterExtensions = default(System.Collections.Generic.IList))
+ public VMExtension(string name, string publisher, string type, string typeHandlerVersion = default(string), bool? autoUpgradeMinorVersion = default(bool?), bool? enableAutomaticUpgrade = default(bool?), object settings = default(object), object protectedSettings = default(object), System.Collections.Generic.IList provisionAfterExtensions = default(System.Collections.Generic.IList))
{
this.Name = name;
@@ -63,6 +67,7 @@ public VMExtension()
this.Type = type;
this.TypeHandlerVersion = typeHandlerVersion;
this.AutoUpgradeMinorVersion = autoUpgradeMinorVersion;
+ this.EnableAutomaticUpgrade = enableAutomaticUpgrade;
this.Settings = settings;
this.ProtectedSettings = protectedSettings;
this.ProvisionAfterExtensions = provisionAfterExtensions;
@@ -108,6 +113,14 @@ public VMExtension()
[Newtonsoft.Json.JsonProperty(PropertyName = "autoUpgradeMinorVersion")]
public bool? AutoUpgradeMinorVersion {get; set; }
+ ///
+ /// Gets or sets indicates whether the extension should be automatically
+ /// upgraded by the platform if there is a newer version of the extension
+ /// available.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "enableAutomaticUpgrade")]
+ public bool? EnableAutomaticUpgrade {get; set; }
+
///
/// Gets or sets jSON formatted public settings for the extension.
///
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/VirtualMachineConfiguration.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/VirtualMachineConfiguration.cs
index 66e5b1cea964..ef646c88d2fc 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/VirtualMachineConfiguration.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/VirtualMachineConfiguration.cs
@@ -80,7 +80,15 @@ public VirtualMachineConfiguration()
/// Contains configuration for ephemeral OSDisk settings.
///
- public VirtualMachineConfiguration(ImageReference imageReference, string nodeAgentSkuId, WindowsConfiguration windowsConfiguration = default(WindowsConfiguration), System.Collections.Generic.IList dataDisks = default(System.Collections.Generic.IList), string licenseType = default(string), ContainerConfiguration containerConfiguration = default(ContainerConfiguration), DiskEncryptionConfiguration diskEncryptionConfiguration = default(DiskEncryptionConfiguration), NodePlacementConfiguration nodePlacementConfiguration = default(NodePlacementConfiguration), System.Collections.Generic.IList extensions = default(System.Collections.Generic.IList), OSDisk osDisk = default(OSDisk))
+
+ /// Specifies the security profile settings for the virtual machine or virtual
+ /// machine scale set.
+ ///
+
+ /// The service artifact reference id in the form of
+ /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/galleries/{galleryName}/serviceArtifacts/{serviceArtifactName}/vmArtifactsProfiles/{vmArtifactsProfilesName}
+ ///
+ public VirtualMachineConfiguration(ImageReference imageReference, string nodeAgentSkuId, WindowsConfiguration windowsConfiguration = default(WindowsConfiguration), System.Collections.Generic.IList dataDisks = default(System.Collections.Generic.IList), string licenseType = default(string), ContainerConfiguration containerConfiguration = default(ContainerConfiguration), DiskEncryptionConfiguration diskEncryptionConfiguration = default(DiskEncryptionConfiguration), NodePlacementConfiguration nodePlacementConfiguration = default(NodePlacementConfiguration), System.Collections.Generic.IList extensions = default(System.Collections.Generic.IList), OSDisk osDisk = default(OSDisk), SecurityProfile securityProfile = default(SecurityProfile), ServiceArtifactReference serviceArtifactReference = default(ServiceArtifactReference))
{
this.ImageReference = imageReference;
@@ -93,6 +101,8 @@ public VirtualMachineConfiguration()
this.NodePlacementConfiguration = nodePlacementConfiguration;
this.Extensions = extensions;
this.OSDisk = osDisk;
+ this.SecurityProfile = securityProfile;
+ this.ServiceArtifactReference = serviceArtifactReference;
CustomInit();
}
@@ -183,6 +193,20 @@ public VirtualMachineConfiguration()
///
[Newtonsoft.Json.JsonProperty(PropertyName = "osDisk")]
public OSDisk OSDisk {get; set; }
+
+ ///
+ /// Gets or sets specifies the security profile settings for the virtual
+ /// machine or virtual machine scale set.
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "securityProfile")]
+ public SecurityProfile SecurityProfile {get; set; }
+
+ ///
+ /// Gets or sets the service artifact reference id in the form of
+ /// /subscriptions/{subscriptionId}/resourceGroups/{resourceGroup}/providers/Microsoft.Compute/galleries/{galleryName}/serviceArtifacts/{serviceArtifactName}/vmArtifactsProfiles/{vmArtifactsProfilesName}
+ ///
+ [Newtonsoft.Json.JsonProperty(PropertyName = "serviceArtifactReference")]
+ public ServiceArtifactReference ServiceArtifactReference {get; set; }
///
/// Validate the object.
///
@@ -213,7 +237,10 @@ public virtual void Validate()
}
}
-
+ if (this.ContainerConfiguration != null)
+ {
+ this.ContainerConfiguration.Validate();
+ }
if (this.Extensions != null)
@@ -227,6 +254,11 @@ public virtual void Validate()
}
}
+
+ if (this.ServiceArtifactReference != null)
+ {
+ this.ServiceArtifactReference.Validate();
+ }
}
}
}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/Models/WindowsUserConfiguration.cs b/src/Batch/Batch.Management.Sdk/Generated/Models/WindowsUserConfiguration.cs
index 15971a578e48..a7a4a2fc7c35 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/Models/WindowsUserConfiguration.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/Models/WindowsUserConfiguration.cs
@@ -27,9 +27,7 @@ public WindowsUserConfiguration()
/// Initializes a new instance of the WindowsUserConfiguration class.
///
- /// Specifies login mode for the user. The default value for
- /// VirtualMachineConfiguration pools is interactive mode and for
- /// CloudServiceConfiguration pools is batch mode.
+ /// Specifies login mode for the user. The default value is Interactive.
/// Possible values include: 'Batch', 'Interactive'
public WindowsUserConfiguration(LoginMode? loginMode = default(LoginMode?))
@@ -45,9 +43,8 @@ public WindowsUserConfiguration()
///
- /// Gets or sets specifies login mode for the user. The default value for
- /// VirtualMachineConfiguration pools is interactive mode and for
- /// CloudServiceConfiguration pools is batch mode. Possible values include: 'Batch', 'Interactive'
+ /// Gets or sets specifies login mode for the user. The default value is
+ /// Interactive. Possible values include: 'Batch', 'Interactive'
///
[Newtonsoft.Json.JsonProperty(PropertyName = "loginMode")]
public LoginMode? LoginMode {get; set; }
diff --git a/src/Batch/Batch.Management.Sdk/Generated/NetworkSecurityPerimeterOperations.cs b/src/Batch/Batch.Management.Sdk/Generated/NetworkSecurityPerimeterOperations.cs
new file mode 100644
index 000000000000..3b6dcd3f218f
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/NetworkSecurityPerimeterOperations.cs
@@ -0,0 +1,949 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+
+namespace Microsoft.Azure.Management.Batch
+{
+ using System.Linq;
+ using Microsoft.Rest;
+ using Microsoft.Rest.Azure;
+ using Models;
+
+ ///
+ /// NetworkSecurityPerimeterOperations operations.
+ ///
+ internal partial class NetworkSecurityPerimeterOperations : Microsoft.Rest.IServiceOperations, INetworkSecurityPerimeterOperations
+ {
+ ///
+ /// Initializes a new instance of the NetworkSecurityPerimeterOperations class.
+ ///
+ ///
+ /// Reference to the service client.
+ ///
+ ///
+ /// Thrown when a required parameter is null
+ ///
+ internal NetworkSecurityPerimeterOperations (BatchManagementClient client)
+ {
+ if (client == null)
+ {
+ throw new System.ArgumentNullException("client");
+ }
+ this.Client = client;
+ }
+
+ ///
+ /// Gets a reference to the BatchManagementClient
+ ///
+ public BatchManagementClient Client { get; private set; }
+
+ ///
+ /// Lists all of the NSP configurations in the specified account.
+ ///
+ ///
+ /// The name of the resource group that contains the Batch account.
+ ///
+ ///
+ /// The name of the Batch account.
+ ///
+ ///
+ /// Headers that will be added to request.
+ ///
+ ///
+ /// The cancellation token.
+ ///
+ ///
+ /// Thrown when the operation returned an invalid status code
+ ///
+ ///
+ /// Thrown when unable to deserialize the response
+ ///
+ ///
+ /// Thrown when a required parameter is null
+ ///
+ ///
+ /// Thrown when a required parameter is null
+ ///
+ ///
+ /// A response object containing the response body and response headers.
+ ///
+ public async System.Threading.Tasks.Task>> ListConfigurationsWithHttpMessagesAsync(string resourceGroupName, string accountName, System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+ {
+
+
+
+
+ if (this.Client.SubscriptionId == null)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
+ }
+
+ if (resourceGroupName == null)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "resourceGroupName");
+ }
+
+ if (accountName == null)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "accountName");
+ }
+ if (accountName != null)
+ {
+ if (accountName.Length > 24)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.MaxLength, "accountName", 24);
+ }
+ if (accountName.Length < 3)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.MinLength, "accountName", 3);
+ }
+ if (!System.Text.RegularExpressions.Regex.IsMatch(accountName, "^[a-zA-Z0-9]+$"))
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.Pattern, "accountName", "^[a-zA-Z0-9]+$");
+ }
+ }
+ if (this.Client.ApiVersion == null)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+ }
+
+ // Tracing
+ bool _shouldTrace = Microsoft.Rest.ServiceClientTracing.IsEnabled;
+ string _invocationId = null;
+ if (_shouldTrace)
+ {
+ _invocationId = Microsoft.Rest.ServiceClientTracing.NextInvocationId.ToString();
+ System.Collections.Generic.Dictionary tracingParameters = new System.Collections.Generic.Dictionary();
+ tracingParameters.Add("resourceGroupName", resourceGroupName);
+ tracingParameters.Add("accountName", accountName);
+
+
+ tracingParameters.Add("cancellationToken", cancellationToken);
+ Microsoft.Rest.ServiceClientTracing.Enter(_invocationId, this, "ListConfigurations", tracingParameters);
+ }
+ // Construct URL
+
+ var _baseUrl = this.Client.BaseUri.AbsoluteUri;
+ var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/networkSecurityPerimeterConfigurations").ToString();
+ _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(this.Client.SubscriptionId));
+ _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
+ _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
+
+ System.Collections.Generic.List _queryParameters = new System.Collections.Generic.List();
+ if (this.Client.ApiVersion != null)
+ {
+ _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(this.Client.ApiVersion)));
+ }
+ if (_queryParameters.Count > 0)
+ {
+ _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
+ }
+ // Create HTTP transport objects
+ var _httpRequest = new System.Net.Http.HttpRequestMessage();
+ System.Net.Http.HttpResponseMessage _httpResponse = null;
+ _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+ _httpRequest.RequestUri = new System.Uri(_url);
+ // Set Headers
+ if (this.Client.GenerateClientRequestId != null && this.Client.GenerateClientRequestId.Value)
+ {
+ _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
+ }
+ if (this.Client.AcceptLanguage != null)
+ {
+ if (_httpRequest.Headers.Contains("accept-language"))
+ {
+ _httpRequest.Headers.Remove("accept-language");
+ }
+ _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.Client.AcceptLanguage);
+ }
+
+ if (customHeaders != null)
+ {
+ foreach(var _header in customHeaders)
+ {
+ if (_httpRequest.Headers.Contains(_header.Key))
+ {
+ _httpRequest.Headers.Remove(_header.Key);
+ }
+ _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+ }
+ }
+ // Serialize Request
+ string _requestContent = null;
+ // Set Credentials
+ if (this.Client.Credentials != null)
+ {
+ cancellationToken.ThrowIfCancellationRequested();
+ await this.Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+ }
+ // Send Request
+ if (_shouldTrace)
+ {
+ Microsoft.Rest.ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+ }
+ cancellationToken.ThrowIfCancellationRequested();
+ _httpResponse = await this.Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+ if (_shouldTrace)
+ {
+ Microsoft.Rest.ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+ }
+
+ System.Net.HttpStatusCode _statusCode = _httpResponse.StatusCode;
+ cancellationToken.ThrowIfCancellationRequested();
+ string _responseContent = null;
+
+ if ((int)_statusCode != 200)
+ {
+ var ex = new Microsoft.Rest.Azure.CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+ try
+ {
+ _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+ CloudError _errorBody = Microsoft.Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, this.Client.DeserializationSettings);
+ if (_errorBody != null)
+ {
+ ex = new Microsoft.Rest.Azure.CloudException(_errorBody.Message);
+ ex.Body = _errorBody;
+ }
+ }
+ catch (Newtonsoft.Json.JsonException)
+ {
+ // Ignore the exception
+ }
+ ex.Request = new Microsoft.Rest.HttpRequestMessageWrapper(_httpRequest, _requestContent);
+ ex.Response = new Microsoft.Rest.HttpResponseMessageWrapper(_httpResponse, _responseContent);
+ if (_httpResponse.Headers.Contains("x-ms-request-id"))
+ {
+ ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+ }
+ if (_shouldTrace)
+ {
+ Microsoft.Rest.ServiceClientTracing.Error(_invocationId, ex);
+ }
+ _httpRequest.Dispose();
+ if (_httpResponse != null)
+ {
+ _httpResponse.Dispose();
+ }
+ throw ex;
+ }
+ // Create Result
+ var _result = new Microsoft.Rest.Azure.AzureOperationResponse>();
+ _result.Request = _httpRequest;
+ _result.Response = _httpResponse;
+
+ if (_httpResponse.Headers.Contains("x-ms-request-id"))
+ {
+ _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+ }
+ // Deserialize Response
+ if ((int)_statusCode == 200)
+ {
+ _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+ try
+ {
+ _result.Body = Microsoft.Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, this.Client.DeserializationSettings);
+ }
+ catch (Newtonsoft.Json.JsonException ex)
+ {
+ _httpRequest.Dispose();
+ if (_httpResponse != null)
+ {
+ _httpResponse.Dispose();
+ }
+ throw new Microsoft.Rest.SerializationException("Unable to deserialize the response.", _responseContent, ex);
+ }
+ }
+ if (_shouldTrace)
+ {
+ Microsoft.Rest.ServiceClientTracing.Exit(_invocationId, _result);
+ }
+ return _result;
+
+
+
+
+
+ }
+ ///
+ /// Gets information about the specified NSP configuration.
+ ///
+ ///
+ /// The name of the resource group that contains the Batch account.
+ ///
+ ///
+ /// The name of the Batch account.
+ ///
+ ///
+ /// The name for Network Security Perimeter configuration
+ ///
+ ///
+ /// Headers that will be added to request.
+ ///
+ ///
+ /// The cancellation token.
+ ///
+ ///
+ /// Thrown when the operation returned an invalid status code
+ ///
+ ///
+ /// Thrown when unable to deserialize the response
+ ///
+ ///
+ /// Thrown when a required parameter is null
+ ///
+ ///
+ /// Thrown when a required parameter is null
+ ///
+ ///
+ /// A response object containing the response body and response headers.
+ ///
+ public async System.Threading.Tasks.Task> GetConfigurationWithHttpMessagesAsync(string resourceGroupName, string accountName, string networkSecurityPerimeterConfigurationName, System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+ {
+
+
+
+
+ if (this.Client.SubscriptionId == null)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
+ }
+
+ if (resourceGroupName == null)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "resourceGroupName");
+ }
+
+ if (accountName == null)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "accountName");
+ }
+ if (accountName != null)
+ {
+ if (accountName.Length > 24)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.MaxLength, "accountName", 24);
+ }
+ if (accountName.Length < 3)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.MinLength, "accountName", 3);
+ }
+ if (!System.Text.RegularExpressions.Regex.IsMatch(accountName, "^[a-zA-Z0-9]+$"))
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.Pattern, "accountName", "^[a-zA-Z0-9]+$");
+ }
+ }
+ if (networkSecurityPerimeterConfigurationName == null)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "networkSecurityPerimeterConfigurationName");
+ }
+ if (networkSecurityPerimeterConfigurationName != null)
+ {
+ if (!System.Text.RegularExpressions.Regex.IsMatch(networkSecurityPerimeterConfigurationName, "^.*$"))
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.Pattern, "networkSecurityPerimeterConfigurationName", "^.*$");
+ }
+ }
+ if (this.Client.ApiVersion == null)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+ }
+
+ // Tracing
+ bool _shouldTrace = Microsoft.Rest.ServiceClientTracing.IsEnabled;
+ string _invocationId = null;
+ if (_shouldTrace)
+ {
+ _invocationId = Microsoft.Rest.ServiceClientTracing.NextInvocationId.ToString();
+ System.Collections.Generic.Dictionary tracingParameters = new System.Collections.Generic.Dictionary();
+ tracingParameters.Add("resourceGroupName", resourceGroupName);
+ tracingParameters.Add("accountName", accountName);
+ tracingParameters.Add("networkSecurityPerimeterConfigurationName", networkSecurityPerimeterConfigurationName);
+
+
+ tracingParameters.Add("cancellationToken", cancellationToken);
+ Microsoft.Rest.ServiceClientTracing.Enter(_invocationId, this, "GetConfiguration", tracingParameters);
+ }
+ // Construct URL
+
+ var _baseUrl = this.Client.BaseUri.AbsoluteUri;
+ var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/networkSecurityPerimeterConfigurations/{networkSecurityPerimeterConfigurationName}").ToString();
+ _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(this.Client.SubscriptionId));
+ _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
+ _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
+ _url = _url.Replace("{networkSecurityPerimeterConfigurationName}", System.Uri.EscapeDataString(networkSecurityPerimeterConfigurationName));
+
+ System.Collections.Generic.List _queryParameters = new System.Collections.Generic.List();
+ if (this.Client.ApiVersion != null)
+ {
+ _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(this.Client.ApiVersion)));
+ }
+ if (_queryParameters.Count > 0)
+ {
+ _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
+ }
+ // Create HTTP transport objects
+ var _httpRequest = new System.Net.Http.HttpRequestMessage();
+ System.Net.Http.HttpResponseMessage _httpResponse = null;
+ _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+ _httpRequest.RequestUri = new System.Uri(_url);
+ // Set Headers
+ if (this.Client.GenerateClientRequestId != null && this.Client.GenerateClientRequestId.Value)
+ {
+ _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
+ }
+ if (this.Client.AcceptLanguage != null)
+ {
+ if (_httpRequest.Headers.Contains("accept-language"))
+ {
+ _httpRequest.Headers.Remove("accept-language");
+ }
+ _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.Client.AcceptLanguage);
+ }
+
+ if (customHeaders != null)
+ {
+ foreach(var _header in customHeaders)
+ {
+ if (_httpRequest.Headers.Contains(_header.Key))
+ {
+ _httpRequest.Headers.Remove(_header.Key);
+ }
+ _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+ }
+ }
+ // Serialize Request
+ string _requestContent = null;
+ // Set Credentials
+ if (this.Client.Credentials != null)
+ {
+ cancellationToken.ThrowIfCancellationRequested();
+ await this.Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+ }
+ // Send Request
+ if (_shouldTrace)
+ {
+ Microsoft.Rest.ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+ }
+ cancellationToken.ThrowIfCancellationRequested();
+ _httpResponse = await this.Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+ if (_shouldTrace)
+ {
+ Microsoft.Rest.ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+ }
+
+ System.Net.HttpStatusCode _statusCode = _httpResponse.StatusCode;
+ cancellationToken.ThrowIfCancellationRequested();
+ string _responseContent = null;
+
+ if ((int)_statusCode != 200)
+ {
+ var ex = new Microsoft.Rest.Azure.CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+ try
+ {
+ _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+ CloudError _errorBody = Microsoft.Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, this.Client.DeserializationSettings);
+ if (_errorBody != null)
+ {
+ ex = new Microsoft.Rest.Azure.CloudException(_errorBody.Message);
+ ex.Body = _errorBody;
+ }
+ }
+ catch (Newtonsoft.Json.JsonException)
+ {
+ // Ignore the exception
+ }
+ ex.Request = new Microsoft.Rest.HttpRequestMessageWrapper(_httpRequest, _requestContent);
+ ex.Response = new Microsoft.Rest.HttpResponseMessageWrapper(_httpResponse, _responseContent);
+ if (_httpResponse.Headers.Contains("x-ms-request-id"))
+ {
+ ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+ }
+ if (_shouldTrace)
+ {
+ Microsoft.Rest.ServiceClientTracing.Error(_invocationId, ex);
+ }
+ _httpRequest.Dispose();
+ if (_httpResponse != null)
+ {
+ _httpResponse.Dispose();
+ }
+ throw ex;
+ }
+ // Create Result
+ var _result = new Microsoft.Rest.Azure.AzureOperationResponse();
+ _result.Request = _httpRequest;
+ _result.Response = _httpResponse;
+
+ if (_httpResponse.Headers.Contains("x-ms-request-id"))
+ {
+ _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+ }
+ // Deserialize Response
+ if ((int)_statusCode == 200)
+ {
+ _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+ try
+ {
+ _result.Body = Microsoft.Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, this.Client.DeserializationSettings);
+ }
+ catch (Newtonsoft.Json.JsonException ex)
+ {
+ _httpRequest.Dispose();
+ if (_httpResponse != null)
+ {
+ _httpResponse.Dispose();
+ }
+ throw new Microsoft.Rest.SerializationException("Unable to deserialize the response.", _responseContent, ex);
+ }
+ }
+ if (_shouldTrace)
+ {
+ Microsoft.Rest.ServiceClientTracing.Exit(_invocationId, _result);
+ }
+ return _result;
+
+
+
+
+
+ }
+ ///
+ /// Reconciles the specified NSP configuration.
+ ///
+ ///
+ /// The name of the resource group that contains the Batch account.
+ ///
+ ///
+ /// The name of the Batch account.
+ ///
+ ///
+ /// The name for Network Security Perimeter configuration
+ ///
+ ///
+ /// Headers that will be added to request.
+ ///
+ ///
+ /// The cancellation token.
+ ///
+ public async System.Threading.Tasks.Task> ReconcileConfigurationWithHttpMessagesAsync(string resourceGroupName, string accountName, string networkSecurityPerimeterConfigurationName, System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+ {
+ // Send Request
+ Microsoft.Rest.Azure.AzureOperationHeaderResponse _response = await BeginReconcileConfigurationWithHttpMessagesAsync(resourceGroupName, accountName, networkSecurityPerimeterConfigurationName, customHeaders, cancellationToken).ConfigureAwait(false);
+ return await this.Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
+ }
+
+ ///
+ /// Reconciles the specified NSP configuration.
+ ///
+ ///
+ /// The name of the resource group that contains the Batch account.
+ ///
+ ///
+ /// The name of the Batch account.
+ ///
+ ///
+ /// The name for Network Security Perimeter configuration
+ ///
+ ///
+ /// Headers that will be added to request.
+ ///
+ ///
+ /// The cancellation token.
+ ///
+ ///
+ /// Thrown when the operation returned an invalid status code
+ ///
+ ///
+ /// Thrown when a required parameter is null
+ ///
+ ///
+ /// Thrown when a required parameter is null
+ ///
+ ///
+ /// A response object containing the response body and response headers.
+ ///
+ public async System.Threading.Tasks.Task> BeginReconcileConfigurationWithHttpMessagesAsync(string resourceGroupName, string accountName, string networkSecurityPerimeterConfigurationName, System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+ {
+
+
+
+
+ if (this.Client.SubscriptionId == null)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
+ }
+
+ if (resourceGroupName == null)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "resourceGroupName");
+ }
+
+ if (accountName == null)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "accountName");
+ }
+ if (accountName != null)
+ {
+ if (accountName.Length > 24)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.MaxLength, "accountName", 24);
+ }
+ if (accountName.Length < 3)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.MinLength, "accountName", 3);
+ }
+ if (!System.Text.RegularExpressions.Regex.IsMatch(accountName, "^[a-zA-Z0-9]+$"))
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.Pattern, "accountName", "^[a-zA-Z0-9]+$");
+ }
+ }
+ if (networkSecurityPerimeterConfigurationName == null)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "networkSecurityPerimeterConfigurationName");
+ }
+ if (networkSecurityPerimeterConfigurationName != null)
+ {
+ if (!System.Text.RegularExpressions.Regex.IsMatch(networkSecurityPerimeterConfigurationName, "^.*$"))
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.Pattern, "networkSecurityPerimeterConfigurationName", "^.*$");
+ }
+ }
+ if (this.Client.ApiVersion == null)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "this.Client.ApiVersion");
+ }
+
+ // Tracing
+ bool _shouldTrace = Microsoft.Rest.ServiceClientTracing.IsEnabled;
+ string _invocationId = null;
+ if (_shouldTrace)
+ {
+ _invocationId = Microsoft.Rest.ServiceClientTracing.NextInvocationId.ToString();
+ System.Collections.Generic.Dictionary tracingParameters = new System.Collections.Generic.Dictionary();
+ tracingParameters.Add("resourceGroupName", resourceGroupName);
+ tracingParameters.Add("accountName", accountName);
+ tracingParameters.Add("networkSecurityPerimeterConfigurationName", networkSecurityPerimeterConfigurationName);
+
+
+ tracingParameters.Add("cancellationToken", cancellationToken);
+ Microsoft.Rest.ServiceClientTracing.Enter(_invocationId, this, "BeginReconcileConfiguration", tracingParameters);
+ }
+ // Construct URL
+
+ var _baseUrl = this.Client.BaseUri.AbsoluteUri;
+ var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Batch/batchAccounts/{accountName}/networkSecurityPerimeterConfigurations/{networkSecurityPerimeterConfigurationName}/reconcile").ToString();
+ _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(this.Client.SubscriptionId));
+ _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName));
+ _url = _url.Replace("{accountName}", System.Uri.EscapeDataString(accountName));
+ _url = _url.Replace("{networkSecurityPerimeterConfigurationName}", System.Uri.EscapeDataString(networkSecurityPerimeterConfigurationName));
+
+ System.Collections.Generic.List _queryParameters = new System.Collections.Generic.List();
+ if (this.Client.ApiVersion != null)
+ {
+ _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(this.Client.ApiVersion)));
+ }
+ if (_queryParameters.Count > 0)
+ {
+ _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
+ }
+ // Create HTTP transport objects
+ var _httpRequest = new System.Net.Http.HttpRequestMessage();
+ System.Net.Http.HttpResponseMessage _httpResponse = null;
+ _httpRequest.Method = new System.Net.Http.HttpMethod("POST");
+ _httpRequest.RequestUri = new System.Uri(_url);
+ // Set Headers
+ if (this.Client.GenerateClientRequestId != null && this.Client.GenerateClientRequestId.Value)
+ {
+ _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
+ }
+ if (this.Client.AcceptLanguage != null)
+ {
+ if (_httpRequest.Headers.Contains("accept-language"))
+ {
+ _httpRequest.Headers.Remove("accept-language");
+ }
+ _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.Client.AcceptLanguage);
+ }
+
+ if (customHeaders != null)
+ {
+ foreach(var _header in customHeaders)
+ {
+ if (_httpRequest.Headers.Contains(_header.Key))
+ {
+ _httpRequest.Headers.Remove(_header.Key);
+ }
+ _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+ }
+ }
+ // Serialize Request
+ string _requestContent = null;
+ // Set Credentials
+ if (this.Client.Credentials != null)
+ {
+ cancellationToken.ThrowIfCancellationRequested();
+ await this.Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+ }
+ // Send Request
+ if (_shouldTrace)
+ {
+ Microsoft.Rest.ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+ }
+ cancellationToken.ThrowIfCancellationRequested();
+ _httpResponse = await this.Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+ if (_shouldTrace)
+ {
+ Microsoft.Rest.ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+ }
+
+ System.Net.HttpStatusCode _statusCode = _httpResponse.StatusCode;
+ cancellationToken.ThrowIfCancellationRequested();
+ string _responseContent = null;
+
+ if ((int)_statusCode != 202)
+ {
+ var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+ try
+ {
+ _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+ ErrorResponse _errorBody = Microsoft.Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, this.Client.DeserializationSettings);
+ if (_errorBody != null)
+ {
+ ex.Body = _errorBody;
+ }
+ }
+ catch (Newtonsoft.Json.JsonException)
+ {
+ // Ignore the exception
+ }
+ ex.Request = new Microsoft.Rest.HttpRequestMessageWrapper(_httpRequest, _requestContent);
+ ex.Response = new Microsoft.Rest.HttpResponseMessageWrapper(_httpResponse, _responseContent);
+ if (_shouldTrace)
+ {
+ Microsoft.Rest.ServiceClientTracing.Error(_invocationId, ex);
+ }
+ _httpRequest.Dispose();
+ if (_httpResponse != null)
+ {
+ _httpResponse.Dispose();
+ }
+ throw ex;
+ }
+ // Create Result
+ var _result = new Microsoft.Rest.Azure.AzureOperationHeaderResponse();
+ _result.Request = _httpRequest;
+ _result.Response = _httpResponse;
+
+ if (_httpResponse.Headers.Contains("x-ms-request-id"))
+ {
+ _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+ }
+ try
+ {
+ _result.Headers = _httpResponse.GetHeadersAsJson().ToObject(Newtonsoft.Json.JsonSerializer.Create(this.Client.DeserializationSettings));
+ }
+ catch (Newtonsoft.Json.JsonException ex)
+ {
+ _httpRequest.Dispose();
+ if (_httpResponse != null)
+ {
+ _httpResponse.Dispose();
+ }
+ throw new Microsoft.Rest.SerializationException("Unable to deserialize the headers.", _httpResponse.GetHeadersAsJson().ToString(), ex);
+ }
+ if (_shouldTrace)
+ {
+ Microsoft.Rest.ServiceClientTracing.Exit(_invocationId, _result);
+ }
+ return _result;
+
+
+
+
+
+ }
+ ///
+ /// Lists all of the NSP configurations in the specified account.
+ ///
+ ///
+ /// The NextLink from the previous successful call to List operation.
+ ///
+ ///
+ /// Headers that will be added to request.
+ ///
+ ///
+ /// The cancellation token.
+ ///
+ ///
+ /// Thrown when the operation returned an invalid status code
+ ///
+ ///
+ /// Thrown when unable to deserialize the response
+ ///
+ ///
+ /// Thrown when a required parameter is null
+ ///
+ ///
+ /// Thrown when a required parameter is null
+ ///
+ ///
+ /// A response object containing the response body and response headers.
+ ///
+ public async System.Threading.Tasks.Task>> ListConfigurationsNextWithHttpMessagesAsync(string nextPageLink, System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+ {
+
+ if (nextPageLink == null)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "nextPageLink");
+ }
+ // Tracing
+ bool _shouldTrace = Microsoft.Rest.ServiceClientTracing.IsEnabled;
+ string _invocationId = null;
+ if (_shouldTrace)
+ {
+ _invocationId = Microsoft.Rest.ServiceClientTracing.NextInvocationId.ToString();
+ System.Collections.Generic.Dictionary tracingParameters = new System.Collections.Generic.Dictionary();
+ tracingParameters.Add("nextPageLink", nextPageLink);
+
+
+ tracingParameters.Add("cancellationToken", cancellationToken);
+ Microsoft.Rest.ServiceClientTracing.Enter(_invocationId, this, "ListConfigurationsNext", tracingParameters);
+ }
+ // Construct URL
+ string _url = "{nextLink}";
+ _url = _url.Replace("{nextLink}", nextPageLink);
+
+ System.Collections.Generic.List _queryParameters = new System.Collections.Generic.List();
+ if (_queryParameters.Count > 0)
+ {
+ _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters);
+ }
+ // Create HTTP transport objects
+ var _httpRequest = new System.Net.Http.HttpRequestMessage();
+ System.Net.Http.HttpResponseMessage _httpResponse = null;
+ _httpRequest.Method = new System.Net.Http.HttpMethod("GET");
+ _httpRequest.RequestUri = new System.Uri(_url);
+ // Set Headers
+ if (this.Client.GenerateClientRequestId != null && this.Client.GenerateClientRequestId.Value)
+ {
+ _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString());
+ }
+ if (this.Client.AcceptLanguage != null)
+ {
+ if (_httpRequest.Headers.Contains("accept-language"))
+ {
+ _httpRequest.Headers.Remove("accept-language");
+ }
+ _httpRequest.Headers.TryAddWithoutValidation("accept-language", this.Client.AcceptLanguage);
+ }
+
+ if (customHeaders != null)
+ {
+ foreach(var _header in customHeaders)
+ {
+ if (_httpRequest.Headers.Contains(_header.Key))
+ {
+ _httpRequest.Headers.Remove(_header.Key);
+ }
+ _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value);
+ }
+ }
+ // Serialize Request
+ string _requestContent = null;
+ // Set Credentials
+ if (this.Client.Credentials != null)
+ {
+ cancellationToken.ThrowIfCancellationRequested();
+ await this.Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+ }
+ // Send Request
+ if (_shouldTrace)
+ {
+ Microsoft.Rest.ServiceClientTracing.SendRequest(_invocationId, _httpRequest);
+ }
+ cancellationToken.ThrowIfCancellationRequested();
+ _httpResponse = await this.Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false);
+ if (_shouldTrace)
+ {
+ Microsoft.Rest.ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse);
+ }
+
+ System.Net.HttpStatusCode _statusCode = _httpResponse.StatusCode;
+ cancellationToken.ThrowIfCancellationRequested();
+ string _responseContent = null;
+
+ if ((int)_statusCode != 200)
+ {
+ var ex = new Microsoft.Rest.Azure.CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode));
+ try
+ {
+ _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+ CloudError _errorBody = Microsoft.Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, this.Client.DeserializationSettings);
+ if (_errorBody != null)
+ {
+ ex = new Microsoft.Rest.Azure.CloudException(_errorBody.Message);
+ ex.Body = _errorBody;
+ }
+ }
+ catch (Newtonsoft.Json.JsonException)
+ {
+ // Ignore the exception
+ }
+ ex.Request = new Microsoft.Rest.HttpRequestMessageWrapper(_httpRequest, _requestContent);
+ ex.Response = new Microsoft.Rest.HttpResponseMessageWrapper(_httpResponse, _responseContent);
+ if (_httpResponse.Headers.Contains("x-ms-request-id"))
+ {
+ ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+ }
+ if (_shouldTrace)
+ {
+ Microsoft.Rest.ServiceClientTracing.Error(_invocationId, ex);
+ }
+ _httpRequest.Dispose();
+ if (_httpResponse != null)
+ {
+ _httpResponse.Dispose();
+ }
+ throw ex;
+ }
+ // Create Result
+ var _result = new Microsoft.Rest.Azure.AzureOperationResponse>();
+ _result.Request = _httpRequest;
+ _result.Response = _httpResponse;
+
+ if (_httpResponse.Headers.Contains("x-ms-request-id"))
+ {
+ _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault();
+ }
+ // Deserialize Response
+ if ((int)_statusCode == 200)
+ {
+ _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false);
+ try
+ {
+ _result.Body = Microsoft.Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, this.Client.DeserializationSettings);
+ }
+ catch (Newtonsoft.Json.JsonException ex)
+ {
+ _httpRequest.Dispose();
+ if (_httpResponse != null)
+ {
+ _httpResponse.Dispose();
+ }
+ throw new Microsoft.Rest.SerializationException("Unable to deserialize the response.", _responseContent, ex);
+ }
+ }
+ if (_shouldTrace)
+ {
+ Microsoft.Rest.ServiceClientTracing.Exit(_invocationId, _result);
+ }
+ return _result;
+
+
+
+
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/src/Batch/Batch.Management.Sdk/Generated/NetworkSecurityPerimeterOperationsExtensions.cs b/src/Batch/Batch.Management.Sdk/Generated/NetworkSecurityPerimeterOperationsExtensions.cs
new file mode 100644
index 000000000000..315f03e1344b
--- /dev/null
+++ b/src/Batch/Batch.Management.Sdk/Generated/NetworkSecurityPerimeterOperationsExtensions.cs
@@ -0,0 +1,223 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License.txt in the project root for license information.
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is regenerated.
+namespace Microsoft.Azure.Management.Batch
+{
+ using Microsoft.Rest.Azure;
+ using Models;
+
+ ///
+ /// Extension methods for NetworkSecurityPerimeterOperations
+ ///
+ public static partial class NetworkSecurityPerimeterOperationsExtensions
+ {
+ ///
+ /// Lists all of the NSP configurations in the specified account.
+ ///
+ ///
+ /// The operations group for this extension method.
+ ///
+ ///
+ /// The name of the resource group that contains the Batch account.
+ ///
+ ///
+ /// The name of the Batch account.
+ ///
+ public static Microsoft.Rest.Azure.IPage ListConfigurations(this INetworkSecurityPerimeterOperations operations, string resourceGroupName, string accountName)
+ {
+ return ((INetworkSecurityPerimeterOperations)operations).ListConfigurationsAsync(resourceGroupName, accountName).GetAwaiter().GetResult();
+ }
+
+ ///
+ /// Lists all of the NSP configurations in the specified account.
+ ///
+ ///
+ /// The operations group for this extension method.
+ ///
+ ///
+ /// The name of the resource group that contains the Batch account.
+ ///
+ ///
+ /// The name of the Batch account.
+ ///
+ ///
+ /// The cancellation token.
+ ///
+ public static async System.Threading.Tasks.Task> ListConfigurationsAsync(this INetworkSecurityPerimeterOperations operations, string resourceGroupName, string accountName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+ {
+ using (var _result = await operations.ListConfigurationsWithHttpMessagesAsync(resourceGroupName, accountName, null, cancellationToken).ConfigureAwait(false))
+ {
+ return _result.Body;
+ }
+ }
+ ///
+ /// Gets information about the specified NSP configuration.
+ ///
+ ///
+ /// The operations group for this extension method.
+ ///
+ ///
+ /// The name of the resource group that contains the Batch account.
+ ///
+ ///
+ /// The name of the Batch account.
+ ///
+ ///
+ /// The name for Network Security Perimeter configuration
+ ///
+ public static NetworkSecurityPerimeterConfiguration GetConfiguration(this INetworkSecurityPerimeterOperations operations, string resourceGroupName, string accountName, string networkSecurityPerimeterConfigurationName)
+ {
+ return ((INetworkSecurityPerimeterOperations)operations).GetConfigurationAsync(resourceGroupName, accountName, networkSecurityPerimeterConfigurationName).GetAwaiter().GetResult();
+ }
+
+ ///
+ /// Gets information about the specified NSP configuration.
+ ///
+ ///
+ /// The operations group for this extension method.
+ ///
+ ///
+ /// The name of the resource group that contains the Batch account.
+ ///
+ ///
+ /// The name of the Batch account.
+ ///
+ ///
+ /// The name for Network Security Perimeter configuration
+ ///
+ ///
+ /// The cancellation token.
+ ///
+ public static async System.Threading.Tasks.Task GetConfigurationAsync(this INetworkSecurityPerimeterOperations operations, string resourceGroupName, string accountName, string networkSecurityPerimeterConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+ {
+ using (var _result = await operations.GetConfigurationWithHttpMessagesAsync(resourceGroupName, accountName, networkSecurityPerimeterConfigurationName, null, cancellationToken).ConfigureAwait(false))
+ {
+ return _result.Body;
+ }
+ }
+ ///
+ /// Reconciles the specified NSP configuration.
+ ///
+ ///
+ /// The operations group for this extension method.
+ ///
+ ///
+ /// The name of the resource group that contains the Batch account.
+ ///
+ ///
+ /// The name of the Batch account.
+ ///
+ ///
+ /// The name for Network Security Perimeter configuration
+ ///
+ public static NetworkSecurityPerimeterReconcileConfigurationHeaders ReconcileConfiguration(this INetworkSecurityPerimeterOperations operations, string resourceGroupName, string accountName, string networkSecurityPerimeterConfigurationName)
+ {
+ return ((INetworkSecurityPerimeterOperations)operations).ReconcileConfigurationAsync(resourceGroupName, accountName, networkSecurityPerimeterConfigurationName).GetAwaiter().GetResult();
+ }
+
+ ///
+ /// Reconciles the specified NSP configuration.
+ ///
+ ///
+ /// The operations group for this extension method.
+ ///
+ ///
+ /// The name of the resource group that contains the Batch account.
+ ///
+ ///
+ /// The name of the Batch account.
+ ///
+ ///
+ /// The name for Network Security Perimeter configuration
+ ///
+ ///
+ /// The cancellation token.
+ ///
+ public static async System.Threading.Tasks.Task ReconcileConfigurationAsync(this INetworkSecurityPerimeterOperations operations, string resourceGroupName, string accountName, string networkSecurityPerimeterConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+ {
+ using (var _result = await operations.ReconcileConfigurationWithHttpMessagesAsync(resourceGroupName, accountName, networkSecurityPerimeterConfigurationName, null, cancellationToken).ConfigureAwait(false))
+ {
+ return _result.Headers;
+ }
+ }
+ ///
+ /// Reconciles the specified NSP configuration.
+ ///
+ ///
+ /// The operations group for this extension method.
+ ///
+ ///
+ /// The name of the resource group that contains the Batch account.
+ ///
+ ///
+ /// The name of the Batch account.
+ ///
+ ///
+ /// The name for Network Security Perimeter configuration
+ ///
+ public static NetworkSecurityPerimeterReconcileConfigurationHeaders BeginReconcileConfiguration(this INetworkSecurityPerimeterOperations operations, string resourceGroupName, string accountName, string networkSecurityPerimeterConfigurationName)
+ {
+ return ((INetworkSecurityPerimeterOperations)operations).BeginReconcileConfigurationAsync(resourceGroupName, accountName, networkSecurityPerimeterConfigurationName).GetAwaiter().GetResult();
+ }
+
+ ///
+ /// Reconciles the specified NSP configuration.
+ ///
+ ///
+ /// The operations group for this extension method.
+ ///
+ ///
+ /// The name of the resource group that contains the Batch account.
+ ///
+ ///
+ /// The name of the Batch account.
+ ///
+ ///
+ /// The name for Network Security Perimeter configuration
+ ///
+ ///
+ /// The cancellation token.
+ ///
+ public static async System.Threading.Tasks.Task BeginReconcileConfigurationAsync(this INetworkSecurityPerimeterOperations operations, string resourceGroupName, string accountName, string networkSecurityPerimeterConfigurationName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+ {
+ using (var _result = await operations.BeginReconcileConfigurationWithHttpMessagesAsync(resourceGroupName, accountName, networkSecurityPerimeterConfigurationName, null, cancellationToken).ConfigureAwait(false))
+ {
+ return _result.Headers;
+ }
+ }
+ ///
+ /// Lists all of the NSP configurations in the specified account.
+ ///
+ ///
+ /// The operations group for this extension method.
+ ///
+ ///
+ /// The NextLink from the previous successful call to List operation.
+ ///
+ public static Microsoft.Rest.Azure.IPage ListConfigurationsNext(this INetworkSecurityPerimeterOperations operations, string nextPageLink)
+ {
+ return ((INetworkSecurityPerimeterOperations)operations).ListConfigurationsNextAsync(nextPageLink).GetAwaiter().GetResult();
+ }
+
+ ///
+ /// Lists all of the NSP configurations in the specified account.
+ ///
+ ///
+ /// The operations group for this extension method.
+ ///
+ ///
+ /// The NextLink from the previous successful call to List operation.
+ ///
+ ///
+ /// The cancellation token.
+ ///
+ public static async System.Threading.Tasks.Task> ListConfigurationsNextAsync(this INetworkSecurityPerimeterOperations operations, string nextPageLink, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+ {
+ using (var _result = await operations.ListConfigurationsNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false))
+ {
+ return _result.Body;
+ }
+ }
+ }
+}
diff --git a/src/Batch/Batch.Management.Sdk/Generated/PrivateEndpointConnectionOperations.cs b/src/Batch/Batch.Management.Sdk/Generated/PrivateEndpointConnectionOperations.cs
index 9b5f9c18a875..8fdf94961de6 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/PrivateEndpointConnectionOperations.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/PrivateEndpointConnectionOperations.cs
@@ -543,9 +543,10 @@ internal PrivateEndpointConnectionOperations (BatchManagementClient client)
/// The state (ETag) version of the private endpoint connection to update. This
/// value can be omitted or set to "*" to apply the operation unconditionally.
///
- ///
- /// The private link service connection state of the private endpoint
- /// connection
+ ///
+ /// PrivateEndpointConnection properties that should be updated. Properties
+ /// that are supplied will be updated, any property not supplied will be
+ /// unchanged.
///
///
/// Headers that will be added to request.
@@ -553,10 +554,10 @@ internal PrivateEndpointConnectionOperations (BatchManagementClient client)
///
/// The cancellation token.
///
- public async System.Threading.Tasks.Task> UpdateWithHttpMessagesAsync(string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateLinkServiceConnectionState privateLinkServiceConnectionState = default(PrivateLinkServiceConnectionState), string ifMatch = default(string), System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+ public async System.Threading.Tasks.Task> UpdateWithHttpMessagesAsync(string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateEndpointConnection parameters, string ifMatch = default(string), System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
{
// Send Request
- Microsoft.Rest.Azure.AzureOperationResponse _response = await BeginUpdateWithHttpMessagesAsync(resourceGroupName, accountName, privateEndpointConnectionName, privateLinkServiceConnectionState, ifMatch, customHeaders, cancellationToken).ConfigureAwait(false);
+ Microsoft.Rest.Azure.AzureOperationResponse _response = await BeginUpdateWithHttpMessagesAsync(resourceGroupName, accountName, privateEndpointConnectionName, parameters, ifMatch, customHeaders, cancellationToken).ConfigureAwait(false);
return await this.Client.GetPutOrPatchOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false);
}
@@ -603,9 +604,10 @@ internal PrivateEndpointConnectionOperations (BatchManagementClient client)
/// The state (ETag) version of the private endpoint connection to update. This
/// value can be omitted or set to "*" to apply the operation unconditionally.
///
- ///
- /// The private link service connection state of the private endpoint
- /// connection
+ ///
+ /// PrivateEndpointConnection properties that should be updated. Properties
+ /// that are supplied will be updated, any property not supplied will be
+ /// unchanged.
///
///
/// Headers that will be added to request.
@@ -628,12 +630,16 @@ internal PrivateEndpointConnectionOperations (BatchManagementClient client)
///
/// A response object containing the response body and response headers.
///
- public async System.Threading.Tasks.Task> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateLinkServiceConnectionState privateLinkServiceConnectionState = default(PrivateLinkServiceConnectionState), string ifMatch = default(string), System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+ public async System.Threading.Tasks.Task> BeginUpdateWithHttpMessagesAsync(string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateEndpointConnection parameters, string ifMatch = default(string), System.Collections.Generic.Dictionary> customHeaders = null, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
{
+ if (parameters == null)
+ {
+ throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "parameters");
+ }
if (this.Client.SubscriptionId == null)
{
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "this.Client.SubscriptionId");
@@ -688,11 +694,6 @@ internal PrivateEndpointConnectionOperations (BatchManagementClient client)
}
- PrivateEndpointConnection parameters = new PrivateEndpointConnection();
- if(privateLinkServiceConnectionState != null)
- {
- parameters.PrivateLinkServiceConnectionState = privateLinkServiceConnectionState;
- }
// Tracing
bool _shouldTrace = Microsoft.Rest.ServiceClientTracing.IsEnabled;
string _invocationId = null;
diff --git a/src/Batch/Batch.Management.Sdk/Generated/PrivateEndpointConnectionOperationsExtensions.cs b/src/Batch/Batch.Management.Sdk/Generated/PrivateEndpointConnectionOperationsExtensions.cs
index f899f7b19201..9a28f05d3131 100644
--- a/src/Batch/Batch.Management.Sdk/Generated/PrivateEndpointConnectionOperationsExtensions.cs
+++ b/src/Batch/Batch.Management.Sdk/Generated/PrivateEndpointConnectionOperationsExtensions.cs
@@ -124,9 +124,9 @@ public static PrivateEndpointConnection Get(this IPrivateEndpointConnectionOpera
/// The state (ETag) version of the private endpoint connection to update. This
/// value can be omitted or set to "*" to apply the operation unconditionally.
///
- public static PrivateEndpointConnection Update(this IPrivateEndpointConnectionOperations operations, string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateLinkServiceConnectionState privateLinkServiceConnectionState = default(PrivateLinkServiceConnectionState), string ifMatch = default(string))
+ public static PrivateEndpointConnection Update(this IPrivateEndpointConnectionOperations operations, string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateEndpointConnection parameters, string ifMatch = default(string))
{
- return ((IPrivateEndpointConnectionOperations)operations).UpdateAsync(resourceGroupName, accountName, privateEndpointConnectionName, privateLinkServiceConnectionState, ifMatch).GetAwaiter().GetResult();
+ return ((IPrivateEndpointConnectionOperations)operations).UpdateAsync(resourceGroupName, accountName, privateEndpointConnectionName, parameters, ifMatch).GetAwaiter().GetResult();
}
///
@@ -152,9 +152,9 @@ public static PrivateEndpointConnection Get(this IPrivateEndpointConnectionOpera
///
/// The cancellation token.
///
- public static async System.Threading.Tasks.Task UpdateAsync(this IPrivateEndpointConnectionOperations operations, string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateLinkServiceConnectionState privateLinkServiceConnectionState = default(PrivateLinkServiceConnectionState), string ifMatch = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+ public static async System.Threading.Tasks.Task UpdateAsync(this IPrivateEndpointConnectionOperations operations, string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateEndpointConnection parameters, string ifMatch = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
{
- using (var _result = await operations.UpdateWithHttpMessagesAsync(resourceGroupName, accountName, privateEndpointConnectionName, privateLinkServiceConnectionState, ifMatch, null, cancellationToken).ConfigureAwait(false))
+ using (var _result = await operations.UpdateWithHttpMessagesAsync(resourceGroupName, accountName, privateEndpointConnectionName, parameters, ifMatch, null, cancellationToken).ConfigureAwait(false))
{
return _result.Body;
}
@@ -226,9 +226,9 @@ public static PrivateEndpointConnectionDeleteHeaders Delete(this IPrivateEndpoin
/// The state (ETag) version of the private endpoint connection to update. This
/// value can be omitted or set to "*" to apply the operation unconditionally.
///
- public static PrivateEndpointConnection BeginUpdate(this IPrivateEndpointConnectionOperations operations, string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateLinkServiceConnectionState privateLinkServiceConnectionState = default(PrivateLinkServiceConnectionState), string ifMatch = default(string))
+ public static PrivateEndpointConnection BeginUpdate(this IPrivateEndpointConnectionOperations operations, string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateEndpointConnection parameters, string ifMatch = default(string))
{
- return ((IPrivateEndpointConnectionOperations)operations).BeginUpdateAsync(resourceGroupName, accountName, privateEndpointConnectionName, privateLinkServiceConnectionState, ifMatch).GetAwaiter().GetResult();
+ return ((IPrivateEndpointConnectionOperations)operations).BeginUpdateAsync(resourceGroupName, accountName, privateEndpointConnectionName, parameters, ifMatch).GetAwaiter().GetResult();
}
///
@@ -254,9 +254,9 @@ public static PrivateEndpointConnectionDeleteHeaders Delete(this IPrivateEndpoin
///
/// The cancellation token.
///
- public static async System.Threading.Tasks.Task BeginUpdateAsync(this IPrivateEndpointConnectionOperations operations, string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateLinkServiceConnectionState privateLinkServiceConnectionState = default(PrivateLinkServiceConnectionState), string ifMatch = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+ public static async System.Threading.Tasks.Task BeginUpdateAsync(this IPrivateEndpointConnectionOperations operations, string resourceGroupName, string accountName, string privateEndpointConnectionName, PrivateEndpointConnection parameters, string ifMatch = default(string), System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
{
- using (var _result = await operations.BeginUpdateWithHttpMessagesAsync(resourceGroupName, accountName, privateEndpointConnectionName, privateLinkServiceConnectionState, ifMatch, null, cancellationToken).ConfigureAwait(false))
+ using (var _result = await operations.BeginUpdateWithHttpMessagesAsync(resourceGroupName, accountName, privateEndpointConnectionName, parameters, ifMatch, null, cancellationToken).ConfigureAwait(false))
{
return _result.Body;
}
diff --git a/src/Batch/Batch.Management.Sdk/README.md b/src/Batch/Batch.Management.Sdk/README.md
index 698c27486b07..663884d5cc90 100644
--- a/src/Batch/Batch.Management.Sdk/README.md
+++ b/src/Batch/Batch.Management.Sdk/README.md
@@ -21,9 +21,11 @@ license-header: MICROSOFT_MIT_NO_VERSION
payload-flattening-threshold: 1
# title: BatchManagementClient
-commit: 19aa8ab5d14b22bdeb67eab31c65b47c5380fd06
+commit: f9391dfd43360c636a5d7428734f86afe316bbb9
input-file:
- - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/BatchManagement.json
+ - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/batch/resource-manager/Microsoft.Batch/stable/2024-07-01/BatchManagement.json
+ - https://github.com/Azure/azure-rest-api-specs/blob/$(commit)/specification/batch/resource-manager/Microsoft.Batch/stable/2024-07-01/NetworkSecurityPerimeter.json
+
output-folder: Generated
diff --git a/src/Batch/Batch.Test/Batch.Test.csproj b/src/Batch/Batch.Test/Batch.Test.csproj
index 31ac7612207f..a12ec685f417 100644
--- a/src/Batch/Batch.Test/Batch.Test.csproj
+++ b/src/Batch/Batch.Test/Batch.Test.csproj
@@ -1,4 +1,4 @@
-
+Batch
@@ -13,8 +13,8 @@
-
-
+
+
@@ -29,5 +29,15 @@
+
+
+
+
+
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
\ No newline at end of file
diff --git a/src/Batch/Batch.Test/BatchTestHelpers.cs b/src/Batch/Batch.Test/BatchTestHelpers.cs
index 9dc7541e190e..ae0186e027c6 100644
--- a/src/Batch/Batch.Test/BatchTestHelpers.cs
+++ b/src/Batch/Batch.Test/BatchTestHelpers.cs
@@ -39,10 +39,6 @@ namespace Microsoft.Azure.Commands.Batch.Test
///
public static class BatchTestHelpers
{
- internal static readonly string TestCertificateFileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Resources/BatchTestCert01.cer");
- internal const string TestCertificateAlgorithm = "sha1";
- // [SuppressMessage("Microsoft.Security", "CS002:SecretInNextLine", Justification="Fake password")]
- internal const string TestCertificatePassword = "Passw0rd";
internal static readonly int DefaultQuotaCount = 20;
///
@@ -337,44 +333,6 @@ public static RequestInterceptor ExamineRequestInterceptor(Action assertAc
return interceptor;
}
- ///
- /// Builds a CertificateGetResponse object
- ///
- public static AzureOperationResponse CreateCertificateGetResponse(string thumbprint)
- {
- var response = new AzureOperationResponse();
- response.Response = new HttpResponseMessage(HttpStatusCode.OK);
-
- ProxyModels.Certificate cert = new ProxyModels.Certificate();
- cert.Thumbprint = thumbprint;
-
- response.Body = cert;
-
- return response;
- }
-
- ///
- /// Builds a CertificateListResponse object
- ///
- public static AzureOperationResponse, ProxyModels.CertificateListHeaders> CreateCertificateListResponse(IEnumerable certThumbprints)
- {
- var response = new AzureOperationResponse, ProxyModels.CertificateListHeaders>();
- response.Response = new HttpResponseMessage(HttpStatusCode.OK);
-
- List certs = new List();
-
- foreach (string t in certThumbprints)
- {
- ProxyModels.Certificate cert = new ProxyModels.Certificate();
- cert.Thumbprint = t;
- certs.Add(cert);
- }
-
- response.Body = new MockPagedEnumerable(certs);
-
- return response;
- }
-
///
/// Builds a CloudPoolGetResponse object using a pool ID
///
@@ -842,17 +800,6 @@ public static AzureOperationResponse<
return response;
}
- ///
- /// Builds a NodeFileGetPropertiesResponse object
- ///
- public static AzureOperationResponse CreateGetRemoteDesktOperationResponse()
- {
- var response = new AzureOperationResponse();
- response.Headers = new ProxyModels.ComputeNodeGetRemoteDesktopHeaders();
- response.Body = new MemoryStream();
- return response;
- }
-
///
/// Builds a NodeFileGetPropertiesFromTaskResponse object
///
diff --git a/src/Batch/Batch.Test/Certificates/GetBatchCertificateCommandTests.cs b/src/Batch/Batch.Test/Certificates/GetBatchCertificateCommandTests.cs
deleted file mode 100644
index 7f728c402b26..000000000000
--- a/src/Batch/Batch.Test/Certificates/GetBatchCertificateCommandTests.cs
+++ /dev/null
@@ -1,234 +0,0 @@
-// ----------------------------------------------------------------------------------
-//
-// Copyright Microsoft Corporation
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-// http://www.apache.org/licenses/LICENSE-2.0
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// ----------------------------------------------------------------------------------
-
-using Microsoft.Azure.Batch;
-using Microsoft.Azure.Batch.Protocol;
-using Microsoft.Azure.Commands.Batch.Models;
-using Microsoft.Rest.Azure;
-using Microsoft.WindowsAzure.Commands.ScenarioTest;
-using Moq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Management.Automation;
-using System.Threading.Tasks;
-using Xunit;
-using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient;
-using ProxyModels = Microsoft.Azure.Batch.Protocol.Models;
-
-
-namespace Microsoft.Azure.Commands.Batch.Test.Certificates
-{
- [Obsolete]
- public class GetBatchCertificateCommandTests : WindowsAzure.Commands.Test.Utilities.Common.RMTestBase
- {
- private GetBatchCertificateCommand cmdlet;
- private Mock batchClientMock;
- private Mock commandRuntimeMock;
-
- public GetBatchCertificateCommandTests(Xunit.Abstractions.ITestOutputHelper output)
- {
- ServiceManagement.Common.Models.XunitTracingInterceptor.AddToContext(new ServiceManagement.Common.Models.XunitTracingInterceptor(output));
- batchClientMock = new Mock();
- commandRuntimeMock = new Mock();
- cmdlet = new GetBatchCertificateCommand()
- {
- CommandRuntime = commandRuntimeMock.Object,
- BatchClient = batchClientMock.Object,
- };
- }
-
- [Fact]
- [Trait(Category.AcceptanceType, Category.CheckIn)]
- public void GetBatchCertificateTest()
- {
- // Setup cmdlet to get a cert by its thumbprint
- BatchAccountContext context = BatchTestHelpers.CreateBatchContextWithKeys();
- cmdlet.BatchContext = context;
- cmdlet.ThumbprintAlgorithm = "sha1";
- cmdlet.Thumbprint = "123456789";
- cmdlet.Filter = null;
-
- // Build a Certificate instead of querying the service on a Get Certificate call
- AzureOperationResponse response = BatchTestHelpers.CreateCertificateGetResponse(cmdlet.Thumbprint);
- RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor<
- ProxyModels.CertificateGetOptions,
- AzureOperationResponse>(response);
-
- cmdlet.AdditionalBehaviors = new List() { interceptor };
-
- // Setup the cmdlet to write pipeline output to a list that can be examined later
- List pipeline = new List();
- commandRuntimeMock.Setup(r => r.WriteObject(It.IsAny())).Callback