diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/DatabasesOperations.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/DatabasesOperations.cs index 41488d743cc0e..f2cd283a58d4f 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Generated/DatabasesOperations.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/DatabasesOperations.cs @@ -50,6 +50,210 @@ internal DatabasesOperations(SqlManagementClient client) /// public SqlManagementClient Client { get; private set; } + /// + /// Returns a list of database restore points. + /// + /// + /// The name of the resource group that contains the resource. You can obtain + /// this value from the Azure Resource Manager API or the portal. + /// + /// + /// The name of the server. + /// + /// + /// The name of the database from which to retrieve available restore points. + /// + /// + /// 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 Task>> ListRestorePointsWithHttpMessagesAsync(string resourceGroupName, string serverName, string databaseName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + if (Client.SubscriptionId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); + } + if (resourceGroupName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); + } + if (serverName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "serverName"); + } + if (databaseName == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "databaseName"); + } + string apiVersion = "2014-04-01"; + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("apiVersion", apiVersion); + tracingParameters.Add("resourceGroupName", resourceGroupName); + tracingParameters.Add("serverName", serverName); + tracingParameters.Add("databaseName", databaseName); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "ListRestorePoints", tracingParameters); + } + // Construct URL + var _baseUrl = Client.BaseUri.AbsoluteUri; + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/restorePoints").ToString(); + _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + _url = _url.Replace("{serverName}", System.Uri.EscapeDataString(serverName)); + _url = _url.Replace("{databaseName}", System.Uri.EscapeDataString(databaseName)); + List _queryParameters = new List(); + if (apiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + } + if (_queryParameters.Count > 0) + { + _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); + } + // Create HTTP transport objects + var _httpRequest = new HttpRequestMessage(); + HttpResponseMessage _httpResponse = null; + _httpRequest.Method = new HttpMethod("GET"); + _httpRequest.RequestUri = new System.Uri(_url); + // Set Headers + if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) + { + _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); + } + if (Client.AcceptLanguage != null) + { + if (_httpRequest.Headers.Contains("accept-language")) + { + _httpRequest.Headers.Remove("accept-language"); + } + _httpRequest.Headers.TryAddWithoutValidation("accept-language", 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 (Client.Credentials != null) + { + cancellationToken.ThrowIfCancellationRequested(); + await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + } + // Send Request + if (_shouldTrace) + { + ServiceClientTracing.SendRequest(_invocationId, _httpRequest); + } + cancellationToken.ThrowIfCancellationRequested(); + _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + if (_shouldTrace) + { + ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); + } + HttpStatusCode _statusCode = _httpResponse.StatusCode; + cancellationToken.ThrowIfCancellationRequested(); + string _responseContent = null; + if ((int)_statusCode != 200) + { + var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + try + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + if (_errorBody != null) + { + ex = new CloudException(_errorBody.Message); + ex.Body = _errorBody; + } + } + catch (JsonException) + { + // Ignore the exception + } + ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); + ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } + if (_shouldTrace) + { + ServiceClientTracing.Error(_invocationId, ex); + } + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw ex; + } + // Create Result + var _result = new 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 = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); + } + catch (JsonException ex) + { + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw new SerializationException("Unable to deserialize the response.", _responseContent, ex); + } + } + if (_shouldTrace) + { + ServiceClientTracing.Exit(_invocationId, _result); + } + return _result; + } + /// /// Imports a bacpac into a new database. /// @@ -541,7 +745,8 @@ internal DatabasesOperations(SqlManagementClient client) } /// - /// Failover the database replication link. + /// Sets which replica database is primary by failing over from the current + /// primary replica database. /// /// /// The name of the resource group that contains the resource. You can obtain @@ -570,8 +775,8 @@ internal DatabasesOperations(SqlManagementClient client) } /// - /// Force failover the database replication link, which may result in data - /// loss. + /// Sets which replica database is primary by failing over from the current + /// primary replica database. This operation might result in data loss. /// /// /// The name of the resource group that contains the resource. You can obtain @@ -855,210 +1060,6 @@ internal DatabasesOperations(SqlManagementClient client) return await Client.GetPostOrDeleteOperationResultAsync(_response, customHeaders, cancellationToken).ConfigureAwait(false); } - /// - /// Returns a list of database restore points. - /// - /// - /// The name of the resource group that contains the resource. You can obtain - /// this value from the Azure Resource Manager API or the portal. - /// - /// - /// The name of the server. - /// - /// - /// The name of the database from which to retrieve available restore points. - /// - /// - /// 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 Task>> ListRestorePointsWithHttpMessagesAsync(string resourceGroupName, string serverName, string databaseName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) - { - if (Client.SubscriptionId == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.SubscriptionId"); - } - if (resourceGroupName == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); - } - if (serverName == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "serverName"); - } - if (databaseName == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "databaseName"); - } - string apiVersion = "2014-04-01"; - // Tracing - bool _shouldTrace = ServiceClientTracing.IsEnabled; - string _invocationId = null; - if (_shouldTrace) - { - _invocationId = ServiceClientTracing.NextInvocationId.ToString(); - Dictionary tracingParameters = new Dictionary(); - tracingParameters.Add("apiVersion", apiVersion); - tracingParameters.Add("resourceGroupName", resourceGroupName); - tracingParameters.Add("serverName", serverName); - tracingParameters.Add("databaseName", databaseName); - tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "ListRestorePoints", tracingParameters); - } - // Construct URL - var _baseUrl = Client.BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Sql/servers/{serverName}/databases/{databaseName}/restorePoints").ToString(); - _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); - _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); - _url = _url.Replace("{serverName}", System.Uri.EscapeDataString(serverName)); - _url = _url.Replace("{databaseName}", System.Uri.EscapeDataString(databaseName)); - List _queryParameters = new List(); - if (apiVersion != null) - { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); - } - if (_queryParameters.Count > 0) - { - _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); - } - // Create HTTP transport objects - var _httpRequest = new HttpRequestMessage(); - HttpResponseMessage _httpResponse = null; - _httpRequest.Method = new HttpMethod("GET"); - _httpRequest.RequestUri = new System.Uri(_url); - // Set Headers - if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) - { - _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); - } - if (Client.AcceptLanguage != null) - { - if (_httpRequest.Headers.Contains("accept-language")) - { - _httpRequest.Headers.Remove("accept-language"); - } - _httpRequest.Headers.TryAddWithoutValidation("accept-language", 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 (Client.Credentials != null) - { - cancellationToken.ThrowIfCancellationRequested(); - await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); - } - // Send Request - if (_shouldTrace) - { - ServiceClientTracing.SendRequest(_invocationId, _httpRequest); - } - cancellationToken.ThrowIfCancellationRequested(); - _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); - if (_shouldTrace) - { - ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); - } - HttpStatusCode _statusCode = _httpResponse.StatusCode; - cancellationToken.ThrowIfCancellationRequested(); - string _responseContent = null; - if ((int)_statusCode != 200) - { - var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); - try - { - _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); - CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); - if (_errorBody != null) - { - ex = new CloudException(_errorBody.Message); - ex.Body = _errorBody; - } - } - catch (JsonException) - { - // Ignore the exception - } - ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); - ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); - if (_httpResponse.Headers.Contains("x-ms-request-id")) - { - ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); - } - if (_shouldTrace) - { - ServiceClientTracing.Error(_invocationId, ex); - } - _httpRequest.Dispose(); - if (_httpResponse != null) - { - _httpResponse.Dispose(); - } - throw ex; - } - // Create Result - var _result = new 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 = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); - } - catch (JsonException ex) - { - _httpRequest.Dispose(); - if (_httpResponse != null) - { - _httpResponse.Dispose(); - } - throw new SerializationException("Unable to deserialize the response.", _responseContent, ex); - } - } - if (_shouldTrace) - { - ServiceClientTracing.Exit(_invocationId, _result); - } - return _result; - } - /// /// Creates a new database or updates an existing database. Location is a /// required property in the request body, and it must be the same as the @@ -4229,7 +4230,7 @@ internal DatabasesOperations(SqlManagementClient client) HttpStatusCode _statusCode = _httpResponse.StatusCode; cancellationToken.ThrowIfCancellationRequested(); string _responseContent = null; - if ((int)_statusCode != 200 && (int)_statusCode != 202) + if ((int)_statusCode != 201 && (int)_statusCode != 202) { var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); try @@ -4272,7 +4273,7 @@ internal DatabasesOperations(SqlManagementClient client) _result.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); } // Deserialize Response - if ((int)_statusCode == 200) + if ((int)_statusCode == 201) { _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); try @@ -4519,7 +4520,8 @@ internal DatabasesOperations(SqlManagementClient client) } /// - /// Failover the database replication link. + /// Sets which replica database is primary by failing over from the current + /// primary replica database. /// /// /// The name of the resource group that contains the resource. You can obtain @@ -4711,8 +4713,8 @@ internal DatabasesOperations(SqlManagementClient client) } /// - /// Force failover the database replication link, which may result in data - /// loss. + /// Sets which replica database is primary by failing over from the current + /// primary replica database. This operation might result in data loss. /// /// /// The name of the resource group that contains the resource. You can obtain diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/DatabasesOperationsExtensions.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/DatabasesOperationsExtensions.cs index 62eaef5455777..5409196c33b9c 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Generated/DatabasesOperationsExtensions.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/DatabasesOperationsExtensions.cs @@ -23,6 +23,54 @@ namespace Microsoft.Azure.Management.Sql /// public static partial class DatabasesOperationsExtensions { + /// + /// Returns a list of database restore points. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The name of the resource group that contains the resource. You can obtain + /// this value from the Azure Resource Manager API or the portal. + /// + /// + /// The name of the server. + /// + /// + /// The name of the database from which to retrieve available restore points. + /// + public static IEnumerable ListRestorePoints(this IDatabasesOperations operations, string resourceGroupName, string serverName, string databaseName) + { + return operations.ListRestorePointsAsync(resourceGroupName, serverName, databaseName).GetAwaiter().GetResult(); + } + + /// + /// Returns a list of database restore points. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The name of the resource group that contains the resource. You can obtain + /// this value from the Azure Resource Manager API or the portal. + /// + /// + /// The name of the server. + /// + /// + /// The name of the database from which to retrieve available restore points. + /// + /// + /// The cancellation token. + /// + public static async Task> ListRestorePointsAsync(this IDatabasesOperations operations, string resourceGroupName, string serverName, string databaseName, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.ListRestorePointsWithHttpMessagesAsync(resourceGroupName, serverName, databaseName, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + /// /// Imports a bacpac into a new database. /// @@ -287,7 +335,8 @@ public static ReplicationLink GetReplicationLink(this IDatabasesOperations opera } /// - /// Failover the database replication link. + /// Sets which replica database is primary by failing over from the current + /// primary replica database. /// /// /// The operations group for this extension method. @@ -311,7 +360,8 @@ public static void FailoverReplicationLink(this IDatabasesOperations operations, } /// - /// Failover the database replication link. + /// Sets which replica database is primary by failing over from the current + /// primary replica database. /// /// /// The operations group for this extension method. @@ -338,8 +388,8 @@ public static void FailoverReplicationLink(this IDatabasesOperations operations, } /// - /// Force failover the database replication link, which may result in data - /// loss. + /// Sets which replica database is primary by failing over from the current + /// primary replica database. This operation might result in data loss. /// /// /// The operations group for this extension method. @@ -363,8 +413,8 @@ public static void FailoverReplicationLinkAllowDataLoss(this IDatabasesOperation } /// - /// Force failover the database replication link, which may result in data - /// loss. + /// Sets which replica database is primary by failing over from the current + /// primary replica database. This operation might result in data loss. /// /// /// The operations group for this extension method. @@ -528,54 +578,6 @@ public static void Resume(this IDatabasesOperations operations, string resourceG (await operations.ResumeWithHttpMessagesAsync(resourceGroupName, serverName, databaseName, null, cancellationToken).ConfigureAwait(false)).Dispose(); } - /// - /// Returns a list of database restore points. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The name of the resource group that contains the resource. You can obtain - /// this value from the Azure Resource Manager API or the portal. - /// - /// - /// The name of the server. - /// - /// - /// The name of the database from which to retrieve available restore points. - /// - public static IEnumerable ListRestorePoints(this IDatabasesOperations operations, string resourceGroupName, string serverName, string databaseName) - { - return operations.ListRestorePointsAsync(resourceGroupName, serverName, databaseName).GetAwaiter().GetResult(); - } - - /// - /// Returns a list of database restore points. - /// - /// - /// The operations group for this extension method. - /// - /// - /// The name of the resource group that contains the resource. You can obtain - /// this value from the Azure Resource Manager API or the portal. - /// - /// - /// The name of the server. - /// - /// - /// The name of the database from which to retrieve available restore points. - /// - /// - /// The cancellation token. - /// - public static async Task> ListRestorePointsAsync(this IDatabasesOperations operations, string resourceGroupName, string serverName, string databaseName, CancellationToken cancellationToken = default(CancellationToken)) - { - using (var _result = await operations.ListRestorePointsWithHttpMessagesAsync(resourceGroupName, serverName, databaseName, null, cancellationToken).ConfigureAwait(false)) - { - return _result.Body; - } - } - /// /// Creates a new database or updates an existing database. Location is a /// required property in the request body, and it must be the same as the @@ -1464,7 +1466,8 @@ public static ImportExportResponse BeginExport(this IDatabasesOperations operati } /// - /// Failover the database replication link. + /// Sets which replica database is primary by failing over from the current + /// primary replica database. /// /// /// The operations group for this extension method. @@ -1488,7 +1491,8 @@ public static void BeginFailoverReplicationLink(this IDatabasesOperations operat } /// - /// Failover the database replication link. + /// Sets which replica database is primary by failing over from the current + /// primary replica database. /// /// /// The operations group for this extension method. @@ -1515,8 +1519,8 @@ public static void BeginFailoverReplicationLink(this IDatabasesOperations operat } /// - /// Force failover the database replication link, which may result in data - /// loss. + /// Sets which replica database is primary by failing over from the current + /// primary replica database. This operation might result in data loss. /// /// /// The operations group for this extension method. @@ -1540,8 +1544,8 @@ public static void BeginFailoverReplicationLinkAllowDataLoss(this IDatabasesOper } /// - /// Force failover the database replication link, which may result in data - /// loss. + /// Sets which replica database is primary by failing over from the current + /// primary replica database. This operation might result in data loss. /// /// /// The operations group for this extension method. diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/IDatabasesOperations.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/IDatabasesOperations.cs index 900aff3864846..b2e6f54226e9e 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Generated/IDatabasesOperations.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/IDatabasesOperations.cs @@ -23,6 +23,37 @@ namespace Microsoft.Azure.Management.Sql /// public partial interface IDatabasesOperations { + /// + /// Returns a list of database restore points. + /// + /// + /// The name of the resource group that contains the resource. You can + /// obtain this value from the Azure Resource Manager API or the + /// portal. + /// + /// + /// The name of the server. + /// + /// + /// The name of the database from which to retrieve available restore + /// points. + /// + /// + /// 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 + /// + /// + /// Thrown when a required parameter is null + /// + Task>> ListRestorePointsWithHttpMessagesAsync(string resourceGroupName, string serverName, string databaseName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Imports a bacpac into a new database. /// @@ -186,7 +217,8 @@ public partial interface IDatabasesOperations /// Task> GetReplicationLinkWithHttpMessagesAsync(string resourceGroupName, string serverName, string databaseName, string linkId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Failover the database replication link. + /// Sets which replica database is primary by failing over from the + /// current primary replica database. /// /// /// The name of the resource group that contains the resource. You can @@ -217,7 +249,8 @@ public partial interface IDatabasesOperations /// Task FailoverReplicationLinkWithHttpMessagesAsync(string resourceGroupName, string serverName, string databaseName, string linkId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Force failover the database replication link, which may result in + /// Sets which replica database is primary by failing over from the + /// current primary replica database. This operation might result in /// data loss. /// /// @@ -333,37 +366,6 @@ public partial interface IDatabasesOperations /// Task ResumeWithHttpMessagesAsync(string resourceGroupName, string serverName, string databaseName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Returns a list of database restore points. - /// - /// - /// The name of the resource group that contains the resource. You can - /// obtain this value from the Azure Resource Manager API or the - /// portal. - /// - /// - /// The name of the server. - /// - /// - /// The name of the database from which to retrieve available restore - /// points. - /// - /// - /// 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 - /// - /// - /// Thrown when a required parameter is null - /// - Task>> ListRestorePointsWithHttpMessagesAsync(string resourceGroupName, string serverName, string databaseName, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - /// /// Creates a new database or updates an existing database. Location is /// a required property in the request body, and it must be the same as /// the location of the SQL server. @@ -915,7 +917,8 @@ public partial interface IDatabasesOperations /// Task> BeginExportWithHttpMessagesAsync(string resourceGroupName, string serverName, string databaseName, ExportRequest parameters, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Failover the database replication link. + /// Sets which replica database is primary by failing over from the + /// current primary replica database. /// /// /// The name of the resource group that contains the resource. You can @@ -946,7 +949,8 @@ public partial interface IDatabasesOperations /// Task BeginFailoverReplicationLinkWithHttpMessagesAsync(string resourceGroupName, string serverName, string databaseName, string linkId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Force failover the database replication link, which may result in + /// Sets which replica database is primary by failing over from the + /// current primary replica database. This operation might result in /// data loss. /// /// diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/IOperations.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/IOperations.cs new file mode 100644 index 0000000000000..1a8426cc17ab1 --- /dev/null +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/IOperations.cs @@ -0,0 +1,46 @@ +// 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 1.0.1.0 +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. + +namespace Microsoft.Azure.Management.Sql +{ + using Microsoft.Azure; + using Microsoft.Azure.Management; + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Models; + using System.Collections; + using System.Collections.Generic; + using System.Threading; + using System.Threading.Tasks; + + /// + /// Operations operations. + /// + public partial interface IOperations + { + /// + /// Lists all of the available SQL Rest API operations. + /// + /// + /// 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 + /// + /// + /// Thrown when a required parameter is null + /// + Task> ListWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + } +} diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/ISqlManagementClient.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/ISqlManagementClient.cs index 93b598e8f2977..f83a0f482b189 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Generated/ISqlManagementClient.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/ISqlManagementClient.cs @@ -14,10 +14,6 @@ namespace Microsoft.Azure.Management.Sql using Microsoft.Rest.Azure; using Models; using Newtonsoft.Json; - using System.Collections; - using System.Collections.Generic; - using System.Threading; - using System.Threading.Tasks; /// /// The Azure SQL Database management API provides a RESTful set of web @@ -70,6 +66,11 @@ public partial interface ISqlManagementClient : System.IDisposable bool? GenerateClientRequestId { get; set; } + /// + /// Gets the IDatabasesOperations. + /// + IDatabasesOperations Databases { get; } + /// /// Gets the ICapabilitiesOperations. /// @@ -81,9 +82,9 @@ public partial interface ISqlManagementClient : System.IDisposable IFirewallRulesOperations FirewallRules { get; } /// - /// Gets the IDatabasesOperations. + /// Gets the IOperations. /// - IDatabasesOperations Databases { get; } + IOperations Operations { get; } /// /// Gets the IServersOperations. @@ -100,16 +101,5 @@ public partial interface ISqlManagementClient : System.IDisposable /// IRecommendedElasticPoolsOperations RecommendedElasticPools { get; } - /// - /// Lists all of the available SQL Rest API operations. - /// - /// - /// The headers that will be added to request. - /// - /// - /// The cancellation token. - /// - Task> ListOperationsWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); - } } diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/Database.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/Database.cs index 4d182d173fcda..de22f48eb6a61 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/Database.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/Database.cs @@ -182,7 +182,7 @@ public Database() /// apply when creating this database. If createMode is not Default, /// this value is ignored. Not supported for DataWarehouse edition. /// Possible values include: 'AdventureWorksLT' - public Database(string location, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), string kind = default(string), string collation = default(string), System.DateTime? creationDate = default(System.DateTime?), long? containmentState = default(long?), System.Guid? currentServiceObjectiveId = default(System.Guid?), string databaseId = default(string), System.DateTime? earliestRestoreDate = default(System.DateTime?), string createMode = default(string), string sourceDatabaseId = default(string), System.DateTime? sourceDatabaseDeletionDate = default(System.DateTime?), System.DateTime? restorePointInTime = default(System.DateTime?), System.DateTime? recoveryServicesRecoveryPointResourceId = default(System.DateTime?), string edition = default(string), string maxSizeBytes = default(string), System.Guid? requestedServiceObjectiveId = default(System.Guid?), string requestedServiceObjectiveName = default(string), string serviceLevelObjective = default(string), string status = default(string), string elasticPoolName = default(string), string defaultSecondaryLocation = default(string), IList serviceTierAdvisors = default(IList), IList transparentDataEncryption = default(IList), IList recommendedIndex = default(IList), System.Guid? failoverGroupId = default(System.Guid?), ReadScale? readScale = default(ReadScale?), string sampleName = default(string)) + public Database(string location, string id = default(string), string name = default(string), string type = default(string), IDictionary tags = default(IDictionary), string kind = default(string), string collation = default(string), System.DateTime? creationDate = default(System.DateTime?), long? containmentState = default(long?), System.Guid? currentServiceObjectiveId = default(System.Guid?), System.Guid? databaseId = default(System.Guid?), System.DateTime? earliestRestoreDate = default(System.DateTime?), string createMode = default(string), string sourceDatabaseId = default(string), System.DateTime? sourceDatabaseDeletionDate = default(System.DateTime?), System.DateTime? restorePointInTime = default(System.DateTime?), string recoveryServicesRecoveryPointResourceId = default(string), string edition = default(string), string maxSizeBytes = default(string), System.Guid? requestedServiceObjectiveId = default(System.Guid?), string requestedServiceObjectiveName = default(string), string serviceLevelObjective = default(string), string status = default(string), string elasticPoolName = default(string), string defaultSecondaryLocation = default(string), IList serviceTierAdvisors = default(IList), IList transparentDataEncryption = default(IList), IList recommendedIndex = default(IList), System.Guid? failoverGroupId = default(System.Guid?), ReadScale? readScale = default(ReadScale?), string sampleName = default(string)) : base(location, id, name, type, tags) { Kind = kind; @@ -256,7 +256,7 @@ public Database() /// Gets the ID of the database. /// [JsonProperty(PropertyName = "properties.databaseId")] - public string DatabaseId { get; private set; } + public System.Guid? DatabaseId { get; private set; } /// /// Gets this records the earliest start date and time that restore is @@ -348,7 +348,7 @@ public Database() /// Specifies the resource ID of the recovery point to restore from. /// [JsonProperty(PropertyName = "properties.recoveryServicesRecoveryPointResourceId")] - public System.DateTime? RecoveryServicesRecoveryPointResourceId { get; set; } + public string RecoveryServicesRecoveryPointResourceId { get; set; } /// /// Gets or sets the edition of the database. The DatabaseEditions diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/EditionCapability.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/EditionCapability.cs index b92c36f309472..e24e918a4c847 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/EditionCapability.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/EditionCapability.cs @@ -17,7 +17,7 @@ namespace Microsoft.Azure.Management.Sql.Models using System.Linq; /// - /// The server edition capabilities. + /// The database edition capabilities. /// public partial class EditionCapability { @@ -33,9 +33,8 @@ public EditionCapability() /// Initializes a new instance of the EditionCapability class. /// /// The edition name. - /// The status of the server edition. Possible - /// values include: 'Visible', 'Available', 'Default', - /// 'Disabled' + /// The status of the edition. Possible values + /// include: 'Visible', 'Available', 'Default', 'Disabled' /// The list of supported /// service objectives for the edition. public EditionCapability(string name = default(string), CapabilityStatus? status = default(CapabilityStatus?), IList supportedServiceLevelObjectives = default(IList)) @@ -58,8 +57,8 @@ public EditionCapability() public string Name { get; private set; } /// - /// Gets the status of the server edition. Possible values include: - /// 'Visible', 'Available', 'Default', 'Disabled' + /// Gets the status of the edition. Possible values include: 'Visible', + /// 'Available', 'Default', 'Disabled' /// [JsonProperty(PropertyName = "status")] public CapabilityStatus? Status { get; private set; } diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolActivity.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolActivity.cs index 1ff2dab1c974e..238237c6cb240 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolActivity.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolActivity.cs @@ -72,7 +72,7 @@ public ElasticPoolActivity() /// DTU cap. /// The requested DTU /// guarantee. - public ElasticPoolActivity(string id = default(string), string name = default(string), string type = default(string), string location = default(string), System.DateTime? endTime = default(System.DateTime?), int? errorCode = default(int?), string errorMessage = default(string), int? errorSeverity = default(int?), string operation = default(string), string operationId = default(string), int? percentComplete = default(int?), int? requestedDatabaseDtuMax = default(int?), int? requestedDatabaseDtuMin = default(int?), int? requestedDtu = default(int?), string requestedElasticPoolName = default(string), long? requestedStorageLimitInGB = default(long?), string elasticPoolName = default(string), string serverName = default(string), System.DateTime? startTime = default(System.DateTime?), string state = default(string), int? requestedStorageLimitInMB = default(int?), int? requestedDatabaseDtuGuarantee = default(int?), int? requestedDatabaseDtuCap = default(int?), int? requestedDtuGuarantee = default(int?)) + public ElasticPoolActivity(string id = default(string), string name = default(string), string type = default(string), string location = default(string), System.DateTime? endTime = default(System.DateTime?), int? errorCode = default(int?), string errorMessage = default(string), int? errorSeverity = default(int?), string operation = default(string), System.Guid operationId = default(System.Guid), int? percentComplete = default(int?), int? requestedDatabaseDtuMax = default(int?), int? requestedDatabaseDtuMin = default(int?), int? requestedDtu = default(int?), string requestedElasticPoolName = default(string), long? requestedStorageLimitInGB = default(long?), string elasticPoolName = default(string), string serverName = default(string), System.DateTime? startTime = default(System.DateTime?), string state = default(string), int? requestedStorageLimitInMB = default(int?), int? requestedDatabaseDtuGuarantee = default(int?), int? requestedDatabaseDtuCap = default(int?), int? requestedDtuGuarantee = default(int?)) : base(id, name, type) { Location = location; @@ -144,7 +144,7 @@ public ElasticPoolActivity() /// Gets the unique operation ID. /// [JsonProperty(PropertyName = "properties.operationId")] - public string OperationId { get; private set; } + public System.Guid OperationId { get; private set; } /// /// Gets the percentage complete if available. diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolDatabaseActivity.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolDatabaseActivity.cs index fc7f7db514cc4..65c6ca9940a38 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolDatabaseActivity.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolDatabaseActivity.cs @@ -64,7 +64,7 @@ public ElasticPoolDatabaseActivity() /// The time the operation started (ISO8601 /// format). /// The current state of the operation. - public ElasticPoolDatabaseActivity(string id = default(string), string name = default(string), string type = default(string), string location = default(string), string databaseName = default(string), System.DateTime? endTime = default(System.DateTime?), int? errorCode = default(int?), string errorMessage = default(string), int? errorSeverity = default(int?), string operation = default(string), System.Guid? operationId = default(System.Guid?), int? percentComplete = default(int?), string requestedElasticPoolName = default(string), string currentElasticPoolName = default(string), string currentServiceObjective = default(string), string requestedServiceObjective = default(string), string serverName = default(string), System.DateTime? startTime = default(System.DateTime?), string state = default(string)) + public ElasticPoolDatabaseActivity(string id = default(string), string name = default(string), string type = default(string), string location = default(string), string databaseName = default(string), System.DateTime? endTime = default(System.DateTime?), int? errorCode = default(int?), string errorMessage = default(string), int? errorSeverity = default(int?), string operation = default(string), System.Guid operationId = default(System.Guid), int? percentComplete = default(int?), string requestedElasticPoolName = default(string), string currentElasticPoolName = default(string), string currentServiceObjective = default(string), string requestedServiceObjective = default(string), string serverName = default(string), System.DateTime? startTime = default(System.DateTime?), string state = default(string)) : base(id, name, type) { Location = location; @@ -137,7 +137,7 @@ public ElasticPoolDatabaseActivity() /// Gets the unique operation ID. /// [JsonProperty(PropertyName = "properties.operationId")] - public System.Guid? OperationId { get; private set; } + public System.Guid OperationId { get; private set; } /// /// Gets the percentage complete if available. diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolDtuCapability.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolDtuCapability.cs new file mode 100644 index 0000000000000..719f99c54c675 --- /dev/null +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolDtuCapability.cs @@ -0,0 +1,110 @@ +// 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 1.0.1.0 +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. + +namespace Microsoft.Azure.Management.Sql.Models +{ + using Microsoft.Azure; + using Microsoft.Azure.Management; + using Microsoft.Azure.Management.Sql; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// The Elastic Pool DTU capability. + /// + public partial class ElasticPoolDtuCapability + { + /// + /// Initializes a new instance of the ElasticPoolDtuCapability class. + /// + public ElasticPoolDtuCapability() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ElasticPoolDtuCapability class. + /// + /// The maximum size of the database (see 'unit' + /// for the units). + /// The maximum number of databases + /// supported. + /// The status of the capability. Possible values + /// include: 'Visible', 'Available', 'Default', 'Disabled' + /// The list of supported max + /// sizes. + /// The included (free) max size for this + /// service level objective. + /// The list of supported + /// max database sizes. + /// The list of supported max + /// database DTUs. + public ElasticPoolDtuCapability(long? limit = default(long?), long? maxDatabaseCount = default(long?), CapabilityStatus? status = default(CapabilityStatus?), IList supportedMaxSizes = default(IList), MaxSizeCapability includedMaxSize = default(MaxSizeCapability), IList supportedPerDatabaseMaxSizes = default(IList), IList supportedPerDatabaseMaxDtus = default(IList)) + { + Limit = limit; + MaxDatabaseCount = maxDatabaseCount; + Status = status; + SupportedMaxSizes = supportedMaxSizes; + IncludedMaxSize = includedMaxSize; + SupportedPerDatabaseMaxSizes = supportedPerDatabaseMaxSizes; + SupportedPerDatabaseMaxDtus = supportedPerDatabaseMaxDtus; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets the maximum size of the database (see 'unit' for the units). + /// + [JsonProperty(PropertyName = "limit")] + public long? Limit { get; private set; } + + /// + /// Gets the maximum number of databases supported. + /// + [JsonProperty(PropertyName = "maxDatabaseCount")] + public long? MaxDatabaseCount { get; private set; } + + /// + /// Gets the status of the capability. Possible values include: + /// 'Visible', 'Available', 'Default', 'Disabled' + /// + [JsonProperty(PropertyName = "status")] + public CapabilityStatus? Status { get; private set; } + + /// + /// Gets the list of supported max sizes. + /// + [JsonProperty(PropertyName = "supportedMaxSizes")] + public IList SupportedMaxSizes { get; private set; } + + /// + /// Gets the included (free) max size for this service level objective. + /// + [JsonProperty(PropertyName = "includedMaxSize")] + public MaxSizeCapability IncludedMaxSize { get; private set; } + + /// + /// Gets the list of supported max database sizes. + /// + [JsonProperty(PropertyName = "supportedPerDatabaseMaxSizes")] + public IList SupportedPerDatabaseMaxSizes { get; private set; } + + /// + /// Gets the list of supported max database DTUs. + /// + [JsonProperty(PropertyName = "supportedPerDatabaseMaxDtus")] + public IList SupportedPerDatabaseMaxDtus { get; private set; } + + } +} diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolEditionCapability.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolEditionCapability.cs new file mode 100644 index 0000000000000..722421f054486 --- /dev/null +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolEditionCapability.cs @@ -0,0 +1,76 @@ +// 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 1.0.1.0 +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. + +namespace Microsoft.Azure.Management.Sql.Models +{ + using Microsoft.Azure; + using Microsoft.Azure.Management; + using Microsoft.Azure.Management.Sql; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// The elastic pool edition capabilities. + /// + public partial class ElasticPoolEditionCapability + { + /// + /// Initializes a new instance of the ElasticPoolEditionCapability + /// class. + /// + public ElasticPoolEditionCapability() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ElasticPoolEditionCapability + /// class. + /// + /// The elastic pool edition name. + /// The status of the elastic pool edition. + /// Possible values include: 'Visible', 'Available', 'Default', + /// 'Disabled' + /// The list of supported + /// elastic pool DTU levels for the edition. + public ElasticPoolEditionCapability(string name = default(string), CapabilityStatus? status = default(CapabilityStatus?), IList supportedElasticPoolDtus = default(IList)) + { + Name = name; + Status = status; + SupportedElasticPoolDtus = supportedElasticPoolDtus; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets the elastic pool edition name. + /// + [JsonProperty(PropertyName = "name")] + public string Name { get; private set; } + + /// + /// Gets the status of the elastic pool edition. Possible values + /// include: 'Visible', 'Available', 'Default', 'Disabled' + /// + [JsonProperty(PropertyName = "status")] + public CapabilityStatus? Status { get; private set; } + + /// + /// Gets the list of supported elastic pool DTU levels for the edition. + /// + [JsonProperty(PropertyName = "supportedElasticPoolDtus")] + public IList SupportedElasticPoolDtus { get; private set; } + + } +} diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolPerDatabaseMaxDtuCapability.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolPerDatabaseMaxDtuCapability.cs new file mode 100644 index 0000000000000..bc712fca7ac48 --- /dev/null +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolPerDatabaseMaxDtuCapability.cs @@ -0,0 +1,75 @@ +// 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 1.0.1.0 +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. + +namespace Microsoft.Azure.Management.Sql.Models +{ + using Microsoft.Azure; + using Microsoft.Azure.Management; + using Microsoft.Azure.Management.Sql; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// The max per-database DTU capability. + /// + public partial class ElasticPoolPerDatabaseMaxDtuCapability + { + /// + /// Initializes a new instance of the + /// ElasticPoolPerDatabaseMaxDtuCapability class. + /// + public ElasticPoolPerDatabaseMaxDtuCapability() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the + /// ElasticPoolPerDatabaseMaxDtuCapability class. + /// + /// The maximum DTUs per database. + /// The status of the capability. Possible values + /// include: 'Visible', 'Available', 'Default', 'Disabled' + /// The list of supported min + /// database DTUs. + public ElasticPoolPerDatabaseMaxDtuCapability(long? limit = default(long?), CapabilityStatus? status = default(CapabilityStatus?), IList supportedPerDatabaseMinDtus = default(IList)) + { + Limit = limit; + Status = status; + SupportedPerDatabaseMinDtus = supportedPerDatabaseMinDtus; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets the maximum DTUs per database. + /// + [JsonProperty(PropertyName = "limit")] + public long? Limit { get; private set; } + + /// + /// Gets the status of the capability. Possible values include: + /// 'Visible', 'Available', 'Default', 'Disabled' + /// + [JsonProperty(PropertyName = "status")] + public CapabilityStatus? Status { get; private set; } + + /// + /// Gets the list of supported min database DTUs. + /// + [JsonProperty(PropertyName = "supportedPerDatabaseMinDtus")] + public IList SupportedPerDatabaseMinDtus { get; private set; } + + } +} diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolPerDatabaseMinDtuCapability.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolPerDatabaseMinDtuCapability.cs new file mode 100644 index 0000000000000..64ce35a609bd3 --- /dev/null +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ElasticPoolPerDatabaseMinDtuCapability.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 1.0.1.0 +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. + +namespace Microsoft.Azure.Management.Sql.Models +{ + using Microsoft.Azure; + using Microsoft.Azure.Management; + using Microsoft.Azure.Management.Sql; + using Newtonsoft.Json; + using System.Linq; + + /// + /// The minimum per-database DTU capability. + /// + public partial class ElasticPoolPerDatabaseMinDtuCapability + { + /// + /// Initializes a new instance of the + /// ElasticPoolPerDatabaseMinDtuCapability class. + /// + public ElasticPoolPerDatabaseMinDtuCapability() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the + /// ElasticPoolPerDatabaseMinDtuCapability class. + /// + /// The maximum DTUs per database. + /// The status of the capability. Possible values + /// include: 'Visible', 'Available', 'Default', 'Disabled' + public ElasticPoolPerDatabaseMinDtuCapability(long? limit = default(long?), CapabilityStatus? status = default(CapabilityStatus?)) + { + Limit = limit; + Status = status; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets the maximum DTUs per database. + /// + [JsonProperty(PropertyName = "limit")] + public long? Limit { get; private set; } + + /// + /// Gets the status of the capability. Possible values include: + /// 'Visible', 'Available', 'Default', 'Disabled' + /// + [JsonProperty(PropertyName = "status")] + public CapabilityStatus? Status { get; private set; } + + } +} diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ExportRequest.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ExportRequest.cs index 2bab235231e43..aabdc4a719e14 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ExportRequest.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ExportRequest.cs @@ -32,9 +32,10 @@ public ExportRequest() /// Initializes a new instance of the ExportRequest class. /// /// The type of the storage key to use. - /// Valid values are StorageAccessKey and SharedAccessKey. Possible - /// values include: 'StorageAccessKey', 'SharedAccessKey' - /// The storage key to use. + /// Possible values include: 'StorageAccessKey', + /// 'SharedAccessKey' + /// The storage key to use. If storage key + /// type is SharedAccessKey, it must be preceded with a "?." /// The storage uri to use. /// The name of the SQL /// administrator. @@ -59,15 +60,15 @@ public ExportRequest() partial void CustomInit(); /// - /// Gets or sets the type of the storage key to use. Valid values are - /// StorageAccessKey and SharedAccessKey. Possible values include: - /// 'StorageAccessKey', 'SharedAccessKey' + /// Gets or sets the type of the storage key to use. Possible values + /// include: 'StorageAccessKey', 'SharedAccessKey' /// [JsonProperty(PropertyName = "storageKeyType")] public StorageKeyType StorageKeyType { get; set; } /// - /// Gets or sets the storage key to use. + /// Gets or sets the storage key to use. If storage key type is + /// SharedAccessKey, it must be preceded with a "?." /// [JsonProperty(PropertyName = "storageKey")] public string StorageKey { get; set; } diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ImportExtensionRequest.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ImportExtensionRequest.cs index 7eeebd1cdad62..0fb1e533af13f 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ImportExtensionRequest.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ImportExtensionRequest.cs @@ -34,9 +34,10 @@ public ImportExtensionRequest() /// Initializes a new instance of the ImportExtensionRequest class. /// /// The type of the storage key to use. - /// Valid values are StorageAccessKey and SharedAccessKey. Possible - /// values include: 'StorageAccessKey', 'SharedAccessKey' - /// The storage key to use. + /// Possible values include: 'StorageAccessKey', + /// 'SharedAccessKey' + /// The storage key to use. If storage key + /// type is SharedAccessKey, it must be preceded with a "?." /// The storage uri to use. /// The name of the SQL /// administrator. @@ -84,15 +85,15 @@ static ImportExtensionRequest() public string Type { get; set; } /// - /// Gets or sets the type of the storage key to use. Valid values are - /// StorageAccessKey and SharedAccessKey. Possible values include: - /// 'StorageAccessKey', 'SharedAccessKey' + /// Gets or sets the type of the storage key to use. Possible values + /// include: 'StorageAccessKey', 'SharedAccessKey' /// [JsonProperty(PropertyName = "properties.storageKeyType")] public StorageKeyType StorageKeyType { get; set; } /// - /// Gets or sets the storage key to use. + /// Gets or sets the storage key to use. If storage key type is + /// SharedAccessKey, it must be preceded with a "?." /// [JsonProperty(PropertyName = "properties.storageKey")] public string StorageKey { get; set; } diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ImportRequest.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ImportRequest.cs index 6df04fcd36554..6410cc33c6d1f 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ImportRequest.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ImportRequest.cs @@ -32,9 +32,10 @@ public ImportRequest() /// Initializes a new instance of the ImportRequest class. /// /// The type of the storage key to use. - /// Valid values are StorageAccessKey and SharedAccessKey. Possible - /// values include: 'StorageAccessKey', 'SharedAccessKey' - /// The storage key to use. + /// Possible values include: 'StorageAccessKey', + /// 'SharedAccessKey' + /// The storage key to use. If storage key + /// type is SharedAccessKey, it must be preceded with a "?." /// The storage uri to use. /// The name of the SQL /// administrator. diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/MaxSizeCapability.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/MaxSizeCapability.cs index da1999e312635..04ba61d3821ec 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/MaxSizeCapability.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/MaxSizeCapability.cs @@ -38,7 +38,7 @@ public MaxSizeCapability() /// The status of the maximum size capability. /// Possible values include: 'Visible', 'Available', 'Default', /// 'Disabled' - public MaxSizeCapability(long? limit = default(long?), MaxSizeUnits? unit = default(MaxSizeUnits?), CapabilityStatus? status = default(CapabilityStatus?)) + public MaxSizeCapability(long limit = default(long), MaxSizeUnits? unit = default(MaxSizeUnits?), CapabilityStatus? status = default(CapabilityStatus?)) { Limit = limit; Unit = unit; @@ -55,7 +55,7 @@ public MaxSizeCapability() /// Gets the maximum size of the database (see 'unit' for the units). /// [JsonProperty(PropertyName = "limit")] - public long? Limit { get; private set; } + public long Limit { get; private set; } /// /// Gets the units that the limit is expressed in. Possible values diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ServerVersionCapability.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ServerVersionCapability.cs index 0b8db04a770d4..8cfe4fc541919 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ServerVersionCapability.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ServerVersionCapability.cs @@ -36,13 +36,16 @@ public ServerVersionCapability() /// The status of the server version. Possible /// values include: 'Visible', 'Available', 'Default', /// 'Disabled' - /// The list of supported server + /// The list of supported database /// editions. - public ServerVersionCapability(string name = default(string), CapabilityStatus? status = default(CapabilityStatus?), IList supportedEditions = default(IList)) + /// The list of supported + /// elastic pool editions. + public ServerVersionCapability(string name = default(string), CapabilityStatus? status = default(CapabilityStatus?), IList supportedEditions = default(IList), IList supportedElasticPoolEditions = default(IList)) { Name = name; Status = status; SupportedEditions = supportedEditions; + SupportedElasticPoolEditions = supportedElasticPoolEditions; CustomInit(); } @@ -65,10 +68,16 @@ public ServerVersionCapability() public CapabilityStatus? Status { get; private set; } /// - /// Gets the list of supported server editions. + /// Gets the list of supported database editions. /// [JsonProperty(PropertyName = "supportedEditions")] public IList SupportedEditions { get; private set; } + /// + /// Gets the list of supported elastic pool editions. + /// + [JsonProperty(PropertyName = "supportedElasticPoolEditions")] + public IList SupportedElasticPoolEditions { get; private set; } + } } diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ServiceObjective.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ServiceObjective.cs index b78063329577a..18d5267140c23 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ServiceObjective.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ServiceObjective.cs @@ -45,7 +45,7 @@ public ServiceObjective() /// objective. /// Gets whether the service level objective is /// enabled. - public ServiceObjective(string name = default(string), string id = default(string), string serviceObjectiveName = default(string), bool? isDefault = default(bool?), bool? isSystem = default(bool?), string description = default(string), bool? enabled = default(bool?)) + public ServiceObjective(string name = default(string), string id = default(string), string serviceObjectiveName = default(string), bool isDefault = default(bool), bool isSystem = default(bool), string description = default(string), bool enabled = default(bool)) : base(name, id) { ServiceObjectiveName = serviceObjectiveName; @@ -72,14 +72,14 @@ public ServiceObjective() /// objective. /// [JsonProperty(PropertyName = "properties.isDefault")] - public bool? IsDefault { get; private set; } + public bool IsDefault { get; private set; } /// /// Gets whether the service level objective is a system service /// objective. /// [JsonProperty(PropertyName = "properties.isSystem")] - public bool? IsSystem { get; private set; } + public bool IsSystem { get; private set; } /// /// Gets the description for the service level objective. @@ -91,7 +91,7 @@ public ServiceObjective() /// Gets whether the service level objective is enabled. /// [JsonProperty(PropertyName = "properties.enabled")] - public bool? Enabled { get; private set; } + public bool Enabled { get; private set; } } } diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ServiceObjectiveCapability.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ServiceObjectiveCapability.cs index ece14b5ac26f9..6030fc2b46577 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ServiceObjectiveCapability.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ServiceObjectiveCapability.cs @@ -19,7 +19,7 @@ namespace Microsoft.Azure.Management.Sql.Models using System.Linq; /// - /// The service objectives capabilities. + /// The service objectives capability. /// [Rest.Serialization.JsonTransformation] public partial class ServiceObjectiveCapability @@ -45,7 +45,9 @@ public ServiceObjectiveCapability() /// The unique ID of the service objective. /// The list of supported maximum /// database sizes for this service objective. - public ServiceObjectiveCapability(string name = default(string), CapabilityStatus? status = default(CapabilityStatus?), PerformanceLevelUnit? unit = default(PerformanceLevelUnit?), int? value = default(int?), string id = default(string), IList supportedMaxSizes = default(IList)) + /// The included (free) max size for this + /// service level objective. + public ServiceObjectiveCapability(string name = default(string), CapabilityStatus? status = default(CapabilityStatus?), PerformanceLevelUnit? unit = default(PerformanceLevelUnit?), int? value = default(int?), System.Guid id = default(System.Guid), IList supportedMaxSizes = default(IList), MaxSizeCapability includedMaxSize = default(MaxSizeCapability)) { Name = name; Status = status; @@ -53,6 +55,7 @@ public ServiceObjectiveCapability() Value = value; Id = id; SupportedMaxSizes = supportedMaxSizes; + IncludedMaxSize = includedMaxSize; CustomInit(); } @@ -91,7 +94,7 @@ public ServiceObjectiveCapability() /// Gets the unique ID of the service objective. /// [JsonProperty(PropertyName = "id")] - public string Id { get; private set; } + public System.Guid Id { get; private set; } /// /// Gets the list of supported maximum database sizes for this service @@ -100,5 +103,11 @@ public ServiceObjectiveCapability() [JsonProperty(PropertyName = "supportedMaxSizes")] public IList SupportedMaxSizes { get; private set; } + /// + /// Gets the included (free) max size for this service level objective. + /// + [JsonProperty(PropertyName = "includedMaxSize")] + public MaxSizeCapability IncludedMaxSize { get; private set; } + } } diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ServiceTierAdvisor.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ServiceTierAdvisor.cs index 241948908b8a1..c8badcd1090ea 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ServiceTierAdvisor.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/ServiceTierAdvisor.cs @@ -88,7 +88,7 @@ public ServiceTierAdvisor() /// advisor. /// Gets or sets confidence for service tier /// advisor. - public ServiceTierAdvisor(string name = default(string), string id = default(string), System.DateTime? observationPeriodStart = default(System.DateTime?), System.DateTime? observationPeriodEnd = default(System.DateTime?), double? activeTimeRatio = default(double?), double? minDtu = default(double?), double? avgDtu = default(double?), double? maxDtu = default(double?), double? maxSizeInGB = default(double?), IList serviceLevelObjectiveUsageMetrics = default(IList), string currentServiceLevelObjective = default(string), System.Guid? currentServiceLevelObjectiveId = default(System.Guid?), string usageBasedRecommendationServiceLevelObjective = default(string), System.Guid? usageBasedRecommendationServiceLevelObjectiveId = default(System.Guid?), string databaseSizeBasedRecommendationServiceLevelObjective = default(string), System.Guid? databaseSizeBasedRecommendationServiceLevelObjectiveId = default(System.Guid?), string disasterPlanBasedRecommendationServiceLevelObjective = default(string), System.Guid? disasterPlanBasedRecommendationServiceLevelObjectiveId = default(System.Guid?), string overallRecommendationServiceLevelObjective = default(string), System.Guid? overallRecommendationServiceLevelObjectiveId = default(System.Guid?), double? confidence = default(double?)) + public ServiceTierAdvisor(string name = default(string), string id = default(string), System.DateTime? observationPeriodStart = default(System.DateTime?), System.DateTime? observationPeriodEnd = default(System.DateTime?), double? activeTimeRatio = default(double?), double? minDtu = default(double?), double? avgDtu = default(double?), double? maxDtu = default(double?), double? maxSizeInGB = default(double?), IList serviceLevelObjectiveUsageMetrics = default(IList), string currentServiceLevelObjective = default(string), System.Guid? currentServiceLevelObjectiveId = default(System.Guid?), string usageBasedRecommendationServiceLevelObjective = default(string), System.Guid? usageBasedRecommendationServiceLevelObjectiveId = default(System.Guid?), string databaseSizeBasedRecommendationServiceLevelObjective = default(string), System.Guid? databaseSizeBasedRecommendationServiceLevelObjectiveId = default(System.Guid?), string disasterPlanBasedRecommendationServiceLevelObjective = default(string), System.Guid? disasterPlanBasedRecommendationServiceLevelObjectiveId = default(System.Guid?), string overallRecommendationServiceLevelObjective = default(string), System.Guid? overallRecommendationServiceLevelObjectiveId = default(System.Guid?), double confidence = default(double)) : base(name, id) { ObservationPeriodStart = observationPeriodStart; @@ -240,7 +240,7 @@ public ServiceTierAdvisor() /// Gets or sets confidence for service tier advisor. /// [JsonProperty(PropertyName = "properties.confidence")] - public double? Confidence { get; private set; } + public double Confidence { get; private set; } } } diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/SloUsageMetric.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/SloUsageMetric.cs index 0f80348d7317e..17e9665487b10 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Generated/Models/SloUsageMetric.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/Models/SloUsageMetric.cs @@ -38,7 +38,7 @@ public SloUsageMetric() /// for SLO usage metric. /// Gets or sets inRangeTimeRatio for /// SLO usage metric. - public SloUsageMetric(string serviceLevelObjective = default(string), System.Guid? serviceLevelObjectiveId = default(System.Guid?), double? inRangeTimeRatio = default(double?)) + public SloUsageMetric(string serviceLevelObjective = default(string), System.Guid serviceLevelObjectiveId = default(System.Guid), double inRangeTimeRatio = default(double)) { ServiceLevelObjective = serviceLevelObjective; ServiceLevelObjectiveId = serviceLevelObjectiveId; @@ -52,25 +52,24 @@ public SloUsageMetric() partial void CustomInit(); /// - /// Gets or sets the serviceLevelObjective for SLO usage metric. - /// Possible values include: 'Basic', 'S0', 'S1', 'S2', 'S3', 'P1', - /// 'P2', 'P3', 'P4', 'P6', 'P11', 'P15', 'System', 'System2', - /// 'ElasticPool' + /// Gets the serviceLevelObjective for SLO usage metric. Possible + /// values include: 'Basic', 'S0', 'S1', 'S2', 'S3', 'P1', 'P2', 'P3', + /// 'P4', 'P6', 'P11', 'P15', 'System', 'System2', 'ElasticPool' /// [JsonProperty(PropertyName = "serviceLevelObjective")] - public string ServiceLevelObjective { get; set; } + public string ServiceLevelObjective { get; private set; } /// - /// Gets or sets the serviceLevelObjectiveId for SLO usage metric. + /// Gets the serviceLevelObjectiveId for SLO usage metric. /// [JsonProperty(PropertyName = "serviceLevelObjectiveId")] - public System.Guid? ServiceLevelObjectiveId { get; set; } + public System.Guid ServiceLevelObjectiveId { get; private set; } /// /// Gets or sets inRangeTimeRatio for SLO usage metric. /// [JsonProperty(PropertyName = "inRangeTimeRatio")] - public double? InRangeTimeRatio { get; set; } + public double InRangeTimeRatio { get; private set; } } } diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/Operations.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/Operations.cs new file mode 100644 index 0000000000000..228c4603d1b3b --- /dev/null +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/Operations.cs @@ -0,0 +1,219 @@ +// 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 1.0.1.0 +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. + +namespace Microsoft.Azure.Management.Sql +{ + using Microsoft.Azure; + using Microsoft.Azure.Management; + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Models; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + using System.Net; + using System.Net.Http; + using System.Threading; + using System.Threading.Tasks; + + /// + /// Operations operations. + /// + internal partial class Operations : IServiceOperations, IOperations + { + /// + /// Initializes a new instance of the Operations class. + /// + /// + /// Reference to the service client. + /// + /// + /// Thrown when a required parameter is null + /// + internal Operations(SqlManagementClient client) + { + if (client == null) + { + throw new System.ArgumentNullException("client"); + } + Client = client; + } + + /// + /// Gets a reference to the SqlManagementClient + /// + public SqlManagementClient Client { get; private set; } + + /// + /// Lists all of the available SQL Rest API operations. + /// + /// + /// 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 + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task> ListWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + string apiVersion = "2014-04-01"; + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("apiVersion", apiVersion); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); + } + // Construct URL + var _baseUrl = Client.BaseUri.AbsoluteUri; + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Sql/operations").ToString(); + List _queryParameters = new List(); + if (apiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + } + if (_queryParameters.Count > 0) + { + _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); + } + // Create HTTP transport objects + var _httpRequest = new HttpRequestMessage(); + HttpResponseMessage _httpResponse = null; + _httpRequest.Method = new HttpMethod("GET"); + _httpRequest.RequestUri = new System.Uri(_url); + // Set Headers + if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) + { + _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); + } + if (Client.AcceptLanguage != null) + { + if (_httpRequest.Headers.Contains("accept-language")) + { + _httpRequest.Headers.Remove("accept-language"); + } + _httpRequest.Headers.TryAddWithoutValidation("accept-language", 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 (Client.Credentials != null) + { + cancellationToken.ThrowIfCancellationRequested(); + await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + } + // Send Request + if (_shouldTrace) + { + ServiceClientTracing.SendRequest(_invocationId, _httpRequest); + } + cancellationToken.ThrowIfCancellationRequested(); + _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + if (_shouldTrace) + { + ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); + } + HttpStatusCode _statusCode = _httpResponse.StatusCode; + cancellationToken.ThrowIfCancellationRequested(); + string _responseContent = null; + if ((int)_statusCode != 200) + { + var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + try + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + CloudError _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + if (_errorBody != null) + { + ex = new CloudException(_errorBody.Message); + ex.Body = _errorBody; + } + } + catch (JsonException) + { + // Ignore the exception + } + ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); + ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + if (_httpResponse.Headers.Contains("x-ms-request-id")) + { + ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); + } + if (_shouldTrace) + { + ServiceClientTracing.Error(_invocationId, ex); + } + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw ex; + } + // Create Result + var _result = new 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 = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + } + catch (JsonException ex) + { + _httpRequest.Dispose(); + if (_httpResponse != null) + { + _httpResponse.Dispose(); + } + throw new SerializationException("Unable to deserialize the response.", _responseContent, ex); + } + } + if (_shouldTrace) + { + ServiceClientTracing.Exit(_invocationId, _result); + } + return _result; + } + + } +} diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/SqlManagementClientExtensions.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/OperationsExtensions.cs similarity index 69% rename from src/SDKs/SqlManagement/Management.Sql/Generated/SqlManagementClientExtensions.cs rename to src/SDKs/SqlManagement/Management.Sql/Generated/OperationsExtensions.cs index aed8a280d8d9c..2a885ac395e49 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Generated/SqlManagementClientExtensions.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/OperationsExtensions.cs @@ -17,9 +17,9 @@ namespace Microsoft.Azure.Management.Sql using System.Threading.Tasks; /// - /// Extension methods for SqlManagementClient. + /// Extension methods for Operations. /// - public static partial class SqlManagementClientExtensions + public static partial class OperationsExtensions { /// /// Lists all of the available SQL Rest API operations. @@ -27,9 +27,9 @@ public static partial class SqlManagementClientExtensions /// /// The operations group for this extension method. /// - public static OperationListResult ListOperations(this ISqlManagementClient operations) + public static OperationListResult List(this IOperations operations) { - return operations.ListOperationsAsync().GetAwaiter().GetResult(); + return operations.ListAsync().GetAwaiter().GetResult(); } /// @@ -41,9 +41,9 @@ public static OperationListResult ListOperations(this ISqlManagementClient opera /// /// The cancellation token. /// - public static async Task ListOperationsAsync(this ISqlManagementClient operations, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task ListAsync(this IOperations operations, CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.ListOperationsWithHttpMessagesAsync(null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.ListWithHttpMessagesAsync(null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } diff --git a/src/SDKs/SqlManagement/Management.Sql/Generated/SqlManagementClient.cs b/src/SDKs/SqlManagement/Management.Sql/Generated/SqlManagementClient.cs index b34b6f6cec3f6..70f2a7cfd15f2 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Generated/SqlManagementClient.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Generated/SqlManagementClient.cs @@ -20,8 +20,6 @@ namespace Microsoft.Azure.Management.Sql using System.Linq; using System.Net; using System.Net.Http; - using System.Threading; - using System.Threading.Tasks; /// /// The Azure SQL Database management API provides a RESTful set of web @@ -73,6 +71,11 @@ public partial class SqlManagementClient : ServiceClient, I /// public bool? GenerateClientRequestId { get; set; } + /// + /// Gets the IDatabasesOperations. + /// + public virtual IDatabasesOperations Databases { get; private set; } + /// /// Gets the ICapabilitiesOperations. /// @@ -84,9 +87,9 @@ public partial class SqlManagementClient : ServiceClient, I public virtual IFirewallRulesOperations FirewallRules { get; private set; } /// - /// Gets the IDatabasesOperations. + /// Gets the IOperations. /// - public virtual IDatabasesOperations Databases { get; private set; } + public virtual IOperations Operations { get; private set; } /// /// Gets the IServersOperations. @@ -304,9 +307,10 @@ public SqlManagementClient(System.Uri baseUri, ServiceClientCredentials credenti /// private void Initialize() { + Databases = new DatabasesOperations(this); Capabilities = new CapabilitiesOperations(this); FirewallRules = new FirewallRulesOperations(this); - Databases = new DatabasesOperations(this); + Operations = new Operations(this); Servers = new ServersOperations(this); ElasticPools = new ElasticPoolsOperations(this); RecommendedElasticPools = new RecommendedElasticPoolsOperations(this); @@ -344,170 +348,5 @@ private void Initialize() DeserializationSettings.Converters.Add(new TransformationJsonConverter()); DeserializationSettings.Converters.Add(new CloudErrorJsonConverter()); } - /// - /// Lists all of the available SQL Rest API operations. - /// - /// - /// 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 - /// - /// - /// A response object containing the response body and response headers. - /// - public async Task> ListOperationsWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) - { - string apiVersion = "2014-04-01"; - // Tracing - bool _shouldTrace = ServiceClientTracing.IsEnabled; - string _invocationId = null; - if (_shouldTrace) - { - _invocationId = ServiceClientTracing.NextInvocationId.ToString(); - Dictionary tracingParameters = new Dictionary(); - tracingParameters.Add("apiVersion", apiVersion); - tracingParameters.Add("cancellationToken", cancellationToken); - ServiceClientTracing.Enter(_invocationId, this, "ListOperations", tracingParameters); - } - // Construct URL - var _baseUrl = BaseUri.AbsoluteUri; - var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Sql/operations").ToString(); - List _queryParameters = new List(); - if (apiVersion != null) - { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); - } - if (_queryParameters.Count > 0) - { - _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); - } - // Create HTTP transport objects - var _httpRequest = new HttpRequestMessage(); - HttpResponseMessage _httpResponse = null; - _httpRequest.Method = new HttpMethod("GET"); - _httpRequest.RequestUri = new System.Uri(_url); - // Set Headers - if (GenerateClientRequestId != null && GenerateClientRequestId.Value) - { - _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); - } - if (AcceptLanguage != null) - { - if (_httpRequest.Headers.Contains("accept-language")) - { - _httpRequest.Headers.Remove("accept-language"); - } - _httpRequest.Headers.TryAddWithoutValidation("accept-language", 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 (Credentials != null) - { - cancellationToken.ThrowIfCancellationRequested(); - await Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); - } - // Send Request - if (_shouldTrace) - { - ServiceClientTracing.SendRequest(_invocationId, _httpRequest); - } - cancellationToken.ThrowIfCancellationRequested(); - _httpResponse = await HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); - if (_shouldTrace) - { - ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); - } - HttpStatusCode _statusCode = _httpResponse.StatusCode; - cancellationToken.ThrowIfCancellationRequested(); - string _responseContent = null; - if ((int)_statusCode != 200) - { - var ex = new CloudException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); - try - { - _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); - CloudError _errorBody = SafeJsonConvert.DeserializeObject(_responseContent, DeserializationSettings); - if (_errorBody != null) - { - ex = new CloudException(_errorBody.Message); - ex.Body = _errorBody; - } - } - catch (JsonException) - { - // Ignore the exception - } - ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); - ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); - if (_httpResponse.Headers.Contains("x-ms-request-id")) - { - ex.RequestId = _httpResponse.Headers.GetValues("x-ms-request-id").FirstOrDefault(); - } - if (_shouldTrace) - { - ServiceClientTracing.Error(_invocationId, ex); - } - _httpRequest.Dispose(); - if (_httpResponse != null) - { - _httpResponse.Dispose(); - } - throw ex; - } - // Create Result - var _result = new 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 = SafeJsonConvert.DeserializeObject(_responseContent, DeserializationSettings); - } - catch (JsonException ex) - { - _httpRequest.Dispose(); - if (_httpResponse != null) - { - _httpResponse.Dispose(); - } - throw new SerializationException("Unable to deserialize the response.", _responseContent, ex); - } - } - if (_shouldTrace) - { - ServiceClientTracing.Exit(_invocationId, _result); - } - return _result; - } - } } diff --git a/src/SDKs/SqlManagement/Management.Sql/Microsoft.Azure.Management.Sql.csproj b/src/SDKs/SqlManagement/Management.Sql/Microsoft.Azure.Management.Sql.csproj index ae7a5418d1594..83e2233ba3f9e 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Microsoft.Azure.Management.Sql.csproj +++ b/src/SDKs/SqlManagement/Management.Sql/Microsoft.Azure.Management.Sql.csproj @@ -4,7 +4,7 @@ Microsoft.Azure.Management.Sql Azure SQL Management SDK library Microsoft.Azure.Management.Sql - 1.2.0-preview + 1.3.0-preview Microsoft Azure SQL Management;SQL;SQL Management diff --git a/src/SDKs/SqlManagement/Management.Sql/Microsoft.Azure.Management.Sql.xproj b/src/SDKs/SqlManagement/Management.Sql/Microsoft.Azure.Management.Sql.xproj deleted file mode 100644 index b917518bdd020..0000000000000 --- a/src/SDKs/SqlManagement/Management.Sql/Microsoft.Azure.Management.Sql.xproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - - ed488898-e888-4ee0-9812-da4686e72470 - Microsoft.Azure.Management.Sql - .\obj - .\bin\ - v4.5 - - - - 2.0 - - - diff --git a/src/SDKs/SqlManagement/Management.Sql/Properties/AssemblyInfo.cs b/src/SDKs/SqlManagement/Management.Sql/Properties/AssemblyInfo.cs index 49fe5852abb47..d49fb9978b9e2 100644 --- a/src/SDKs/SqlManagement/Management.Sql/Properties/AssemblyInfo.cs +++ b/src/SDKs/SqlManagement/Management.Sql/Properties/AssemblyInfo.cs @@ -22,7 +22,7 @@ [assembly: AssemblyTitle("Microsoft Azure SQL Management Library")] [assembly: AssemblyDescription("Provides management functionality for Microsoft Azure SQL.")] [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.2.0.0")] +[assembly: AssemblyFileVersion("1.3.0.0")] diff --git a/src/SDKs/SqlManagement/Management.Sql/generate.cmd b/src/SDKs/SqlManagement/Management.Sql/generate.cmd index 2d28ed7158cdd..5b078f7c7c6b4 100644 --- a/src/SDKs/SqlManagement/Management.Sql/generate.cmd +++ b/src/SDKs/SqlManagement/Management.Sql/generate.cmd @@ -5,7 +5,7 @@ @echo off if "%1" == "" ( - set specFile="https://raw.githubusercontent.com/Azure/azure-rest-api-specs/ea48f5627d9cd1964b19ce2571ebdc8f22262d93/arm-sql/compositeSql.json" + set specFile="https://raw.githubusercontent.com/Azure/azure-rest-api-specs/4b0aa25e9a1def98a8427cd27cc8ccbf80fa2c89/arm-sql/compositeSql.json" ) else ( set specFile="%1" ) diff --git a/src/SDKs/SqlManagement/Management.Sql/project.json b/src/SDKs/SqlManagement/Management.Sql/project.json deleted file mode 100644 index 6f1ab3d6bace1..0000000000000 --- a/src/SDKs/SqlManagement/Management.Sql/project.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "version": "1.2.0-preview", - "authors": [ "Microsoft" ], - - "packOptions": { - "summary": "Provides Microsoft Azure SQL management operations for Microsoft Azure", - "tags": [ "Microsoft Azure SQL Management", "SQL", "SQL management", "REST HTTP client", "windowsazureofficial", "netcore451511" ], - "iconUrl": "http://go.microsoft.com/fwlink/?LinkID=288890", - "projectUrl": "https://github.com/Azure/azure-sdk-for-net", - "licenseUrl": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE", - "requireLicenseAcceptance": true - }, - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../../../tools/MSSharedLibKey.snk", - "xmlDoc": true - }, - - "dependencies": { - "Microsoft.Rest.ClientRuntime.Azure": "[3.3.5,4.0.0)", - "Microsoft.Rest.ClientRuntime": "[2.3.5,3.0.0)" - }, - - "frameworks": { - "net45": { - "dependencies": { - } - }, - "netstandard1.5": { - "imports": [ "dnxcore50" ], - "buildOptions": { "define": [ "PORTABLE" ] }, - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "NETStandard.Library": "1.6.1", - "System.Diagnostics.Tools": "4.3.0", - "System.Net.Http": "4.3.0", - "System.Runtime.Serialization.Primitives": "4.1.1", - "System.Threading.Tasks": "4.3.0" - } - }, - "netstandard1.1": { - "imports": [ "dnxcore50" ], - "buildOptions": { "define": [ "PORTABLE" ] }, - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0", - "NETStandard.Library": "1.6.1", - "System.Runtime.Serialization.Primitives": "4.1.1" - } - } - } -} \ No newline at end of file diff --git a/src/SDKs/SqlManagement/Sql.Tests/Sql.Tests.xproj b/src/SDKs/SqlManagement/Sql.Tests/Sql.Tests.xproj deleted file mode 100644 index 74279a1ab8fb9..0000000000000 --- a/src/SDKs/SqlManagement/Sql.Tests/Sql.Tests.xproj +++ /dev/null @@ -1,22 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - e84e09ed-08e3-4de4-b769-371ec87c4ee9 - Sql.Tests - .\obj - .\bin\ - v4.5 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/src/SDKs/SqlManagement/Sql.Tests/project.json b/src/SDKs/SqlManagement/Sql.Tests/project.json deleted file mode 100644 index ae325e7be6250..0000000000000 --- a/src/SDKs/SqlManagement/Sql.Tests/project.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "version": "1.0.0-preview", - - "buildOptions": { - "delaySign": true, - "publicSign": false, - "keyFile": "../../../../tools/MSSharedLibKey.snk", - "compile": "../../../../tools/DisableTestRunParallel.cs" - }, - - "testRunner": "xunit", - "frameworks": { - "netcoreapp1.0": { - "imports": [ "dnxcore50", "portable-net45+win8" ], - "dependencies": { - } - } - }, - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.0.0" - }, - "Microsoft.Azure.Test.HttpRecorder": "[1.6.8,2.0.0)", - "Microsoft.Rest.ClientRuntime.Azure.TestFramework": "[1.5.2,2.0.0)", - "Microsoft.Rest.ClientRuntime": "2.3.3", - "xunit": "2.2.0-beta2-build3300", - "dotnet-test-xunit": "2.2.0-preview2-build1029", - "Microsoft.Azure.Management.Sql": "1.0.0-preview", - "Microsoft.Rest.ClientRuntime.Azure": "3.3.3", - "Microsoft.Azure.ResourceManager": "1.0.0-preview" - } -} \ No newline at end of file