diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ApplicationOperationResultsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ApplicationOperationResultsOperations.cs new file mode 100644 index 000000000000..1ad7c6d9b26b --- /dev/null +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ApplicationOperationResultsOperations.cs @@ -0,0 +1,641 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.AzureStack.Management.Fabric.Admin +{ + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Microsoft.Rest.Azure.OData; + 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; + + /// + /// ApplicationOperationResultsOperations operations. + /// + internal partial class ApplicationOperationResultsOperations : IServiceOperations, IApplicationOperationResultsOperations + { + /// + /// Initializes a new instance of the ApplicationOperationResultsOperations class. + /// + /// + /// Reference to the service client. + /// + /// + /// Thrown when a required parameter is null + /// + internal ApplicationOperationResultsOperations(FabricAdminClient client) + { + if (client == null) + { + throw new System.ArgumentNullException("client"); + } + Client = client; + } + + /// + /// Gets a reference to the FabricAdminClient + /// + public FabricAdminClient Client { get; private set; } + + /// + /// Returns the status of an application operation. + /// + /// + /// Name of the resource group. + /// + /// + /// Location of the resource. + /// + /// + /// Operation identifier. + /// + /// + /// 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> GetWithHttpMessagesAsync(string resourceGroupName, string location, string operation, 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 (location == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "location"); + } + if (operation == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "operation"); + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("resourceGroupName", resourceGroupName); + tracingParameters.Add("location", location); + tracingParameters.Add("operation", operation); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "Get", 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.Fabric.Admin/fabricLocations/{location}/applicationOperationResults/{operation}").ToString(); + _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); + _url = _url.Replace("{operation}", System.Uri.EscapeDataString(operation)); + List _queryParameters = new List(); + if (Client.ApiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.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 && (int)_statusCode != 404) + { + 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; + } + + /// + /// Returns a list of all application operation results at a location. + /// + /// + /// Name of the resource group. + /// + /// + /// Location of the resource. + /// + /// + /// OData parameters to apply to the operation. + /// + /// + /// Headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task>> ListWithHttpMessagesAsync(string resourceGroupName, string location, ODataQuery odataQuery = default(ODataQuery), 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 (location == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "location"); + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("odataQuery", odataQuery); + tracingParameters.Add("resourceGroupName", resourceGroupName); + tracingParameters.Add("location", location); + 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("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/applicationOperationResults").ToString(); + _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); + List _queryParameters = new List(); + if (odataQuery != null) + { + var _odataFilter = odataQuery.ToString(); + if (!string.IsNullOrEmpty(_odataFilter)) + { + _queryParameters.Add(_odataFilter); + } + } + if (Client.ApiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.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 && (int)_statusCode != 404) + { + 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; + } + + /// + /// Returns a list of all application operation results at a location. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + /// + /// Headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + if (nextPageLink == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink"); + } + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("nextPageLink", nextPageLink); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "ListNext", tracingParameters); + } + // Construct URL + string _url = "{nextLink}"; + _url = _url.Replace("{nextLink}", nextPageLink); + List _queryParameters = new List(); + 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 && (int)_statusCode != 404) + { + 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/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageSubSystemsOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ApplicationOperationResultsOperationsExtensions.cs similarity index 61% rename from src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageSubSystemsOperationsExtensions.cs rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ApplicationOperationResultsOperationsExtensions.cs index d56587fb6fef..7f628a1c329b 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageSubSystemsOperationsExtensions.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ApplicationOperationResultsOperationsExtensions.cs @@ -18,12 +18,12 @@ namespace Microsoft.AzureStack.Management.Fabric.Admin using System.Threading.Tasks; /// - /// Extension methods for StorageSubSystemsOperations. + /// Extension methods for ApplicationOperationResultsOperations. /// - public static partial class StorageSubSystemsOperationsExtensions + public static partial class ApplicationOperationResultsOperationsExtensions { /// - /// Return the requested storage subsystem. + /// Returns the status of an application operation. /// /// /// The operations group for this extension method. @@ -34,19 +34,16 @@ public static partial class StorageSubSystemsOperationsExtensions /// /// Location of the resource. /// - /// - /// Name of the scale units. + /// + /// Operation identifier. /// - /// - /// Name of the storage system. - /// - public static StorageSubSystem Get(this IStorageSubSystemsOperations operations, string resourceGroupName, string location, string scaleUnit, string storageSubSystem) + public static ApplicationOperationResult Get(this IApplicationOperationResultsOperations operations, string resourceGroupName, string location, string operation) { - return operations.GetAsync(resourceGroupName, location, scaleUnit, storageSubSystem).GetAwaiter().GetResult(); + return operations.GetAsync(resourceGroupName, location, operation).GetAwaiter().GetResult(); } /// - /// Return the requested storage subsystem. + /// Returns the status of an application operation. /// /// /// The operations group for this extension method. @@ -57,25 +54,22 @@ public static StorageSubSystem Get(this IStorageSubSystemsOperations operations, /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// - /// - /// Name of the storage system. + /// + /// Operation identifier. /// /// /// The cancellation token. /// - public static async Task GetAsync(this IStorageSubSystemsOperations operations, string resourceGroupName, string location, string scaleUnit, string storageSubSystem, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task GetAsync(this IApplicationOperationResultsOperations operations, string resourceGroupName, string location, string operation, CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, location, scaleUnit, storageSubSystem, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, location, operation, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } } /// - /// Returns a list of all storage subsystems for a location. + /// Returns a list of all application operation results at a location. /// /// /// The operations group for this extension method. @@ -86,19 +80,16 @@ public static StorageSubSystem Get(this IStorageSubSystemsOperations operations, /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// /// /// OData parameters to apply to the operation. /// - public static IPage List(this IStorageSubSystemsOperations operations, string resourceGroupName, string location, string scaleUnit, ODataQuery odataQuery = default(ODataQuery)) + public static IPage List(this IApplicationOperationResultsOperations operations, string resourceGroupName, string location, ODataQuery odataQuery = default(ODataQuery)) { - return operations.ListAsync(resourceGroupName, location, scaleUnit, odataQuery).GetAwaiter().GetResult(); + return operations.ListAsync(resourceGroupName, location, odataQuery).GetAwaiter().GetResult(); } /// - /// Returns a list of all storage subsystems for a location. + /// Returns a list of all application operation results at a location. /// /// /// The operations group for this extension method. @@ -109,25 +100,22 @@ public static StorageSubSystem Get(this IStorageSubSystemsOperations operations, /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// /// /// OData parameters to apply to the operation. /// /// /// The cancellation token. /// - public static async Task> ListAsync(this IStorageSubSystemsOperations operations, string resourceGroupName, string location, string scaleUnit, ODataQuery odataQuery = default(ODataQuery), CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> ListAsync(this IApplicationOperationResultsOperations operations, string resourceGroupName, string location, ODataQuery odataQuery = default(ODataQuery), CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.ListWithHttpMessagesAsync(resourceGroupName, location, scaleUnit, odataQuery, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.ListWithHttpMessagesAsync(resourceGroupName, location, odataQuery, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } } /// - /// Returns a list of all storage subsystems for a location. + /// Returns a list of all application operation results at a location. /// /// /// The operations group for this extension method. @@ -135,13 +123,13 @@ public static StorageSubSystem Get(this IStorageSubSystemsOperations operations, /// /// The NextLink from the previous successful call to List operation. /// - public static IPage ListNext(this IStorageSubSystemsOperations operations, string nextPageLink) + public static IPage ListNext(this IApplicationOperationResultsOperations operations, string nextPageLink) { return operations.ListNextAsync(nextPageLink).GetAwaiter().GetResult(); } /// - /// Returns a list of all storage subsystems for a location. + /// Returns a list of all application operation results at a location. /// /// /// The operations group for this extension method. @@ -152,7 +140,7 @@ public static IPage ListNext(this IStorageSubSystemsOperations /// /// The cancellation token. /// - public static async Task> ListNextAsync(this IStorageSubSystemsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> ListNextAsync(this IApplicationOperationResultsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.ListNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false)) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/DrivesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ComputeOperationResultsOperations.cs similarity index 86% rename from src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/DrivesOperations.cs rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ComputeOperationResultsOperations.cs index 7188a0b4b550..864ee8bd76a5 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/DrivesOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ComputeOperationResultsOperations.cs @@ -24,12 +24,12 @@ namespace Microsoft.AzureStack.Management.Fabric.Admin using System.Threading.Tasks; /// - /// DrivesOperations operations. + /// ComputeOperationResultsOperations operations. /// - internal partial class DrivesOperations : IServiceOperations, IDrivesOperations + internal partial class ComputeOperationResultsOperations : IServiceOperations, IComputeOperationResultsOperations { /// - /// Initializes a new instance of the DrivesOperations class. + /// Initializes a new instance of the ComputeOperationResultsOperations class. /// /// /// Reference to the service client. @@ -37,7 +37,7 @@ internal partial class DrivesOperations : IServiceOperations, /// /// Thrown when a required parameter is null /// - internal DrivesOperations(FabricAdminClient client) + internal ComputeOperationResultsOperations(FabricAdminClient client) { if (client == null) { @@ -52,7 +52,7 @@ internal DrivesOperations(FabricAdminClient client) public FabricAdminClient Client { get; private set; } /// - /// Return the requested a storage drive. + /// Returns the status of a compute operation. /// /// /// Name of the resource group. @@ -60,14 +60,8 @@ internal DrivesOperations(FabricAdminClient client) /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// - /// - /// Name of the storage system. - /// - /// - /// Name of the storage drive. + /// + /// Operation identifier. /// /// /// Headers that will be added to request. @@ -90,7 +84,7 @@ internal DrivesOperations(FabricAdminClient client) /// /// A response object containing the response body and response headers. /// - public async Task> GetWithHttpMessagesAsync(string resourceGroupName, string location, string scaleUnit, string storageSubSystem, string drive, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> GetWithHttpMessagesAsync(string resourceGroupName, string location, string operation, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.SubscriptionId == null) { @@ -104,19 +98,14 @@ internal DrivesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } - if (scaleUnit == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "scaleUnit"); - } - if (storageSubSystem == null) + if (operation == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "storageSubSystem"); + throw new ValidationException(ValidationRules.CannotBeNull, "operation"); } - if (drive == null) + if (Client.ApiVersion == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "drive"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); } - string apiVersion = "2018-10-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -126,26 +115,21 @@ internal DrivesOperations(FabricAdminClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); - tracingParameters.Add("scaleUnit", scaleUnit); - tracingParameters.Add("storageSubSystem", storageSubSystem); - tracingParameters.Add("drive", drive); - tracingParameters.Add("apiVersion", apiVersion); + tracingParameters.Add("operation", operation); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", 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.Fabric.Admin/fabricLocations/{location}/scaleUnits/{scaleUnit}/storageSubSystems/{storageSubSystem}/drives/{drive}").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/computeOperationResults/{operation}").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); - _url = _url.Replace("{scaleUnit}", System.Uri.EscapeDataString(scaleUnit)); - _url = _url.Replace("{storageSubSystem}", System.Uri.EscapeDataString(storageSubSystem)); - _url = _url.Replace("{drive}", System.Uri.EscapeDataString(drive)); + _url = _url.Replace("{operation}", System.Uri.EscapeDataString(operation)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -240,7 +224,7 @@ internal DrivesOperations(FabricAdminClient client) throw ex; } // Create Result - var _result = new AzureOperationResponse(); + var _result = new AzureOperationResponse(); _result.Request = _httpRequest; _result.Response = _httpResponse; if (_httpResponse.Headers.Contains("x-ms-request-id")) @@ -253,7 +237,7 @@ internal DrivesOperations(FabricAdminClient client) _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); try { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); } catch (JsonException ex) { @@ -273,7 +257,7 @@ internal DrivesOperations(FabricAdminClient client) } /// - /// Returns a list of all storage drives at a location. + /// Returns a list of all compute operation results at a location. /// /// /// Name of the resource group. @@ -281,12 +265,6 @@ internal DrivesOperations(FabricAdminClient client) /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// - /// - /// Name of the storage system. - /// /// /// OData parameters to apply to the operation. /// @@ -311,7 +289,7 @@ internal DrivesOperations(FabricAdminClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListWithHttpMessagesAsync(string resourceGroupName, string location, string scaleUnit, string storageSubSystem, ODataQuery odataQuery = default(ODataQuery), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListWithHttpMessagesAsync(string resourceGroupName, string location, ODataQuery odataQuery = default(ODataQuery), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.SubscriptionId == null) { @@ -325,15 +303,10 @@ internal DrivesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } - if (scaleUnit == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "scaleUnit"); - } - if (storageSubSystem == null) + if (Client.ApiVersion == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "storageSubSystem"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); } - string apiVersion = "2018-10-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -344,20 +317,15 @@ internal DrivesOperations(FabricAdminClient client) tracingParameters.Add("odataQuery", odataQuery); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); - tracingParameters.Add("scaleUnit", scaleUnit); - tracingParameters.Add("storageSubSystem", storageSubSystem); - 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("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/scaleUnits/{scaleUnit}/storageSubSystems/{storageSubSystem}/drives").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/computeOperationResults").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); - _url = _url.Replace("{scaleUnit}", System.Uri.EscapeDataString(scaleUnit)); - _url = _url.Replace("{storageSubSystem}", System.Uri.EscapeDataString(storageSubSystem)); List _queryParameters = new List(); if (odataQuery != null) { @@ -367,9 +335,9 @@ internal DrivesOperations(FabricAdminClient client) _queryParameters.Add(_odataFilter); } } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -464,7 +432,7 @@ internal DrivesOperations(FabricAdminClient client) throw ex; } // Create Result - var _result = new AzureOperationResponse>(); + var _result = new AzureOperationResponse>(); _result.Request = _httpRequest; _result.Response = _httpResponse; if (_httpResponse.Headers.Contains("x-ms-request-id")) @@ -477,7 +445,7 @@ internal DrivesOperations(FabricAdminClient client) _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); try { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); } catch (JsonException ex) { @@ -497,7 +465,7 @@ internal DrivesOperations(FabricAdminClient client) } /// - /// Returns a list of all storage drives at a location. + /// Returns a list of all compute operation results at a location. /// /// /// The NextLink from the previous successful call to List operation. @@ -523,7 +491,7 @@ internal DrivesOperations(FabricAdminClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (nextPageLink == null) { @@ -637,7 +605,7 @@ internal DrivesOperations(FabricAdminClient client) throw ex; } // Create Result - var _result = new AzureOperationResponse>(); + var _result = new AzureOperationResponse>(); _result.Request = _httpRequest; _result.Response = _httpResponse; if (_httpResponse.Headers.Contains("x-ms-request-id")) @@ -650,7 +618,7 @@ internal DrivesOperations(FabricAdminClient client) _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); try { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); } catch (JsonException ex) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/DrivesOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ComputeOperationResultsOperationsExtensions.cs similarity index 58% rename from src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/DrivesOperationsExtensions.cs rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ComputeOperationResultsOperationsExtensions.cs index 3b79b3270bdb..74dde037deca 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/DrivesOperationsExtensions.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ComputeOperationResultsOperationsExtensions.cs @@ -18,12 +18,12 @@ namespace Microsoft.AzureStack.Management.Fabric.Admin using System.Threading.Tasks; /// - /// Extension methods for DrivesOperations. + /// Extension methods for ComputeOperationResultsOperations. /// - public static partial class DrivesOperationsExtensions + public static partial class ComputeOperationResultsOperationsExtensions { /// - /// Return the requested a storage drive. + /// Returns the status of a compute operation. /// /// /// The operations group for this extension method. @@ -34,22 +34,16 @@ public static partial class DrivesOperationsExtensions /// /// Location of the resource. /// - /// - /// Name of the scale units. + /// + /// Operation identifier. /// - /// - /// Name of the storage system. - /// - /// - /// Name of the storage drive. - /// - public static Drive Get(this IDrivesOperations operations, string resourceGroupName, string location, string scaleUnit, string storageSubSystem, string drive) + public static ComputeOperationResult Get(this IComputeOperationResultsOperations operations, string resourceGroupName, string location, string operation) { - return operations.GetAsync(resourceGroupName, location, scaleUnit, storageSubSystem, drive).GetAwaiter().GetResult(); + return operations.GetAsync(resourceGroupName, location, operation).GetAwaiter().GetResult(); } /// - /// Return the requested a storage drive. + /// Returns the status of a compute operation. /// /// /// The operations group for this extension method. @@ -60,28 +54,22 @@ public static Drive Get(this IDrivesOperations operations, string resourceGroupN /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// - /// - /// Name of the storage system. - /// - /// - /// Name of the storage drive. + /// + /// Operation identifier. /// /// /// The cancellation token. /// - public static async Task GetAsync(this IDrivesOperations operations, string resourceGroupName, string location, string scaleUnit, string storageSubSystem, string drive, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task GetAsync(this IComputeOperationResultsOperations operations, string resourceGroupName, string location, string operation, CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, location, scaleUnit, storageSubSystem, drive, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, location, operation, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } } /// - /// Returns a list of all storage drives at a location. + /// Returns a list of all compute operation results at a location. /// /// /// The operations group for this extension method. @@ -92,22 +80,16 @@ public static Drive Get(this IDrivesOperations operations, string resourceGroupN /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// - /// - /// Name of the storage system. - /// /// /// OData parameters to apply to the operation. /// - public static IPage List(this IDrivesOperations operations, string resourceGroupName, string location, string scaleUnit, string storageSubSystem, ODataQuery odataQuery = default(ODataQuery)) + public static IPage List(this IComputeOperationResultsOperations operations, string resourceGroupName, string location, ODataQuery odataQuery = default(ODataQuery)) { - return operations.ListAsync(resourceGroupName, location, scaleUnit, storageSubSystem, odataQuery).GetAwaiter().GetResult(); + return operations.ListAsync(resourceGroupName, location, odataQuery).GetAwaiter().GetResult(); } /// - /// Returns a list of all storage drives at a location. + /// Returns a list of all compute operation results at a location. /// /// /// The operations group for this extension method. @@ -118,28 +100,22 @@ public static Drive Get(this IDrivesOperations operations, string resourceGroupN /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// - /// - /// Name of the storage system. - /// /// /// OData parameters to apply to the operation. /// /// /// The cancellation token. /// - public static async Task> ListAsync(this IDrivesOperations operations, string resourceGroupName, string location, string scaleUnit, string storageSubSystem, ODataQuery odataQuery = default(ODataQuery), CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> ListAsync(this IComputeOperationResultsOperations operations, string resourceGroupName, string location, ODataQuery odataQuery = default(ODataQuery), CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.ListWithHttpMessagesAsync(resourceGroupName, location, scaleUnit, storageSubSystem, odataQuery, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.ListWithHttpMessagesAsync(resourceGroupName, location, odataQuery, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } } /// - /// Returns a list of all storage drives at a location. + /// Returns a list of all compute operation results at a location. /// /// /// The operations group for this extension method. @@ -147,13 +123,13 @@ public static Drive Get(this IDrivesOperations operations, string resourceGroupN /// /// The NextLink from the previous successful call to List operation. /// - public static IPage ListNext(this IDrivesOperations operations, string nextPageLink) + public static IPage ListNext(this IComputeOperationResultsOperations operations, string nextPageLink) { return operations.ListNextAsync(nextPageLink).GetAwaiter().GetResult(); } /// - /// Returns a list of all storage drives at a location. + /// Returns a list of all compute operation results at a location. /// /// /// The operations group for this extension method. @@ -164,7 +140,7 @@ public static IPage ListNext(this IDrivesOperations operations, string ne /// /// The cancellation token. /// - public static async Task> ListNextAsync(this IDrivesOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> ListNextAsync(this IComputeOperationResultsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.ListNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false)) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/EdgeGatewayPoolsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/EdgeGatewayPoolsOperations.cs index d7b62caa71a3..9e057387c868 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/EdgeGatewayPoolsOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/EdgeGatewayPoolsOperations.cs @@ -102,7 +102,10 @@ internal EdgeGatewayPoolsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "edgeGatewayPool"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -113,7 +116,6 @@ internal EdgeGatewayPoolsOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("edgeGatewayPool", edgeGatewayPool); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -125,9 +127,9 @@ internal EdgeGatewayPoolsOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{edgeGatewayPool}", System.Uri.EscapeDataString(edgeGatewayPool)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -301,7 +303,10 @@ internal EdgeGatewayPoolsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -312,7 +317,6 @@ internal EdgeGatewayPoolsOperations(FabricAdminClient client) tracingParameters.Add("odataQuery", odataQuery); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -331,9 +335,9 @@ internal EdgeGatewayPoolsOperations(FabricAdminClient client) _queryParameters.Add(_odataFilter); } } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/EdgeGatewaysOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/EdgeGatewaysOperations.cs index 1a67f14bc3de..ea486d02e933 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/EdgeGatewaysOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/EdgeGatewaysOperations.cs @@ -102,7 +102,10 @@ internal EdgeGatewaysOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "edgeGateway"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -113,7 +116,6 @@ internal EdgeGatewaysOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("edgeGateway", edgeGateway); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -125,9 +127,9 @@ internal EdgeGatewaysOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{edgeGateway}", System.Uri.EscapeDataString(edgeGateway)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -301,7 +303,10 @@ internal EdgeGatewaysOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -312,7 +317,6 @@ internal EdgeGatewaysOperations(FabricAdminClient client) tracingParameters.Add("odataQuery", odataQuery); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -331,9 +335,9 @@ internal EdgeGatewaysOperations(FabricAdminClient client) _queryParameters.Add(_odataFilter); } } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricAdminClient.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricAdminClient.cs index d9e3f5a5f789..0b494362ca1d 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricAdminClient.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricAdminClient.cs @@ -46,6 +46,11 @@ public partial class FabricAdminClient : ServiceClient, IFabr /// public ServiceClientCredentials Credentials { get; private set; } + /// + /// Client API Version. + /// + public string ApiVersion { get; private set; } + /// /// Subscription credentials that uniquely identify Microsoft Azure /// subscription. The subscription ID forms part of the URI for every service @@ -71,6 +76,16 @@ public partial class FabricAdminClient : ServiceClient, IFabr /// public bool? GenerateClientRequestId { get; set; } + /// + /// Gets the IApplicationOperationResultsOperations. + /// + public virtual IApplicationOperationResultsOperations ApplicationOperationResults { get; private set; } + + /// + /// Gets the IComputeOperationResultsOperations. + /// + public virtual IComputeOperationResultsOperations ComputeOperationResults { get; private set; } + /// /// Gets the IFabricOperations. /// @@ -126,6 +141,11 @@ public partial class FabricAdminClient : ServiceClient, IFabr /// public virtual IStorageSystemsOperations StorageSystems { get; private set; } + /// + /// Gets the IVolumesOperations. + /// + public virtual IVolumesOperations Volumes { get; private set; } + /// /// Gets the ILogicalSubnetsOperations. /// @@ -136,6 +156,11 @@ public partial class FabricAdminClient : ServiceClient, IFabr /// public virtual IMacAddressPoolsOperations MacAddressPools { get; private set; } + /// + /// Gets the INetworkOperationResultsOperations. + /// + public virtual INetworkOperationResultsOperations NetworkOperationResults { get; private set; } + /// /// Gets the IScaleUnitsOperations. /// @@ -152,19 +177,9 @@ public partial class FabricAdminClient : ServiceClient, IFabr public virtual ISlbMuxInstancesOperations SlbMuxInstances { get; private set; } /// - /// Gets the IDrivesOperations. + /// Gets the IStorageOperationResultsOperations. /// - public virtual IDrivesOperations Drives { get; private set; } - - /// - /// Gets the IStorageSubSystemsOperations. - /// - public virtual IStorageSubSystemsOperations StorageSubSystems { get; private set; } - - /// - /// Gets the IVolumesOperations. - /// - public virtual IVolumesOperations Volumes { get; private set; } + public virtual IStorageOperationResultsOperations StorageOperationResults { get; private set; } /// /// Initializes a new instance of the FabricAdminClient class. @@ -407,6 +422,8 @@ public FabricAdminClient(System.Uri baseUri, ServiceClientCredentials credential /// private void Initialize() { + ApplicationOperationResults = new ApplicationOperationResultsOperations(this); + ComputeOperationResults = new ComputeOperationResultsOperations(this); Fabric = new FabricOperations(this); EdgeGateways = new EdgeGatewaysOperations(this); EdgeGatewayPools = new EdgeGatewayPoolsOperations(this); @@ -418,15 +435,16 @@ private void Initialize() LogicalNetworks = new LogicalNetworksOperations(this); StoragePools = new StoragePoolsOperations(this); StorageSystems = new StorageSystemsOperations(this); + Volumes = new VolumesOperations(this); LogicalSubnets = new LogicalSubnetsOperations(this); MacAddressPools = new MacAddressPoolsOperations(this); + NetworkOperationResults = new NetworkOperationResultsOperations(this); ScaleUnits = new ScaleUnitsOperations(this); ScaleUnitNodes = new ScaleUnitNodesOperations(this); SlbMuxInstances = new SlbMuxInstancesOperations(this); - Drives = new DrivesOperations(this); - StorageSubSystems = new StorageSubSystemsOperations(this); - Volumes = new VolumesOperations(this); + StorageOperationResults = new StorageOperationResultsOperations(this); BaseUri = new System.Uri("https://adminmanagement.local.azurestack.external"); + ApiVersion = "2016-05-01"; AcceptLanguage = "en-US"; LongRunningOperationRetryTimeout = 30; GenerateClientRequestId = true; diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricLocationsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricLocationsOperations.cs index 5ea553ea9cbe..fb040269312d 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricLocationsOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricLocationsOperations.cs @@ -95,7 +95,10 @@ internal FabricLocationsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "fabricLocation"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -105,7 +108,6 @@ internal FabricLocationsOperations(FabricAdminClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("fabricLocation", fabricLocation); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -116,9 +118,9 @@ internal FabricLocationsOperations(FabricAdminClient client) _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{fabricLocation}", System.Uri.EscapeDataString(fabricLocation)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -285,7 +287,10 @@ internal FabricLocationsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -295,7 +300,6 @@ internal FabricLocationsOperations(FabricAdminClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("odataQuery", odataQuery); tracingParameters.Add("resourceGroupName", resourceGroupName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -313,9 +317,9 @@ internal FabricLocationsOperations(FabricAdminClient client) _queryParameters.Add(_odataFilter); } } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -483,11 +487,14 @@ internal FabricLocationsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "resourceGroupName"); } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } if (fabricObject == null) { throw new ValidationException(ValidationRules.CannotBeNull, "fabricObject"); } - string apiVersion = "2016-05-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -496,7 +503,6 @@ internal FabricLocationsOperations(FabricAdminClient client) _invocationId = ServiceClientTracing.NextInvocationId.ToString(); Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("fabricObject", fabricObject); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Create", tracingParameters); @@ -507,9 +513,9 @@ internal FabricLocationsOperations(FabricAdminClient client) _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricOperations.cs index a9285c97b81a..718eb5685173 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FabricOperations.cs @@ -65,12 +65,21 @@ internal FabricOperations(FabricAdminClient client) /// /// 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>> ListOperationsWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -78,7 +87,6 @@ internal FabricOperations(FabricAdminClient client) { _invocationId = ServiceClientTracing.NextInvocationId.ToString(); Dictionary tracingParameters = new Dictionary(); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "ListOperations", tracingParameters); } @@ -86,9 +94,9 @@ internal FabricOperations(FabricAdminClient client) var _baseUrl = Client.BaseUri.AbsoluteUri; var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Fabric.Admin/operations").ToString(); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FileSharesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FileSharesOperations.cs index 6dc30af039a7..43b4c9168e9f 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FileSharesOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/FileSharesOperations.cs @@ -102,7 +102,10 @@ internal FileSharesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "fileShare"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -113,7 +116,6 @@ internal FileSharesOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("fileShare", fileShare); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -125,9 +127,9 @@ internal FileSharesOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{fileShare}", System.Uri.EscapeDataString(fileShare)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -301,7 +303,10 @@ internal FileSharesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -312,7 +317,6 @@ internal FileSharesOperations(FabricAdminClient client) tracingParameters.Add("odataQuery", odataQuery); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -331,9 +335,9 @@ internal FileSharesOperations(FabricAdminClient client) _queryParameters.Add(_odataFilter); } } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IApplicationOperationResultsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IApplicationOperationResultsOperations.cs new file mode 100644 index 000000000000..5659317e5848 --- /dev/null +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IApplicationOperationResultsOperations.cs @@ -0,0 +1,106 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.AzureStack.Management.Fabric.Admin +{ + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Microsoft.Rest.Azure.OData; + using Models; + using System.Collections; + using System.Collections.Generic; + using System.Threading; + using System.Threading.Tasks; + + /// + /// ApplicationOperationResultsOperations operations. + /// + public partial interface IApplicationOperationResultsOperations + { + /// + /// Returns the status of an application operation. + /// + /// + /// Name of the resource group. + /// + /// + /// Location of the resource. + /// + /// + /// Operation identifier. + /// + /// + /// 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> GetWithHttpMessagesAsync(string resourceGroupName, string location, string operation, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// Returns a list of all application operation results at a location. + /// + /// + /// Name of the resource group. + /// + /// + /// Location of the resource. + /// + /// + /// OData parameters to apply to the operation. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + Task>> ListWithHttpMessagesAsync(string resourceGroupName, string location, ODataQuery odataQuery = default(ODataQuery), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// Returns a list of all application operation results at a location. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + Task>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + } +} diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IStorageSubSystemsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IComputeOperationResultsOperations.cs similarity index 73% rename from src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IStorageSubSystemsOperations.cs rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IComputeOperationResultsOperations.cs index 3d244af7416b..0cabd89b59f3 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IStorageSubSystemsOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IComputeOperationResultsOperations.cs @@ -20,12 +20,12 @@ namespace Microsoft.AzureStack.Management.Fabric.Admin using System.Threading.Tasks; /// - /// StorageSubSystemsOperations operations. + /// ComputeOperationResultsOperations operations. /// - public partial interface IStorageSubSystemsOperations + public partial interface IComputeOperationResultsOperations { /// - /// Return the requested storage subsystem. + /// Returns the status of a compute operation. /// /// /// Name of the resource group. @@ -33,11 +33,8 @@ public partial interface IStorageSubSystemsOperations /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// - /// - /// Name of the storage system. + /// + /// Operation identifier. /// /// /// The headers that will be added to request. @@ -54,9 +51,9 @@ public partial interface IStorageSubSystemsOperations /// /// Thrown when a required parameter is null /// - Task> GetWithHttpMessagesAsync(string resourceGroupName, string location, string scaleUnit, string storageSubSystem, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> GetWithHttpMessagesAsync(string resourceGroupName, string location, string operation, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Returns a list of all storage subsystems for a location. + /// Returns a list of all compute operation results at a location. /// /// /// Name of the resource group. @@ -64,9 +61,6 @@ public partial interface IStorageSubSystemsOperations /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// /// /// OData parameters to apply to the operation. /// @@ -85,9 +79,9 @@ public partial interface IStorageSubSystemsOperations /// /// Thrown when a required parameter is null /// - Task>> ListWithHttpMessagesAsync(string resourceGroupName, string location, string scaleUnit, ODataQuery odataQuery = default(ODataQuery), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> ListWithHttpMessagesAsync(string resourceGroupName, string location, ODataQuery odataQuery = default(ODataQuery), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Returns a list of all storage subsystems for a location. + /// Returns a list of all compute operation results at a location. /// /// /// The NextLink from the previous successful call to List operation. @@ -107,6 +101,6 @@ public partial interface IStorageSubSystemsOperations /// /// Thrown when a required parameter is null /// - Task>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); } } diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IFabricAdminClient.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IFabricAdminClient.cs index eeafb3ec7986..7aecc32de75c 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IFabricAdminClient.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IFabricAdminClient.cs @@ -40,6 +40,11 @@ public partial interface IFabricAdminClient : System.IDisposable /// ServiceClientCredentials Credentials { get; } + /// + /// Client API Version. + /// + string ApiVersion { get; } + /// /// Subscription credentials that uniquely identify Microsoft Azure /// subscription. The subscription ID forms part of the URI for every @@ -66,6 +71,16 @@ public partial interface IFabricAdminClient : System.IDisposable bool? GenerateClientRequestId { get; set; } + /// + /// Gets the IApplicationOperationResultsOperations. + /// + IApplicationOperationResultsOperations ApplicationOperationResults { get; } + + /// + /// Gets the IComputeOperationResultsOperations. + /// + IComputeOperationResultsOperations ComputeOperationResults { get; } + /// /// Gets the IFabricOperations. /// @@ -121,6 +136,11 @@ public partial interface IFabricAdminClient : System.IDisposable /// IStorageSystemsOperations StorageSystems { get; } + /// + /// Gets the IVolumesOperations. + /// + IVolumesOperations Volumes { get; } + /// /// Gets the ILogicalSubnetsOperations. /// @@ -131,6 +151,11 @@ public partial interface IFabricAdminClient : System.IDisposable /// IMacAddressPoolsOperations MacAddressPools { get; } + /// + /// Gets the INetworkOperationResultsOperations. + /// + INetworkOperationResultsOperations NetworkOperationResults { get; } + /// /// Gets the IScaleUnitsOperations. /// @@ -147,19 +172,9 @@ public partial interface IFabricAdminClient : System.IDisposable ISlbMuxInstancesOperations SlbMuxInstances { get; } /// - /// Gets the IDrivesOperations. - /// - IDrivesOperations Drives { get; } - - /// - /// Gets the IStorageSubSystemsOperations. - /// - IStorageSubSystemsOperations StorageSubSystems { get; } - - /// - /// Gets the IVolumesOperations. + /// Gets the IStorageOperationResultsOperations. /// - IVolumesOperations Volumes { get; } + IStorageOperationResultsOperations StorageOperationResults { get; } } } diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IInfraRolesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IInfraRolesOperations.cs index 1fffbd60f71c..3c65fdc4ad12 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IInfraRolesOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IInfraRolesOperations.cs @@ -81,7 +81,7 @@ public partial interface IInfraRolesOperations /// Task>> ListWithHttpMessagesAsync(string resourceGroupName, string location, ODataQuery odataQuery = default(ODataQuery), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Restarts the requestd infrastructure role. + /// Restarts the requested infrastructure role. /// /// /// Name of the resource group. @@ -106,7 +106,7 @@ public partial interface IInfraRolesOperations /// Task RestartWithHttpMessagesAsync(string resourceGroupName, string location, string infraRole, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Restarts the requestd infrastructure role. + /// Restarts the requested infrastructure role. /// /// /// Name of the resource group. diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IDrivesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/INetworkOperationResultsOperations.cs similarity index 70% rename from src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IDrivesOperations.cs rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/INetworkOperationResultsOperations.cs index 1b2ae6792195..403c955f587c 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IDrivesOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/INetworkOperationResultsOperations.cs @@ -20,12 +20,12 @@ namespace Microsoft.AzureStack.Management.Fabric.Admin using System.Threading.Tasks; /// - /// DrivesOperations operations. + /// NetworkOperationResultsOperations operations. /// - public partial interface IDrivesOperations + public partial interface INetworkOperationResultsOperations { /// - /// Return the requested a storage drive. + /// Returns the status of a network operation. /// /// /// Name of the resource group. @@ -33,14 +33,8 @@ public partial interface IDrivesOperations /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// - /// - /// Name of the storage system. - /// - /// - /// Name of the storage drive. + /// + /// Operation identifier. /// /// /// The headers that will be added to request. @@ -57,9 +51,9 @@ public partial interface IDrivesOperations /// /// Thrown when a required parameter is null /// - Task> GetWithHttpMessagesAsync(string resourceGroupName, string location, string scaleUnit, string storageSubSystem, string drive, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> GetWithHttpMessagesAsync(string resourceGroupName, string location, string operation, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Returns a list of all storage drives at a location. + /// Returns a list of all network operation results at a location. /// /// /// Name of the resource group. @@ -67,12 +61,6 @@ public partial interface IDrivesOperations /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// - /// - /// Name of the storage system. - /// /// /// OData parameters to apply to the operation. /// @@ -91,9 +79,9 @@ public partial interface IDrivesOperations /// /// Thrown when a required parameter is null /// - Task>> ListWithHttpMessagesAsync(string resourceGroupName, string location, string scaleUnit, string storageSubSystem, ODataQuery odataQuery = default(ODataQuery), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> ListWithHttpMessagesAsync(string resourceGroupName, string location, ODataQuery odataQuery = default(ODataQuery), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// - /// Returns a list of all storage drives at a location. + /// Returns a list of all network operation results at a location. /// /// /// The NextLink from the previous successful call to List operation. @@ -113,6 +101,6 @@ public partial interface IDrivesOperations /// /// Thrown when a required parameter is null /// - Task>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); } } diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IStorageOperationResultsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IStorageOperationResultsOperations.cs new file mode 100644 index 000000000000..610c0923b45e --- /dev/null +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IStorageOperationResultsOperations.cs @@ -0,0 +1,106 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.AzureStack.Management.Fabric.Admin +{ + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Microsoft.Rest.Azure.OData; + using Models; + using System.Collections; + using System.Collections.Generic; + using System.Threading; + using System.Threading.Tasks; + + /// + /// StorageOperationResultsOperations operations. + /// + public partial interface IStorageOperationResultsOperations + { + /// + /// Returns the status of a storage operation. + /// + /// + /// Name of the resource group. + /// + /// + /// Location of the resource. + /// + /// + /// Operation identifier. + /// + /// + /// 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> GetWithHttpMessagesAsync(string resourceGroupName, string location, string operation, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// Returns a list of all storage operation results at a location. + /// + /// + /// Name of the resource group. + /// + /// + /// Location of the resource. + /// + /// + /// OData parameters to apply to the operation. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + Task>> ListWithHttpMessagesAsync(string resourceGroupName, string location, ODataQuery odataQuery = default(ODataQuery), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// Returns a list of all storage operation results at a location. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + /// + /// The headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + Task>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + } +} diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IVolumesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IVolumesOperations.cs index 5e0bd3b6ecc7..483016454a06 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IVolumesOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IVolumesOperations.cs @@ -33,12 +33,12 @@ public partial interface IVolumesOperations /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// /// /// Name of the storage system. /// + /// + /// Storage pool name. + /// /// /// Name of the storage volume. /// @@ -57,7 +57,7 @@ public partial interface IVolumesOperations /// /// Thrown when a required parameter is null /// - Task> GetWithHttpMessagesAsync(string resourceGroupName, string location, string scaleUnit, string storageSubSystem, string volume, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task> GetWithHttpMessagesAsync(string resourceGroupName, string location, string storageSubSystem, string storagePool, string volume, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Returns a list of all storage volumes at a location. /// @@ -67,12 +67,12 @@ public partial interface IVolumesOperations /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// /// /// Name of the storage system. /// + /// + /// Storage pool name. + /// /// /// OData parameters to apply to the operation. /// @@ -91,7 +91,7 @@ public partial interface IVolumesOperations /// /// Thrown when a required parameter is null /// - Task>> ListWithHttpMessagesAsync(string resourceGroupName, string location, string scaleUnit, string storageSubSystem, ODataQuery odataQuery = default(ODataQuery), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> ListWithHttpMessagesAsync(string resourceGroupName, string location, string storageSubSystem, string storagePool, ODataQuery odataQuery = default(ODataQuery), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Returns a list of all storage volumes at a location. /// diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRoleInstancesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRoleInstancesOperations.cs index f594997c1b59..9ffe19b09ef9 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRoleInstancesOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRoleInstancesOperations.cs @@ -202,7 +202,10 @@ internal InfraRoleInstancesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "infraRoleInstance"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -213,7 +216,6 @@ internal InfraRoleInstancesOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("infraRoleInstance", infraRoleInstance); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -225,9 +227,9 @@ internal InfraRoleInstancesOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{infraRoleInstance}", System.Uri.EscapeDataString(infraRoleInstance)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -401,7 +403,10 @@ internal InfraRoleInstancesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -412,7 +417,6 @@ internal InfraRoleInstancesOperations(FabricAdminClient client) tracingParameters.Add("odataQuery", odataQuery); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -431,9 +435,9 @@ internal InfraRoleInstancesOperations(FabricAdminClient client) _queryParameters.Add(_odataFilter); } } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -608,7 +612,10 @@ internal InfraRoleInstancesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "infraRoleInstance"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -619,7 +626,6 @@ internal InfraRoleInstancesOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("infraRoleInstance", infraRoleInstance); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginPowerOff", tracingParameters); } @@ -631,9 +637,9 @@ internal InfraRoleInstancesOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{infraRoleInstance}", System.Uri.EscapeDataString(infraRoleInstance)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -790,7 +796,10 @@ internal InfraRoleInstancesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "infraRoleInstance"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -801,7 +810,6 @@ internal InfraRoleInstancesOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("infraRoleInstance", infraRoleInstance); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginPowerOn", tracingParameters); } @@ -813,9 +821,9 @@ internal InfraRoleInstancesOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{infraRoleInstance}", System.Uri.EscapeDataString(infraRoleInstance)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -972,7 +980,10 @@ internal InfraRoleInstancesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "infraRoleInstance"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -983,7 +994,6 @@ internal InfraRoleInstancesOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("infraRoleInstance", infraRoleInstance); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginShutdown", tracingParameters); } @@ -995,9 +1005,9 @@ internal InfraRoleInstancesOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{infraRoleInstance}", System.Uri.EscapeDataString(infraRoleInstance)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -1154,7 +1164,10 @@ internal InfraRoleInstancesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "infraRoleInstance"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1165,7 +1178,6 @@ internal InfraRoleInstancesOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("infraRoleInstance", infraRoleInstance); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginReboot", tracingParameters); } @@ -1177,9 +1189,9 @@ internal InfraRoleInstancesOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{infraRoleInstance}", System.Uri.EscapeDataString(infraRoleInstance)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRolesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRolesOperations.cs index b355272bcc33..b48526af1472 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRolesOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRolesOperations.cs @@ -102,7 +102,10 @@ internal InfraRolesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "infraRole"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -113,7 +116,6 @@ internal InfraRolesOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("infraRole", infraRole); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -125,9 +127,9 @@ internal InfraRolesOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{infraRole}", System.Uri.EscapeDataString(infraRole)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -301,7 +303,10 @@ internal InfraRolesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -312,7 +317,6 @@ internal InfraRolesOperations(FabricAdminClient client) tracingParameters.Add("odataQuery", odataQuery); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -331,9 +335,9 @@ internal InfraRolesOperations(FabricAdminClient client) _queryParameters.Add(_odataFilter); } } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -461,7 +465,7 @@ internal InfraRolesOperations(FabricAdminClient client) } /// - /// Restarts the requestd infrastructure role. + /// Restarts the requested infrastructure role. /// /// /// Name of the resource group. @@ -486,7 +490,7 @@ internal InfraRolesOperations(FabricAdminClient client) } /// - /// Restarts the requestd infrastructure role. + /// Restarts the requested infrastructure role. /// /// /// Name of the resource group. @@ -533,7 +537,10 @@ internal InfraRolesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "infraRole"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -544,7 +551,6 @@ internal InfraRolesOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("infraRole", infraRole); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginRestart", tracingParameters); } @@ -556,9 +562,9 @@ internal InfraRolesOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{infraRole}", System.Uri.EscapeDataString(infraRole)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRolesOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRolesOperationsExtensions.cs index 2123ee842b15..6228449fb2b2 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRolesOperationsExtensions.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/InfraRolesOperationsExtensions.cs @@ -115,7 +115,7 @@ public static InfraRole Get(this IInfraRolesOperations operations, string resour } /// - /// Restarts the requestd infrastructure role. + /// Restarts the requested infrastructure role. /// /// /// The operations group for this extension method. @@ -135,7 +135,7 @@ public static void Restart(this IInfraRolesOperations operations, string resourc } /// - /// Restarts the requestd infrastructure role. + /// Restarts the requested infrastructure role. /// /// /// The operations group for this extension method. @@ -158,7 +158,7 @@ public static void Restart(this IInfraRolesOperations operations, string resourc } /// - /// Restarts the requestd infrastructure role. + /// Restarts the requested infrastructure role. /// /// /// The operations group for this extension method. @@ -178,7 +178,7 @@ public static void BeginRestart(this IInfraRolesOperations operations, string re } /// - /// Restarts the requestd infrastructure role. + /// Restarts the requested infrastructure role. /// /// /// The operations group for this extension method. diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IpPoolsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IpPoolsOperations.cs index f6b438f53d83..fafd558f9187 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IpPoolsOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/IpPoolsOperations.cs @@ -102,7 +102,10 @@ internal IpPoolsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "ipPool"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -113,7 +116,6 @@ internal IpPoolsOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("ipPool", ipPool); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -125,9 +127,9 @@ internal IpPoolsOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{ipPool}", System.Uri.EscapeDataString(ipPool)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -329,7 +331,10 @@ internal IpPoolsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -340,7 +345,6 @@ internal IpPoolsOperations(FabricAdminClient client) tracingParameters.Add("odataQuery", odataQuery); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -359,9 +363,9 @@ internal IpPoolsOperations(FabricAdminClient client) _queryParameters.Add(_odataFilter); } } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -542,11 +546,14 @@ internal IpPoolsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "ipPool"); } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } if (pool == null) { throw new ValidationException(ValidationRules.CannotBeNull, "pool"); } - string apiVersion = "2016-05-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -557,7 +564,6 @@ internal IpPoolsOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("ipPool", ipPool); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("pool", pool); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginCreateOrUpdate", tracingParameters); @@ -570,9 +576,9 @@ internal IpPoolsOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{ipPool}", System.Uri.EscapeDataString(ipPool)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/LogicalNetworksOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/LogicalNetworksOperations.cs index fed0813cf5e0..ab8b76e13dbd 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/LogicalNetworksOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/LogicalNetworksOperations.cs @@ -102,7 +102,10 @@ internal LogicalNetworksOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "logicalNetwork"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -113,7 +116,6 @@ internal LogicalNetworksOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("logicalNetwork", logicalNetwork); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -125,9 +127,9 @@ internal LogicalNetworksOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{logicalNetwork}", System.Uri.EscapeDataString(logicalNetwork)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -301,7 +303,10 @@ internal LogicalNetworksOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -312,7 +317,6 @@ internal LogicalNetworksOperations(FabricAdminClient client) tracingParameters.Add("odataQuery", odataQuery); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -331,9 +335,9 @@ internal LogicalNetworksOperations(FabricAdminClient client) _queryParameters.Add(_odataFilter); } } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/LogicalSubnetsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/LogicalSubnetsOperations.cs index feb56340436c..8976ec86cf54 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/LogicalSubnetsOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/LogicalSubnetsOperations.cs @@ -109,7 +109,10 @@ internal LogicalSubnetsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "logicalSubnet"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -121,7 +124,6 @@ internal LogicalSubnetsOperations(FabricAdminClient client) tracingParameters.Add("location", location); tracingParameters.Add("logicalNetwork", logicalNetwork); tracingParameters.Add("logicalSubnet", logicalSubnet); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -134,9 +136,9 @@ internal LogicalSubnetsOperations(FabricAdminClient client) _url = _url.Replace("{logicalNetwork}", System.Uri.EscapeDataString(logicalNetwork)); _url = _url.Replace("{logicalSubnet}", System.Uri.EscapeDataString(logicalSubnet)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -317,7 +319,10 @@ internal LogicalSubnetsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "logicalNetwork"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -329,7 +334,6 @@ internal LogicalSubnetsOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("logicalNetwork", logicalNetwork); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -349,9 +353,9 @@ internal LogicalSubnetsOperations(FabricAdminClient client) _queryParameters.Add(_odataFilter); } } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/MacAddressPoolsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/MacAddressPoolsOperations.cs index e471541e2eba..ce143fbed1ae 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/MacAddressPoolsOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/MacAddressPoolsOperations.cs @@ -102,7 +102,10 @@ internal MacAddressPoolsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "macAddressPool"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -113,7 +116,6 @@ internal MacAddressPoolsOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("macAddressPool", macAddressPool); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -125,9 +127,9 @@ internal MacAddressPoolsOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{macAddressPool}", System.Uri.EscapeDataString(macAddressPool)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -301,7 +303,10 @@ internal MacAddressPoolsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -312,7 +317,6 @@ internal MacAddressPoolsOperations(FabricAdminClient client) tracingParameters.Add("odataQuery", odataQuery); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -331,9 +335,9 @@ internal MacAddressPoolsOperations(FabricAdminClient client) _queryParameters.Add(_odataFilter); } } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ApplicationOperationResult.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ApplicationOperationResult.cs new file mode 100644 index 000000000000..1edca7bababf --- /dev/null +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ApplicationOperationResult.cs @@ -0,0 +1,72 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.AzureStack.Management.Fabric.Admin.Models +{ + using Microsoft.Rest; + using Microsoft.Rest.Serialization; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Application operation result description. + /// + [Rest.Serialization.JsonTransformation] + public partial class ApplicationOperationResult : Resource + { + /// + /// Initializes a new instance of the ApplicationOperationResult class. + /// + public ApplicationOperationResult() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ApplicationOperationResult class. + /// + /// URI of the resource. + /// Name of the resource. + /// Type of resource. + /// The region where the resource is + /// located. + /// List of key-value pairs. + /// List of operation result instances. + /// Success or failure of + /// operation. + public ApplicationOperationResult(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), IList instances = default(IList), string provisioningState = default(string)) + : base(id, name, type, location, tags) + { + Instances = instances; + ProvisioningState = provisioningState; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets list of operation result instances. + /// + [JsonProperty(PropertyName = "properties.instances")] + public IList Instances { get; set; } + + /// + /// Gets or sets success or failure of operation. + /// + [JsonProperty(PropertyName = "properties.provisioningState")] + public string ProvisioningState { get; set; } + + } +} diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ComputeOperationResult.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ComputeOperationResult.cs new file mode 100644 index 000000000000..f1fd879c01b6 --- /dev/null +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/ComputeOperationResult.cs @@ -0,0 +1,72 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.AzureStack.Management.Fabric.Admin.Models +{ + using Microsoft.Rest; + using Microsoft.Rest.Serialization; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Compute operation result description. + /// + [Rest.Serialization.JsonTransformation] + public partial class ComputeOperationResult : Resource + { + /// + /// Initializes a new instance of the ComputeOperationResult class. + /// + public ComputeOperationResult() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ComputeOperationResult class. + /// + /// URI of the resource. + /// Name of the resource. + /// Type of resource. + /// The region where the resource is + /// located. + /// List of key-value pairs. + /// List of operation result instances. + /// Success or failure of + /// operation. + public ComputeOperationResult(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), IList instances = default(IList), string provisioningState = default(string)) + : base(id, name, type, location, tags) + { + Instances = instances; + ProvisioningState = provisioningState; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets list of operation result instances. + /// + [JsonProperty(PropertyName = "properties.instances")] + public IList Instances { get; set; } + + /// + /// Gets or sets success or failure of operation. + /// + [JsonProperty(PropertyName = "properties.provisioningState")] + public string ProvisioningState { get; set; } + + } +} diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/Drive.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/Drive.cs deleted file mode 100644 index 1632916a4e54..000000000000 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/Drive.cs +++ /dev/null @@ -1,173 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.AzureStack.Management.Fabric.Admin.Models -{ - using Microsoft.Rest; - using Microsoft.Rest.Serialization; - using Newtonsoft.Json; - using System.Collections; - using System.Collections.Generic; - using System.Linq; - - /// - /// Representation of a drive resource. - /// - [Rest.Serialization.JsonTransformation] - public partial class Drive : Resource - { - /// - /// Initializes a new instance of the Drive class. - /// - public Drive() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the Drive class. - /// - /// URI of the resource. - /// Name of the resource. - /// Type of resource. - /// The region where the resource is - /// located. - /// List of key-value pairs. - /// Node that the drive is physically - /// connected. - /// Serial number of the drive. - /// Health status of the drive. - /// Operational status of the - /// drive. - /// Intended usage of the drive. - /// Indicate whether the drive can be added to - /// the pool. - /// Specify the reasons why the drive - /// cannot be added to the pool. - /// Indicate where the hardware is - /// located. - /// Model of the drive. - /// Media type of the drive. - /// Total capacity in GB of the drive. - /// Detailed description for - /// HealthStatus/OperationalStatus. Empty if - /// HealthStatus/OperationalStatus is Healthy/Ok. - /// Detailed recommended action for - /// HealthStatus/OperationalStatus. Empty if - /// HealthStatus/OperationalStatus is Healthy/Ok. - public Drive(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), string storageNode = default(string), string serialNumber = default(string), string healthStatus = default(string), string operationalStatus = default(string), string usage = default(string), bool? canPool = default(bool?), string cannotPoolReason = default(string), string physicalLocation = default(string), string model = default(string), string mediaType = default(string), int? capacityGB = default(int?), string description = default(string), string action = default(string)) - : base(id, name, type, location, tags) - { - StorageNode = storageNode; - SerialNumber = serialNumber; - HealthStatus = healthStatus; - OperationalStatus = operationalStatus; - Usage = usage; - CanPool = canPool; - CannotPoolReason = cannotPoolReason; - PhysicalLocation = physicalLocation; - Model = model; - MediaType = mediaType; - CapacityGB = capacityGB; - Description = description; - Action = action; - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets or sets node that the drive is physically connected. - /// - [JsonProperty(PropertyName = "properties.storageNode")] - public string StorageNode { get; set; } - - /// - /// Gets or sets serial number of the drive. - /// - [JsonProperty(PropertyName = "properties.serialNumber")] - public string SerialNumber { get; set; } - - /// - /// Gets or sets health status of the drive. - /// - [JsonProperty(PropertyName = "properties.healthStatus")] - public string HealthStatus { get; set; } - - /// - /// Gets or sets operational status of the drive. - /// - [JsonProperty(PropertyName = "properties.operationalStatus")] - public string OperationalStatus { get; set; } - - /// - /// Gets or sets intended usage of the drive. - /// - [JsonProperty(PropertyName = "properties.usage")] - public string Usage { get; set; } - - /// - /// Gets or sets indicate whether the drive can be added to the pool. - /// - [JsonProperty(PropertyName = "properties.canPool")] - public bool? CanPool { get; set; } - - /// - /// Gets or sets specify the reasons why the drive cannot be added to - /// the pool. - /// - [JsonProperty(PropertyName = "properties.cannotPoolReason")] - public string CannotPoolReason { get; set; } - - /// - /// Gets or sets indicate where the hardware is located. - /// - [JsonProperty(PropertyName = "properties.physicalLocation")] - public string PhysicalLocation { get; set; } - - /// - /// Gets or sets model of the drive. - /// - [JsonProperty(PropertyName = "properties.model")] - public string Model { get; set; } - - /// - /// Gets or sets media type of the drive. - /// - [JsonProperty(PropertyName = "properties.mediaType")] - public string MediaType { get; set; } - - /// - /// Gets or sets total capacity in GB of the drive. - /// - [JsonProperty(PropertyName = "properties.capacityGB")] - public int? CapacityGB { get; set; } - - /// - /// Gets or sets detailed description for - /// HealthStatus/OperationalStatus. Empty if - /// HealthStatus/OperationalStatus is Healthy/Ok. - /// - [JsonProperty(PropertyName = "properties.description")] - public string Description { get; set; } - - /// - /// Gets or sets detailed recommended action for - /// HealthStatus/OperationalStatus. Empty if - /// HealthStatus/OperationalStatus is Healthy/Ok. - /// - [JsonProperty(PropertyName = "properties.action")] - public string Action { get; set; } - - } -} diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/LogicalSubnet.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/LogicalSubnet.cs index ab06b5098eb1..707a1e85348f 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/LogicalSubnet.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/LogicalSubnet.cs @@ -43,7 +43,7 @@ public LogicalSubnet() /// List of key-value pairs. /// All IP pools which belong to this /// subnet. - /// The visiblity status of the IP pool. If is + /// The visibility status of the IP pool. If is /// true the associated pools are public IP address pools. /// Metadata related to the logical /// network. @@ -68,7 +68,7 @@ public LogicalSubnet() public IList IpPools { get; set; } /// - /// Gets or sets the visiblity status of the IP pool. If is true the + /// Gets or sets the visibility status of the IP pool. If is true the /// associated pools are public IP address pools. /// [JsonProperty(PropertyName = "properties.isPublic")] diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/NetworkOperationResult.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/NetworkOperationResult.cs new file mode 100644 index 000000000000..fed8e93ca059 --- /dev/null +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/NetworkOperationResult.cs @@ -0,0 +1,72 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.AzureStack.Management.Fabric.Admin.Models +{ + using Microsoft.Rest; + using Microsoft.Rest.Serialization; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Network operation result description. + /// + [Rest.Serialization.JsonTransformation] + public partial class NetworkOperationResult : Resource + { + /// + /// Initializes a new instance of the NetworkOperationResult class. + /// + public NetworkOperationResult() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the NetworkOperationResult class. + /// + /// URI of the resource. + /// Name of the resource. + /// Type of resource. + /// The region where the resource is + /// located. + /// List of key-value pairs. + /// List of operation result instances. + /// Success or failure of + /// operation. + public NetworkOperationResult(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), IList instances = default(IList), string provisioningState = default(string)) + : base(id, name, type, location, tags) + { + Instances = instances; + ProvisioningState = provisioningState; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets list of operation result instances. + /// + [JsonProperty(PropertyName = "properties.instances")] + public IList Instances { get; set; } + + /// + /// Gets or sets success or failure of operation. + /// + [JsonProperty(PropertyName = "properties.provisioningState")] + public string ProvisioningState { get; set; } + + } +} diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/StorageOperationResult.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/StorageOperationResult.cs new file mode 100644 index 000000000000..1489aa012d64 --- /dev/null +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/StorageOperationResult.cs @@ -0,0 +1,72 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.AzureStack.Management.Fabric.Admin.Models +{ + using Microsoft.Rest; + using Microsoft.Rest.Serialization; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Storage operation result description. + /// + [Rest.Serialization.JsonTransformation] + public partial class StorageOperationResult : Resource + { + /// + /// Initializes a new instance of the StorageOperationResult class. + /// + public StorageOperationResult() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the StorageOperationResult class. + /// + /// URI of the resource. + /// Name of the resource. + /// Type of resource. + /// The region where the resource is + /// located. + /// List of key-value pairs. + /// List of operation result instances. + /// Success or failure of + /// operation. + public StorageOperationResult(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), IList instances = default(IList), string provisioningState = default(string)) + : base(id, name, type, location, tags) + { + Instances = instances; + ProvisioningState = provisioningState; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets list of operation result instances. + /// + [JsonProperty(PropertyName = "properties.instances")] + public IList Instances { get; set; } + + /// + /// Gets or sets success or failure of operation. + /// + [JsonProperty(PropertyName = "properties.provisioningState")] + public string ProvisioningState { get; set; } + + } +} diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/StorageSubSystem.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/StorageSubSystem.cs deleted file mode 100644 index bb94bede1eed..000000000000 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/StorageSubSystem.cs +++ /dev/null @@ -1,99 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.AzureStack.Management.Fabric.Admin.Models -{ - using Microsoft.Rest; - using Microsoft.Rest.Serialization; - using Newtonsoft.Json; - using System.Collections; - using System.Collections.Generic; - using System.Linq; - - /// - /// Representation of a storage system resource. - /// - [Rest.Serialization.JsonTransformation] - public partial class StorageSubSystem : Resource - { - /// - /// Initializes a new instance of the StorageSubSystem class. - /// - public StorageSubSystem() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the StorageSubSystem class. - /// - /// URI of the resource. - /// Name of the resource. - /// Type of resource. - /// The region where the resource is - /// located. - /// List of key-value pairs. - /// Total capacity in GB of the - /// subsystem. - /// Remaining capacity in GB of the - /// subsystem. - /// Health status of the subsystem. - /// Operational status of the - /// subsystem. - /// Rebalance status of the - /// subsystem. - public StorageSubSystem(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), int? totalCapacityGB = default(int?), int? remainingCapacityGB = default(int?), string healthStatus = default(string), string operationalStatus = default(string), string rebalanceStatus = default(string)) - : base(id, name, type, location, tags) - { - TotalCapacityGB = totalCapacityGB; - RemainingCapacityGB = remainingCapacityGB; - HealthStatus = healthStatus; - OperationalStatus = operationalStatus; - RebalanceStatus = rebalanceStatus; - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets or sets total capacity in GB of the subsystem. - /// - [JsonProperty(PropertyName = "properties.totalCapacityGB")] - public int? TotalCapacityGB { get; set; } - - /// - /// Gets or sets remaining capacity in GB of the subsystem. - /// - [JsonProperty(PropertyName = "properties.remainingCapacityGB")] - public int? RemainingCapacityGB { get; set; } - - /// - /// Gets or sets health status of the subsystem. - /// - [JsonProperty(PropertyName = "properties.healthStatus")] - public string HealthStatus { get; set; } - - /// - /// Gets or sets operational status of the subsystem. - /// - [JsonProperty(PropertyName = "properties.operationalStatus")] - public string OperationalStatus { get; set; } - - /// - /// Gets or sets rebalance status of the subsystem. - /// - [JsonProperty(PropertyName = "properties.rebalanceStatus")] - public string RebalanceStatus { get; set; } - - } -} diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/Volume.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/Volume.cs index 8c2dd5fe032e..17d9a304fba9 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/Volume.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/Models/Volume.cs @@ -40,33 +40,16 @@ public Volume() /// The region where the resource is /// located. /// List of key-value pairs. - /// Total capacity in GB of the - /// volume. - /// Remaining capacity in GB of the - /// volume. - /// Health status of the volume. - /// Operational status of the - /// volume. - /// Repair status of the volume. Empty if no - /// repair job running, something like 'Running, 90%' when - /// repairing. - /// Detailed description for - /// HealthStatus/OperationalStatus. Empty if - /// HealthStatus/OperationalStatus is Healthy/Ok. - /// Detailed recommended action for - /// HealthStatus/OperationalStatus. Empty if - /// HealthStatus/OperationalStatus is Healthy/Ok. + /// Filesystem type. + /// Amount of free space in GB. + /// Total amount of space in GB. /// Volume label. - public Volume(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), int? totalCapacityGB = default(int?), int? remainingCapacityGB = default(int?), string healthStatus = default(string), string operationalStatus = default(string), string repairStatus = default(string), string description = default(string), string action = default(string), string volumeLabel = default(string)) + public Volume(string id = default(string), string name = default(string), string type = default(string), string location = default(string), IDictionary tags = default(IDictionary), string fileSystem = default(string), int? remainingSizeGB = default(int?), int? sizeGB = default(int?), string volumeLabel = default(string)) : base(id, name, type, location, tags) { - TotalCapacityGB = totalCapacityGB; - RemainingCapacityGB = remainingCapacityGB; - HealthStatus = healthStatus; - OperationalStatus = operationalStatus; - RepairStatus = repairStatus; - Description = description; - Action = action; + FileSystem = fileSystem; + RemainingSizeGB = remainingSizeGB; + SizeGB = sizeGB; VolumeLabel = volumeLabel; CustomInit(); } @@ -77,51 +60,22 @@ public Volume() partial void CustomInit(); /// - /// Gets or sets total capacity in GB of the volume. + /// Gets or sets filesystem type. /// - [JsonProperty(PropertyName = "properties.totalCapacityGB")] - public int? TotalCapacityGB { get; set; } + [JsonProperty(PropertyName = "properties.fileSystem")] + public string FileSystem { get; set; } /// - /// Gets or sets remaining capacity in GB of the volume. + /// Gets or sets amount of free space in GB. /// - [JsonProperty(PropertyName = "properties.remainingCapacityGB")] - public int? RemainingCapacityGB { get; set; } + [JsonProperty(PropertyName = "properties.remainingSizeGB")] + public int? RemainingSizeGB { get; set; } /// - /// Gets or sets health status of the volume. + /// Gets or sets total amount of space in GB. /// - [JsonProperty(PropertyName = "properties.healthStatus")] - public string HealthStatus { get; set; } - - /// - /// Gets or sets operational status of the volume. - /// - [JsonProperty(PropertyName = "properties.operationalStatus")] - public string OperationalStatus { get; set; } - - /// - /// Gets or sets repair status of the volume. Empty if no repair job - /// running, something like 'Running, 90%' when repairing. - /// - [JsonProperty(PropertyName = "properties.repairStatus")] - public string RepairStatus { get; set; } - - /// - /// Gets or sets detailed description for - /// HealthStatus/OperationalStatus. Empty if - /// HealthStatus/OperationalStatus is Healthy/Ok. - /// - [JsonProperty(PropertyName = "properties.description")] - public string Description { get; set; } - - /// - /// Gets or sets detailed recommended action for - /// HealthStatus/OperationalStatus. Empty if - /// HealthStatus/OperationalStatus is Healthy/Ok. - /// - [JsonProperty(PropertyName = "properties.action")] - public string Action { get; set; } + [JsonProperty(PropertyName = "properties.sizeGB")] + public int? SizeGB { get; set; } /// /// Gets or sets volume label. diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/NetworkOperationResultsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/NetworkOperationResultsOperations.cs new file mode 100644 index 000000000000..c600aba726c5 --- /dev/null +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/NetworkOperationResultsOperations.cs @@ -0,0 +1,641 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.AzureStack.Management.Fabric.Admin +{ + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Microsoft.Rest.Azure.OData; + 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; + + /// + /// NetworkOperationResultsOperations operations. + /// + internal partial class NetworkOperationResultsOperations : IServiceOperations, INetworkOperationResultsOperations + { + /// + /// Initializes a new instance of the NetworkOperationResultsOperations class. + /// + /// + /// Reference to the service client. + /// + /// + /// Thrown when a required parameter is null + /// + internal NetworkOperationResultsOperations(FabricAdminClient client) + { + if (client == null) + { + throw new System.ArgumentNullException("client"); + } + Client = client; + } + + /// + /// Gets a reference to the FabricAdminClient + /// + public FabricAdminClient Client { get; private set; } + + /// + /// Returns the status of a network operation. + /// + /// + /// Name of the resource group. + /// + /// + /// Location of the resource. + /// + /// + /// Operation identifier. + /// + /// + /// 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> GetWithHttpMessagesAsync(string resourceGroupName, string location, string operation, 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 (location == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "location"); + } + if (operation == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "operation"); + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("resourceGroupName", resourceGroupName); + tracingParameters.Add("location", location); + tracingParameters.Add("operation", operation); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "Get", 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.Fabric.Admin/fabricLocations/{location}/networkOperationResults/{operation}").ToString(); + _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); + _url = _url.Replace("{operation}", System.Uri.EscapeDataString(operation)); + List _queryParameters = new List(); + if (Client.ApiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.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 && (int)_statusCode != 404) + { + 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; + } + + /// + /// Returns a list of all network operation results at a location. + /// + /// + /// Name of the resource group. + /// + /// + /// Location of the resource. + /// + /// + /// OData parameters to apply to the operation. + /// + /// + /// Headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task>> ListWithHttpMessagesAsync(string resourceGroupName, string location, ODataQuery odataQuery = default(ODataQuery), 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 (location == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "location"); + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("odataQuery", odataQuery); + tracingParameters.Add("resourceGroupName", resourceGroupName); + tracingParameters.Add("location", location); + 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("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/networkOperationResults").ToString(); + _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); + _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); + _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); + List _queryParameters = new List(); + if (odataQuery != null) + { + var _odataFilter = odataQuery.ToString(); + if (!string.IsNullOrEmpty(_odataFilter)) + { + _queryParameters.Add(_odataFilter); + } + } + if (Client.ApiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.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 && (int)_statusCode != 404) + { + 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; + } + + /// + /// Returns a list of all network operation results at a location. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + /// + /// Headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// Thrown when a required parameter is null + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + if (nextPageLink == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "nextPageLink"); + } + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("nextPageLink", nextPageLink); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "ListNext", tracingParameters); + } + // Construct URL + string _url = "{nextLink}"; + _url = _url.Replace("{nextLink}", nextPageLink); + List _queryParameters = new List(); + 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 && (int)_statusCode != 404) + { + 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/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/NetworkOperationResultsOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/NetworkOperationResultsOperationsExtensions.cs new file mode 100644 index 000000000000..05d47b01f816 --- /dev/null +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/NetworkOperationResultsOperationsExtensions.cs @@ -0,0 +1,152 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.AzureStack.Management.Fabric.Admin +{ + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Microsoft.Rest.Azure.OData; + using Models; + using System.Threading; + using System.Threading.Tasks; + + /// + /// Extension methods for NetworkOperationResultsOperations. + /// + public static partial class NetworkOperationResultsOperationsExtensions + { + /// + /// Returns the status of a network operation. + /// + /// + /// The operations group for this extension method. + /// + /// + /// Name of the resource group. + /// + /// + /// Location of the resource. + /// + /// + /// Operation identifier. + /// + public static NetworkOperationResult Get(this INetworkOperationResultsOperations operations, string resourceGroupName, string location, string operation) + { + return operations.GetAsync(resourceGroupName, location, operation).GetAwaiter().GetResult(); + } + + /// + /// Returns the status of a network operation. + /// + /// + /// The operations group for this extension method. + /// + /// + /// Name of the resource group. + /// + /// + /// Location of the resource. + /// + /// + /// Operation identifier. + /// + /// + /// The cancellation token. + /// + public static async Task GetAsync(this INetworkOperationResultsOperations operations, string resourceGroupName, string location, string operation, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, location, operation, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + /// + /// Returns a list of all network operation results at a location. + /// + /// + /// The operations group for this extension method. + /// + /// + /// Name of the resource group. + /// + /// + /// Location of the resource. + /// + /// + /// OData parameters to apply to the operation. + /// + public static IPage List(this INetworkOperationResultsOperations operations, string resourceGroupName, string location, ODataQuery odataQuery = default(ODataQuery)) + { + return operations.ListAsync(resourceGroupName, location, odataQuery).GetAwaiter().GetResult(); + } + + /// + /// Returns a list of all network operation results at a location. + /// + /// + /// The operations group for this extension method. + /// + /// + /// Name of the resource group. + /// + /// + /// Location of the resource. + /// + /// + /// OData parameters to apply to the operation. + /// + /// + /// The cancellation token. + /// + public static async Task> ListAsync(this INetworkOperationResultsOperations operations, string resourceGroupName, string location, ODataQuery odataQuery = default(ODataQuery), CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.ListWithHttpMessagesAsync(resourceGroupName, location, odataQuery, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + /// + /// Returns a list of all network operation results at a location. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + public static IPage ListNext(this INetworkOperationResultsOperations operations, string nextPageLink) + { + return operations.ListNextAsync(nextPageLink).GetAwaiter().GetResult(); + } + + /// + /// Returns a list of all network operation results at a location. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + /// + /// The cancellation token. + /// + public static async Task> ListNextAsync(this INetworkOperationResultsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.ListNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + } +} diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ScaleUnitNodesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ScaleUnitNodesOperations.cs index 9fe42e80da79..84f602f3c0a7 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ScaleUnitNodesOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ScaleUnitNodesOperations.cs @@ -255,7 +255,10 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "scaleUnitNode"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -266,7 +269,6 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("scaleUnitNode", scaleUnitNode); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -278,9 +280,9 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{scaleUnitNode}", System.Uri.EscapeDataString(scaleUnitNode)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -454,7 +456,10 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -465,7 +470,6 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) tracingParameters.Add("odataQuery", odataQuery); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -484,9 +488,9 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) _queryParameters.Add(_odataFilter); } } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -661,7 +665,10 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "scaleUnitNode"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -672,7 +679,6 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("scaleUnitNode", scaleUnitNode); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginShutdown", tracingParameters); } @@ -684,9 +690,9 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{scaleUnitNode}", System.Uri.EscapeDataString(scaleUnitNode)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -843,7 +849,10 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "scaleUnitNode"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -854,7 +863,6 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("scaleUnitNode", scaleUnitNode); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginPowerOff", tracingParameters); } @@ -866,9 +874,9 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{scaleUnitNode}", System.Uri.EscapeDataString(scaleUnitNode)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -1025,7 +1033,10 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "scaleUnitNode"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1036,7 +1047,6 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("scaleUnitNode", scaleUnitNode); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginPowerOn", tracingParameters); } @@ -1048,9 +1058,9 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{scaleUnitNode}", System.Uri.EscapeDataString(scaleUnitNode)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -1207,7 +1217,10 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "scaleUnitNode"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1218,7 +1231,6 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("scaleUnitNode", scaleUnitNode); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginStartMaintenanceMode", tracingParameters); } @@ -1230,9 +1242,9 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{scaleUnitNode}", System.Uri.EscapeDataString(scaleUnitNode)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -1389,7 +1401,10 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "scaleUnitNode"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1400,7 +1415,6 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("scaleUnitNode", scaleUnitNode); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginStopMaintenanceMode", tracingParameters); } @@ -1412,9 +1426,9 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{scaleUnitNode}", System.Uri.EscapeDataString(scaleUnitNode)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -1574,11 +1588,14 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "scaleUnitNode"); } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } if (bareMetalNode == null) { throw new ValidationException(ValidationRules.CannotBeNull, "bareMetalNode"); } - string apiVersion = "2016-05-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1589,7 +1606,6 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("scaleUnitNode", scaleUnitNode); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("bareMetalNode", bareMetalNode); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginRepair", tracingParameters); @@ -1602,9 +1618,9 @@ internal ScaleUnitNodesOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{scaleUnitNode}", System.Uri.EscapeDataString(scaleUnitNode)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ScaleUnitsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ScaleUnitsOperations.cs index 2f2074ddb30c..36de594aff87 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ScaleUnitsOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/ScaleUnitsOperations.cs @@ -130,7 +130,10 @@ internal ScaleUnitsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "scaleUnit"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -141,7 +144,6 @@ internal ScaleUnitsOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("scaleUnit", scaleUnit); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -153,9 +155,9 @@ internal ScaleUnitsOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{scaleUnit}", System.Uri.EscapeDataString(scaleUnit)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -329,7 +331,10 @@ internal ScaleUnitsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -340,7 +345,6 @@ internal ScaleUnitsOperations(FabricAdminClient client) tracingParameters.Add("odataQuery", odataQuery); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -359,9 +363,9 @@ internal ScaleUnitsOperations(FabricAdminClient client) _queryParameters.Add(_odataFilter); } } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -543,7 +547,10 @@ internal ScaleUnitsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "nodeList"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -555,7 +562,6 @@ internal ScaleUnitsOperations(FabricAdminClient client) tracingParameters.Add("location", location); tracingParameters.Add("scaleUnit", scaleUnit); tracingParameters.Add("nodeList", nodeList); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "BeginScaleOut", tracingParameters); } @@ -567,9 +573,9 @@ internal ScaleUnitsOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{scaleUnit}", System.Uri.EscapeDataString(scaleUnit)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/SdkInfo_FabricAdminClient.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/SdkInfo_FabricAdminClient.cs index 200dbd4ed7c7..e634bb77c34c 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/SdkInfo_FabricAdminClient.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/SdkInfo_FabricAdminClient.cs @@ -19,7 +19,8 @@ public static IEnumerable> ApiInfo_FabricAdminClie { return new Tuple[] { - new Tuple("Fabric.Admin", "Drives", "2018-10-01"), + new Tuple("Fabric.Admin", "ApplicationOperationResults", "2016-05-01"), + new Tuple("Fabric.Admin", "ComputeOperationResults", "2016-05-01"), new Tuple("Fabric.Admin", "EdgeGatewayPools", "2016-05-01"), new Tuple("Fabric.Admin", "EdgeGateways", "2016-05-01"), new Tuple("Fabric.Admin", "Fabric", "2016-05-01"), @@ -31,26 +32,16 @@ public static IEnumerable> ApiInfo_FabricAdminClie new Tuple("Fabric.Admin", "LogicalNetworks", "2016-05-01"), new Tuple("Fabric.Admin", "LogicalSubnets", "2016-05-01"), new Tuple("Fabric.Admin", "MacAddressPools", "2016-05-01"), + new Tuple("Fabric.Admin", "NetworkOperationResults", "2016-05-01"), new Tuple("Fabric.Admin", "ScaleUnitNodes", "2016-05-01"), new Tuple("Fabric.Admin", "ScaleUnits", "2016-05-01"), new Tuple("Fabric.Admin", "SlbMuxInstances", "2016-05-01"), + new Tuple("Fabric.Admin", "StorageOperationResults", "2016-05-01"), new Tuple("Fabric.Admin", "StoragePools", "2016-05-01"), - new Tuple("Fabric.Admin", "StorageSubSystems", "2018-10-01"), new Tuple("Fabric.Admin", "StorageSystems", "2016-05-01"), - new Tuple("Fabric.Admin", "Volumes", "2018-10-01"), + new Tuple("Fabric.Admin", "Volumes", "2016-05-01"), }.AsEnumerable(); } } - // BEGIN: Code Generation Metadata Section - public static readonly String AutoRestVersion = "latest"; - public static readonly String AutoRestBootStrapperVersion = "autorest@2.0.4283"; - public static readonly String AutoRestCmdExecuted = "cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/azsadmin/resource-manager/fabric/readme.md --csharp --version=latest --reflect-api-versions --tag=package-2018-10-01 --csharp-sdks-folder=D:\\GitHub\\azure-sdk-for-net\\src\\AzureStack\\Admin\\FabricAdmin\\Fabric.Admin"; - public static readonly String GithubForkName = "Azure"; - public static readonly String GithubBranchName = "master"; - public static readonly String GithubCommidId = "7ae7189a99839315b540a0e1e3d233baa78850c1"; - public static readonly String CodeGenerationErrors = ""; - public static readonly String GithubRepoName = "azure-rest-api-specs"; - // END: Code Generation Metadata Section } } - diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/SlbMuxInstancesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/SlbMuxInstancesOperations.cs index 9a9a6443f691..b5f0eecb8664 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/SlbMuxInstancesOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/SlbMuxInstancesOperations.cs @@ -102,7 +102,10 @@ internal SlbMuxInstancesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "slbMuxInstance"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -113,7 +116,6 @@ internal SlbMuxInstancesOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("slbMuxInstance", slbMuxInstance); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -125,9 +127,9 @@ internal SlbMuxInstancesOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{slbMuxInstance}", System.Uri.EscapeDataString(slbMuxInstance)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -301,7 +303,10 @@ internal SlbMuxInstancesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -312,7 +317,6 @@ internal SlbMuxInstancesOperations(FabricAdminClient client) tracingParameters.Add("odataQuery", odataQuery); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -331,9 +335,9 @@ internal SlbMuxInstancesOperations(FabricAdminClient client) _queryParameters.Add(_odataFilter); } } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageSubSystemsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageOperationResultsOperations.cs similarity index 89% rename from src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageSubSystemsOperations.cs rename to src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageOperationResultsOperations.cs index bb794bcd323e..c5daeb91c83f 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageSubSystemsOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageOperationResultsOperations.cs @@ -24,12 +24,12 @@ namespace Microsoft.AzureStack.Management.Fabric.Admin using System.Threading.Tasks; /// - /// StorageSubSystemsOperations operations. + /// StorageOperationResultsOperations operations. /// - internal partial class StorageSubSystemsOperations : IServiceOperations, IStorageSubSystemsOperations + internal partial class StorageOperationResultsOperations : IServiceOperations, IStorageOperationResultsOperations { /// - /// Initializes a new instance of the StorageSubSystemsOperations class. + /// Initializes a new instance of the StorageOperationResultsOperations class. /// /// /// Reference to the service client. @@ -37,7 +37,7 @@ internal partial class StorageSubSystemsOperations : IServiceOperations /// Thrown when a required parameter is null /// - internal StorageSubSystemsOperations(FabricAdminClient client) + internal StorageOperationResultsOperations(FabricAdminClient client) { if (client == null) { @@ -52,7 +52,7 @@ internal StorageSubSystemsOperations(FabricAdminClient client) public FabricAdminClient Client { get; private set; } /// - /// Return the requested storage subsystem. + /// Returns the status of a storage operation. /// /// /// Name of the resource group. @@ -60,11 +60,8 @@ internal StorageSubSystemsOperations(FabricAdminClient client) /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// - /// - /// Name of the storage system. + /// + /// Operation identifier. /// /// /// Headers that will be added to request. @@ -87,7 +84,7 @@ internal StorageSubSystemsOperations(FabricAdminClient client) /// /// A response object containing the response body and response headers. /// - public async Task> GetWithHttpMessagesAsync(string resourceGroupName, string location, string scaleUnit, string storageSubSystem, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> GetWithHttpMessagesAsync(string resourceGroupName, string location, string operation, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.SubscriptionId == null) { @@ -101,15 +98,14 @@ internal StorageSubSystemsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } - if (scaleUnit == null) + if (operation == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "scaleUnit"); + throw new ValidationException(ValidationRules.CannotBeNull, "operation"); } - if (storageSubSystem == null) + if (Client.ApiVersion == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "storageSubSystem"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); } - string apiVersion = "2018-10-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -119,24 +115,21 @@ internal StorageSubSystemsOperations(FabricAdminClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); - tracingParameters.Add("scaleUnit", scaleUnit); - tracingParameters.Add("storageSubSystem", storageSubSystem); - tracingParameters.Add("apiVersion", apiVersion); + tracingParameters.Add("operation", operation); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", 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.Fabric.Admin/fabricLocations/{location}/scaleUnits/{scaleUnit}/storageSubSystems/{storageSubSystem}").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/storageOperationResults/{operation}").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); - _url = _url.Replace("{scaleUnit}", System.Uri.EscapeDataString(scaleUnit)); - _url = _url.Replace("{storageSubSystem}", System.Uri.EscapeDataString(storageSubSystem)); + _url = _url.Replace("{operation}", System.Uri.EscapeDataString(operation)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -231,7 +224,7 @@ internal StorageSubSystemsOperations(FabricAdminClient client) throw ex; } // Create Result - var _result = new AzureOperationResponse(); + var _result = new AzureOperationResponse(); _result.Request = _httpRequest; _result.Response = _httpResponse; if (_httpResponse.Headers.Contains("x-ms-request-id")) @@ -244,7 +237,7 @@ internal StorageSubSystemsOperations(FabricAdminClient client) _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); try { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); } catch (JsonException ex) { @@ -264,7 +257,7 @@ internal StorageSubSystemsOperations(FabricAdminClient client) } /// - /// Returns a list of all storage subsystems for a location. + /// Returns a list of all storage operation results at a location. /// /// /// Name of the resource group. @@ -272,9 +265,6 @@ internal StorageSubSystemsOperations(FabricAdminClient client) /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// /// /// OData parameters to apply to the operation. /// @@ -299,7 +289,7 @@ internal StorageSubSystemsOperations(FabricAdminClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListWithHttpMessagesAsync(string resourceGroupName, string location, string scaleUnit, ODataQuery odataQuery = default(ODataQuery), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListWithHttpMessagesAsync(string resourceGroupName, string location, ODataQuery odataQuery = default(ODataQuery), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.SubscriptionId == null) { @@ -313,11 +303,10 @@ internal StorageSubSystemsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } - if (scaleUnit == null) + if (Client.ApiVersion == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "scaleUnit"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); } - string apiVersion = "2018-10-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -328,18 +317,15 @@ internal StorageSubSystemsOperations(FabricAdminClient client) tracingParameters.Add("odataQuery", odataQuery); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); - tracingParameters.Add("scaleUnit", scaleUnit); - 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("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/scaleUnits/{scaleUnit}/storageSubSystems").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/storageOperationResults").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); - _url = _url.Replace("{scaleUnit}", System.Uri.EscapeDataString(scaleUnit)); List _queryParameters = new List(); if (odataQuery != null) { @@ -349,9 +335,9 @@ internal StorageSubSystemsOperations(FabricAdminClient client) _queryParameters.Add(_odataFilter); } } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -446,7 +432,7 @@ internal StorageSubSystemsOperations(FabricAdminClient client) throw ex; } // Create Result - var _result = new AzureOperationResponse>(); + var _result = new AzureOperationResponse>(); _result.Request = _httpRequest; _result.Response = _httpResponse; if (_httpResponse.Headers.Contains("x-ms-request-id")) @@ -459,7 +445,7 @@ internal StorageSubSystemsOperations(FabricAdminClient client) _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); try { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); } catch (JsonException ex) { @@ -479,7 +465,7 @@ internal StorageSubSystemsOperations(FabricAdminClient client) } /// - /// Returns a list of all storage subsystems for a location. + /// Returns a list of all storage operation results at a location. /// /// /// The NextLink from the previous successful call to List operation. @@ -505,7 +491,7 @@ internal StorageSubSystemsOperations(FabricAdminClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (nextPageLink == null) { @@ -619,7 +605,7 @@ internal StorageSubSystemsOperations(FabricAdminClient client) throw ex; } // Create Result - var _result = new AzureOperationResponse>(); + var _result = new AzureOperationResponse>(); _result.Request = _httpRequest; _result.Response = _httpResponse; if (_httpResponse.Headers.Contains("x-ms-request-id")) @@ -632,7 +618,7 @@ internal StorageSubSystemsOperations(FabricAdminClient client) _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); try { - _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); + _result.Body = Rest.Serialization.SafeJsonConvert.DeserializeObject>(_responseContent, Client.DeserializationSettings); } catch (JsonException ex) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageOperationResultsOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageOperationResultsOperationsExtensions.cs new file mode 100644 index 000000000000..721752b59f04 --- /dev/null +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageOperationResultsOperationsExtensions.cs @@ -0,0 +1,152 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.AzureStack.Management.Fabric.Admin +{ + using Microsoft.Rest; + using Microsoft.Rest.Azure; + using Microsoft.Rest.Azure.OData; + using Models; + using System.Threading; + using System.Threading.Tasks; + + /// + /// Extension methods for StorageOperationResultsOperations. + /// + public static partial class StorageOperationResultsOperationsExtensions + { + /// + /// Returns the status of a storage operation. + /// + /// + /// The operations group for this extension method. + /// + /// + /// Name of the resource group. + /// + /// + /// Location of the resource. + /// + /// + /// Operation identifier. + /// + public static StorageOperationResult Get(this IStorageOperationResultsOperations operations, string resourceGroupName, string location, string operation) + { + return operations.GetAsync(resourceGroupName, location, operation).GetAwaiter().GetResult(); + } + + /// + /// Returns the status of a storage operation. + /// + /// + /// The operations group for this extension method. + /// + /// + /// Name of the resource group. + /// + /// + /// Location of the resource. + /// + /// + /// Operation identifier. + /// + /// + /// The cancellation token. + /// + public static async Task GetAsync(this IStorageOperationResultsOperations operations, string resourceGroupName, string location, string operation, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, location, operation, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + /// + /// Returns a list of all storage operation results at a location. + /// + /// + /// The operations group for this extension method. + /// + /// + /// Name of the resource group. + /// + /// + /// Location of the resource. + /// + /// + /// OData parameters to apply to the operation. + /// + public static IPage List(this IStorageOperationResultsOperations operations, string resourceGroupName, string location, ODataQuery odataQuery = default(ODataQuery)) + { + return operations.ListAsync(resourceGroupName, location, odataQuery).GetAwaiter().GetResult(); + } + + /// + /// Returns a list of all storage operation results at a location. + /// + /// + /// The operations group for this extension method. + /// + /// + /// Name of the resource group. + /// + /// + /// Location of the resource. + /// + /// + /// OData parameters to apply to the operation. + /// + /// + /// The cancellation token. + /// + public static async Task> ListAsync(this IStorageOperationResultsOperations operations, string resourceGroupName, string location, ODataQuery odataQuery = default(ODataQuery), CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.ListWithHttpMessagesAsync(resourceGroupName, location, odataQuery, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + /// + /// Returns a list of all storage operation results at a location. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + public static IPage ListNext(this IStorageOperationResultsOperations operations, string nextPageLink) + { + return operations.ListNextAsync(nextPageLink).GetAwaiter().GetResult(); + } + + /// + /// Returns a list of all storage operation results at a location. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + /// + /// The cancellation token. + /// + public static async Task> ListNextAsync(this IStorageOperationResultsOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.ListNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + + } +} diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StoragePoolsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StoragePoolsOperations.cs index fe4f9e47660b..9ff150f6193e 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StoragePoolsOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StoragePoolsOperations.cs @@ -109,7 +109,10 @@ internal StoragePoolsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "storagePool"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -121,7 +124,6 @@ internal StoragePoolsOperations(FabricAdminClient client) tracingParameters.Add("location", location); tracingParameters.Add("storageSubSystem", storageSubSystem); tracingParameters.Add("storagePool", storagePool); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -134,9 +136,9 @@ internal StoragePoolsOperations(FabricAdminClient client) _url = _url.Replace("{storageSubSystem}", System.Uri.EscapeDataString(storageSubSystem)); _url = _url.Replace("{storagePool}", System.Uri.EscapeDataString(storagePool)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -317,7 +319,10 @@ internal StoragePoolsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "storageSubSystem"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -329,7 +334,6 @@ internal StoragePoolsOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("storageSubSystem", storageSubSystem); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -349,9 +353,9 @@ internal StoragePoolsOperations(FabricAdminClient client) _queryParameters.Add(_odataFilter); } } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageSystemsOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageSystemsOperations.cs index 8cc59d7f8ddf..a4967373adec 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageSystemsOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/StorageSystemsOperations.cs @@ -102,7 +102,10 @@ internal StorageSystemsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "storageSubSystem"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -113,7 +116,6 @@ internal StorageSystemsOperations(FabricAdminClient client) tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); tracingParameters.Add("storageSubSystem", storageSubSystem); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", tracingParameters); } @@ -125,9 +127,9 @@ internal StorageSystemsOperations(FabricAdminClient client) _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); _url = _url.Replace("{storageSubSystem}", System.Uri.EscapeDataString(storageSubSystem)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -301,7 +303,10 @@ internal StorageSystemsOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } - string apiVersion = "2016-05-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -312,7 +317,6 @@ internal StorageSystemsOperations(FabricAdminClient client) tracingParameters.Add("odataQuery", odataQuery); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "List", tracingParameters); } @@ -331,9 +335,9 @@ internal StorageSystemsOperations(FabricAdminClient client) _queryParameters.Add(_odataFilter); } } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/VolumesOperations.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/VolumesOperations.cs index eebe783e683b..81a40b791b54 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/VolumesOperations.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/VolumesOperations.cs @@ -60,12 +60,12 @@ internal VolumesOperations(FabricAdminClient client) /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// /// /// Name of the storage system. /// + /// + /// Storage pool name. + /// /// /// Name of the storage volume. /// @@ -90,7 +90,7 @@ internal VolumesOperations(FabricAdminClient client) /// /// A response object containing the response body and response headers. /// - public async Task> GetWithHttpMessagesAsync(string resourceGroupName, string location, string scaleUnit, string storageSubSystem, string volume, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task> GetWithHttpMessagesAsync(string resourceGroupName, string location, string storageSubSystem, string storagePool, string volume, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.SubscriptionId == null) { @@ -104,19 +104,22 @@ internal VolumesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } - if (scaleUnit == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "scaleUnit"); - } if (storageSubSystem == null) { throw new ValidationException(ValidationRules.CannotBeNull, "storageSubSystem"); } + if (storagePool == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "storagePool"); + } if (volume == null) { throw new ValidationException(ValidationRules.CannotBeNull, "volume"); } - string apiVersion = "2018-10-01"; + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -126,26 +129,25 @@ internal VolumesOperations(FabricAdminClient client) Dictionary tracingParameters = new Dictionary(); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); - tracingParameters.Add("scaleUnit", scaleUnit); tracingParameters.Add("storageSubSystem", storageSubSystem); + tracingParameters.Add("storagePool", storagePool); tracingParameters.Add("volume", volume); - tracingParameters.Add("apiVersion", apiVersion); tracingParameters.Add("cancellationToken", cancellationToken); ServiceClientTracing.Enter(_invocationId, this, "Get", 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.Fabric.Admin/fabricLocations/{location}/scaleUnits/{scaleUnit}/storageSubSystems/{storageSubSystem}/volumes/{volume}").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/storageSubSystems/{storageSubSystem}/storagePools/{storagePool}/volumes/{volume}").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); - _url = _url.Replace("{scaleUnit}", System.Uri.EscapeDataString(scaleUnit)); _url = _url.Replace("{storageSubSystem}", System.Uri.EscapeDataString(storageSubSystem)); + _url = _url.Replace("{storagePool}", System.Uri.EscapeDataString(storagePool)); _url = _url.Replace("{volume}", System.Uri.EscapeDataString(volume)); List _queryParameters = new List(); - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { @@ -281,12 +283,12 @@ internal VolumesOperations(FabricAdminClient client) /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// /// /// Name of the storage system. /// + /// + /// Storage pool name. + /// /// /// OData parameters to apply to the operation. /// @@ -311,7 +313,7 @@ internal VolumesOperations(FabricAdminClient client) /// /// A response object containing the response body and response headers. /// - public async Task>> ListWithHttpMessagesAsync(string resourceGroupName, string location, string scaleUnit, string storageSubSystem, ODataQuery odataQuery = default(ODataQuery), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> ListWithHttpMessagesAsync(string resourceGroupName, string location, string storageSubSystem, string storagePool, ODataQuery odataQuery = default(ODataQuery), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (Client.SubscriptionId == null) { @@ -325,15 +327,18 @@ internal VolumesOperations(FabricAdminClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "location"); } - if (scaleUnit == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "scaleUnit"); - } if (storageSubSystem == null) { throw new ValidationException(ValidationRules.CannotBeNull, "storageSubSystem"); } - string apiVersion = "2018-10-01"; + if (storagePool == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "storagePool"); + } + if (Client.ApiVersion == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.ApiVersion"); + } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -344,20 +349,19 @@ internal VolumesOperations(FabricAdminClient client) tracingParameters.Add("odataQuery", odataQuery); tracingParameters.Add("resourceGroupName", resourceGroupName); tracingParameters.Add("location", location); - tracingParameters.Add("scaleUnit", scaleUnit); tracingParameters.Add("storageSubSystem", storageSubSystem); - tracingParameters.Add("apiVersion", apiVersion); + tracingParameters.Add("storagePool", storagePool); 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("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/scaleUnits/{scaleUnit}/storageSubSystems/{storageSubSystem}/volumes").ToString(); + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Fabric.Admin/fabricLocations/{location}/storageSubSystems/{storageSubSystem}/storagePools/{storagePool}/volumes").ToString(); _url = _url.Replace("{subscriptionId}", System.Uri.EscapeDataString(Client.SubscriptionId)); _url = _url.Replace("{resourceGroupName}", System.Uri.EscapeDataString(resourceGroupName)); _url = _url.Replace("{location}", System.Uri.EscapeDataString(location)); - _url = _url.Replace("{scaleUnit}", System.Uri.EscapeDataString(scaleUnit)); _url = _url.Replace("{storageSubSystem}", System.Uri.EscapeDataString(storageSubSystem)); + _url = _url.Replace("{storagePool}", System.Uri.EscapeDataString(storagePool)); List _queryParameters = new List(); if (odataQuery != null) { @@ -367,9 +371,9 @@ internal VolumesOperations(FabricAdminClient client) _queryParameters.Add(_odataFilter); } } - if (apiVersion != null) + if (Client.ApiVersion != null) { - _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(Client.ApiVersion))); } if (_queryParameters.Count > 0) { diff --git a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/VolumesOperationsExtensions.cs b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/VolumesOperationsExtensions.cs index 299c840854cb..a4935ccfc326 100644 --- a/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/VolumesOperationsExtensions.cs +++ b/src/AzureStack/Admin/FabricAdmin/Fabric.Admin/Generated/VolumesOperationsExtensions.cs @@ -34,18 +34,18 @@ public static partial class VolumesOperationsExtensions /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// /// /// Name of the storage system. /// + /// + /// Storage pool name. + /// /// /// Name of the storage volume. /// - public static Volume Get(this IVolumesOperations operations, string resourceGroupName, string location, string scaleUnit, string storageSubSystem, string volume) + public static Volume Get(this IVolumesOperations operations, string resourceGroupName, string location, string storageSubSystem, string storagePool, string volume) { - return operations.GetAsync(resourceGroupName, location, scaleUnit, storageSubSystem, volume).GetAwaiter().GetResult(); + return operations.GetAsync(resourceGroupName, location, storageSubSystem, storagePool, volume).GetAwaiter().GetResult(); } /// @@ -60,21 +60,21 @@ public static Volume Get(this IVolumesOperations operations, string resourceGrou /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// /// /// Name of the storage system. /// + /// + /// Storage pool name. + /// /// /// Name of the storage volume. /// /// /// The cancellation token. /// - public static async Task GetAsync(this IVolumesOperations operations, string resourceGroupName, string location, string scaleUnit, string storageSubSystem, string volume, CancellationToken cancellationToken = default(CancellationToken)) + public static async Task GetAsync(this IVolumesOperations operations, string resourceGroupName, string location, string storageSubSystem, string storagePool, string volume, CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, location, scaleUnit, storageSubSystem, volume, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.GetWithHttpMessagesAsync(resourceGroupName, location, storageSubSystem, storagePool, volume, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; } @@ -92,18 +92,18 @@ public static Volume Get(this IVolumesOperations operations, string resourceGrou /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// /// /// Name of the storage system. /// + /// + /// Storage pool name. + /// /// /// OData parameters to apply to the operation. /// - public static IPage List(this IVolumesOperations operations, string resourceGroupName, string location, string scaleUnit, string storageSubSystem, ODataQuery odataQuery = default(ODataQuery)) + public static IPage List(this IVolumesOperations operations, string resourceGroupName, string location, string storageSubSystem, string storagePool, ODataQuery odataQuery = default(ODataQuery)) { - return operations.ListAsync(resourceGroupName, location, scaleUnit, storageSubSystem, odataQuery).GetAwaiter().GetResult(); + return operations.ListAsync(resourceGroupName, location, storageSubSystem, storagePool, odataQuery).GetAwaiter().GetResult(); } /// @@ -118,21 +118,21 @@ public static Volume Get(this IVolumesOperations operations, string resourceGrou /// /// Location of the resource. /// - /// - /// Name of the scale units. - /// /// /// Name of the storage system. /// + /// + /// Storage pool name. + /// /// /// OData parameters to apply to the operation. /// /// /// The cancellation token. /// - public static async Task> ListAsync(this IVolumesOperations operations, string resourceGroupName, string location, string scaleUnit, string storageSubSystem, ODataQuery odataQuery = default(ODataQuery), CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> ListAsync(this IVolumesOperations operations, string resourceGroupName, string location, string storageSubSystem, string storagePool, ODataQuery odataQuery = default(ODataQuery), CancellationToken cancellationToken = default(CancellationToken)) { - using (var _result = await operations.ListWithHttpMessagesAsync(resourceGroupName, location, scaleUnit, storageSubSystem, odataQuery, null, cancellationToken).ConfigureAwait(false)) + using (var _result = await operations.ListWithHttpMessagesAsync(resourceGroupName, location, storageSubSystem, storagePool, odataQuery, null, cancellationToken).ConfigureAwait(false)) { return _result.Body; }