From d641ae7b1373392fd0bf9ced76e0f7cd5667a84c Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Thu, 9 Dec 2021 00:33:47 +0000 Subject: [PATCH] CodeGen from PR 17014 in Azure/azure-rest-api-specs Merge 54b7f469ee1782025a3858aafd3d77b17f1d0ec7 into d710fb7f40338ca6ef00e0a9680be0a3d4cf5059 --- .../Generated/AzureReservationAPIClient.cs | 10 +- .../AzureReservationAPIClientExtensions.cs | 4 +- .../Generated/CalculateExchangeOperations.cs | 2 +- .../src/Generated/ExchangeOperations.cs | 2 +- .../Generated/IAzureReservationAPIClient.cs | 2 +- .../src/Generated/IReservationOperations.cs | 71 ++++ .../Generated/IReservationOrderOperations.cs | 29 ++ .../CalculatePriceResponseProperties.cs | 36 +- ...eResponsePropertiesBillingCurrencyTotal.cs | 7 + ...eResponsePropertiesPricingCurrencyTotal.cs | 4 + .../src/Generated/Models/Catalog.cs | 32 +- .../src/Generated/Models/CatalogMsrp.cs | 52 +++ .../Models/ChangeDirectoryRequest.cs | 50 +++ .../Models/ChangeDirectoryResponse.cs | 57 +++ .../Generated/Models/ChangeDirectoryResult.cs | 80 ++++ .../src/Generated/Models/CreatedByType.cs | 24 ++ .../src/Generated/Models/CurrentQuotaLimit.cs | 10 +- .../src/Generated/Models/ErrorDetails.cs | 68 +++ .../src/Generated/Models/ErrorResponse.cs | 52 +++ .../src/Generated/Models/ErrorResponseCode.cs | 1 + .../Models/ErrorResponseException.cs | 62 +++ .../src/Generated/Models/ExtendedErrorInfo.cs | 6 +- .../src/Generated/Models/Kind.cs | 54 +++ .../src/Generated/Models/OperationResponse.cs | 25 +- .../src/Generated/Models/PurchaseRequest.cs | 16 +- .../src/Generated/Models/QuotaProperties.cs | 12 +- .../Generated/Models/QuotaRequestDetails.cs | 11 +- .../QuotaRequestOneResourceSubmitResponse.cs | 11 +- .../Models/QuotaRequestProperties.cs | 11 +- .../src/Generated/Models/QuotaRequestState.cs | 25 ++ .../Models/QuotaRequestSubmitResponse201.cs | 10 +- ...wPropertiesResponseBillingCurrencyTotal.cs | 4 + ...wPropertiesResponsePricingCurrencyTotal.cs | 4 + .../Models/ReservationOrderResponse.cs | 30 +- .../Generated/Models/ReservationProperties.cs | 227 ---------- .../Generated/Models/ReservationResponse.cs | 33 +- .../Generated/Models/ReservationSummary.cs | 97 +++++ .../src/Generated/Models/ReservationTerm.cs | 1 + .../ReservationUtilizationAggregates.cs | 77 ++++ .../Models/ReservationsProperties.cs | 334 +++++++++++++++ .../ReservationsPropertiesUtilization.cs | 65 +++ .../Generated/Models/ReservedResourceType.cs | 5 + .../src/Generated/Models/ResourceType.cs | 25 ++ .../src/Generated/Models/SkuCapability.cs | 57 +++ .../src/Generated/Models/SubRequest.cs | 11 +- .../src/Generated/Models/SystemData.cs | 103 +++++ .../src/Generated/OperationOperations.cs | 2 +- .../src/Generated/ReservationOperations.cs | 399 +++++++++++++++++- .../ReservationOperationsExtensions.cs | 116 +++++ .../Generated/ReservationOrderOperations.cs | 201 ++++++++- .../ReservationOrderOperationsExtensions.cs | 48 +++ .../Generated/SdkInfo_AzureReservationAPI.cs | 14 +- 52 files changed, 2383 insertions(+), 306 deletions(-) create mode 100644 sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CatalogMsrp.cs create mode 100644 sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ChangeDirectoryRequest.cs create mode 100644 sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ChangeDirectoryResponse.cs create mode 100644 sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ChangeDirectoryResult.cs create mode 100644 sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CreatedByType.cs create mode 100644 sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ErrorDetails.cs create mode 100644 sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ErrorResponse.cs create mode 100644 sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ErrorResponseException.cs create mode 100644 sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/Kind.cs create mode 100644 sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestState.cs delete mode 100644 sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationProperties.cs create mode 100644 sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationSummary.cs create mode 100644 sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationUtilizationAggregates.cs create mode 100644 sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationsProperties.cs create mode 100644 sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationsPropertiesUtilization.cs create mode 100644 sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ResourceType.cs create mode 100644 sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/SkuCapability.cs create mode 100644 sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/SystemData.cs diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/AzureReservationAPIClient.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/AzureReservationAPIClient.cs index 3429f3bf7ee5a..ba14287bd88c9 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/AzureReservationAPIClient.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/AzureReservationAPIClient.cs @@ -415,17 +415,13 @@ private void Initialize() /// /// A response object containing the response body and response headers. /// - public async Task>> GetCatalogWithHttpMessagesAsync(string subscriptionId, string reservedResourceType, string location = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + public async Task>> GetCatalogWithHttpMessagesAsync(string subscriptionId, string reservedResourceType = default(string), string location = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { if (subscriptionId == null) { throw new ValidationException(ValidationRules.CannotBeNull, "subscriptionId"); } - if (reservedResourceType == null) - { - throw new ValidationException(ValidationRules.CannotBeNull, "reservedResourceType"); - } - string apiVersion = "2020-10-01-preview"; + string apiVersion = "2021-07-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -614,7 +610,7 @@ private void Initialize() { throw new ValidationException(ValidationRules.CannotBeNull, "subscriptionId"); } - string apiVersion = "2020-10-01-preview"; + string apiVersion = "2021-07-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/AzureReservationAPIClientExtensions.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/AzureReservationAPIClientExtensions.cs index c2db522acc3ec..d8f6a7444f322 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/AzureReservationAPIClientExtensions.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/AzureReservationAPIClientExtensions.cs @@ -40,7 +40,7 @@ public static partial class AzureReservationAPIClientExtensions /// Filters the skus based on the location specified in this parameter. This /// can be an azure region or global /// - public static IList GetCatalog(this IAzureReservationAPIClient operations, string subscriptionId, string reservedResourceType, string location = default(string)) + public static IList GetCatalog(this IAzureReservationAPIClient operations, string subscriptionId, string reservedResourceType = default(string), string location = default(string)) { return operations.GetCatalogAsync(subscriptionId, reservedResourceType, location).GetAwaiter().GetResult(); } @@ -65,7 +65,7 @@ public static partial class AzureReservationAPIClientExtensions /// /// The cancellation token. /// - public static async Task> GetCatalogAsync(this IAzureReservationAPIClient operations, string subscriptionId, string reservedResourceType, string location = default(string), CancellationToken cancellationToken = default(CancellationToken)) + public static async Task> GetCatalogAsync(this IAzureReservationAPIClient operations, string subscriptionId, string reservedResourceType = default(string), string location = default(string), CancellationToken cancellationToken = default(CancellationToken)) { using (var _result = await operations.GetCatalogWithHttpMessagesAsync(subscriptionId, reservedResourceType, location, null, cancellationToken).ConfigureAwait(false)) { diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/CalculateExchangeOperations.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/CalculateExchangeOperations.cs index e5429056a2441..f9723dff9e0d6 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/CalculateExchangeOperations.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/CalculateExchangeOperations.cs @@ -112,7 +112,7 @@ internal CalculateExchangeOperations(AzureReservationAPIClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "body"); } - string apiVersion = "2020-10-01-preview"; + string apiVersion = "2021-07-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ExchangeOperations.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ExchangeOperations.cs index f95e0de221f20..22f87f833d573 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ExchangeOperations.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ExchangeOperations.cs @@ -112,7 +112,7 @@ internal ExchangeOperations(AzureReservationAPIClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "body"); } - string apiVersion = "2020-10-01-preview"; + string apiVersion = "2021-07-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/IAzureReservationAPIClient.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/IAzureReservationAPIClient.cs index 78316279b0bb8..bf472045b5774 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/IAzureReservationAPIClient.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/IAzureReservationAPIClient.cs @@ -117,7 +117,7 @@ public partial interface IAzureReservationAPIClient : System.IDisposable /// /// The cancellation token. /// - Task>> GetCatalogWithHttpMessagesAsync(string subscriptionId, string reservedResourceType, string location = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + Task>> GetCatalogWithHttpMessagesAsync(string subscriptionId, string reservedResourceType = default(string), string location = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// /// Get list of applicable `Reservation`s. diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/IReservationOperations.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/IReservationOperations.cs index 24d8d91abf121..3f0013adcd433 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/IReservationOperations.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/IReservationOperations.cs @@ -228,6 +228,53 @@ public partial interface IReservationOperations /// Task>> ListRevisionsWithHttpMessagesAsync(string reservationId, string reservationOrderId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// + /// List the reservations and the roll up counts of reservations group + /// by provisioning states that the user has access to in the current + /// tenant. + /// + /// + /// May be used to filter by reservation properties. The filter + /// supports 'eq', 'or', and 'and'. It does not currently support 'ne', + /// 'gt', 'le', 'ge', or 'not'. Reservation properties include + /// sku/name, properties/{appliedScopeType, archived, displayName, + /// displayProvisioningState, effectiveDateTime, expiryDate, + /// provisioningState, quantity, renew, reservedResourceType, term, + /// userFriendlyAppliedScopeType, userFriendlyRenewState} + /// + /// + /// May be used to sort order by reservation properties. + /// + /// + /// To indicate whether to refresh the roll up counts of the + /// reservations group by provisioning states + /// + /// + /// The number of reservations to skip from the list before returning + /// results + /// + /// + /// The selected provisioning state + /// + /// + /// To number of reservations to return + /// + /// + /// 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>> ListAllWithHttpMessagesAsync(string filter = default(string), string orderby = default(string), string refreshSummary = default(string), double? skiptoken = default(double?), string selectedState = default(string), double? take = default(double?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// /// Get Available Scopes for `Reservation`. /// /// @@ -397,5 +444,29 @@ public partial interface IReservationOperations /// Thrown when a required parameter is null /// Task>> ListRevisionsNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// + /// List the reservations and the roll up counts of reservations group + /// by provisioning states that the user has access to in the current + /// tenant. + /// + /// + /// 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>> ListAllNextWithHttpMessagesAsync(string nextPageLink, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); } } diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/IReservationOrderOperations.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/IReservationOrderOperations.cs index 7afbb6a9be58a..667cc7045fd9b 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/IReservationOrderOperations.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/IReservationOrderOperations.cs @@ -129,6 +129,35 @@ public partial interface IReservationOrderOperations /// Task> GetWithHttpMessagesAsync(string reservationOrderId, string expand = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); /// + /// Change directory of `ReservationOrder`. + /// + /// + /// Change directory (tenant) of `ReservationOrder` and all + /// `Reservation` under it to specified tenant id + /// + /// + /// Order Id of the reservation + /// + /// + /// Information needed to change directory of reservation order + /// + /// + /// 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> ChangeDirectoryWithHttpMessagesAsync(string reservationOrderId, ChangeDirectoryRequest body, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)); + /// /// Purchase `ReservationOrder` /// /// diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CalculatePriceResponseProperties.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CalculatePriceResponseProperties.cs index eb8049c9485b6..2ff7bdff15109 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CalculatePriceResponseProperties.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CalculatePriceResponseProperties.cs @@ -33,6 +33,12 @@ public CalculatePriceResponseProperties() /// Currency and amount that /// customer will be charged in customer's local currency. Tax is not /// included. + /// Net total amount in pricing + /// currency. + /// Tax amount in pricing currency. + /// Total amount in pricing currency. + /// Whether or not tax is included in grand + /// total /// True if billing is managed by /// Microsoft Partner. Used only for CSP accounts. /// GUID that represents reservation @@ -44,9 +50,13 @@ public CalculatePriceResponseProperties() /// Amount that Microsoft uses for /// record. Used during refund for calculating refund limit. Tax is not /// included. - public CalculatePriceResponseProperties(CalculatePriceResponsePropertiesBillingCurrencyTotal billingCurrencyTotal = default(CalculatePriceResponsePropertiesBillingCurrencyTotal), bool? isBillingPartnerManaged = default(bool?), string reservationOrderId = default(string), string skuTitle = default(string), string skuDescription = default(string), CalculatePriceResponsePropertiesPricingCurrencyTotal pricingCurrencyTotal = default(CalculatePriceResponsePropertiesPricingCurrencyTotal), IList paymentSchedule = default(IList)) + public CalculatePriceResponseProperties(CalculatePriceResponsePropertiesBillingCurrencyTotal billingCurrencyTotal = default(CalculatePriceResponsePropertiesBillingCurrencyTotal), double? netTotal = default(double?), double? taxTotal = default(double?), double? grandTotal = default(double?), bool? isTaxIncluded = default(bool?), bool? isBillingPartnerManaged = default(bool?), string reservationOrderId = default(string), string skuTitle = default(string), string skuDescription = default(string), CalculatePriceResponsePropertiesPricingCurrencyTotal pricingCurrencyTotal = default(CalculatePriceResponsePropertiesPricingCurrencyTotal), IList paymentSchedule = default(IList)) { BillingCurrencyTotal = billingCurrencyTotal; + NetTotal = netTotal; + TaxTotal = taxTotal; + GrandTotal = grandTotal; + IsTaxIncluded = isTaxIncluded; IsBillingPartnerManaged = isBillingPartnerManaged; ReservationOrderId = reservationOrderId; SkuTitle = skuTitle; @@ -68,6 +78,30 @@ public CalculatePriceResponseProperties() [JsonProperty(PropertyName = "billingCurrencyTotal")] public CalculatePriceResponsePropertiesBillingCurrencyTotal BillingCurrencyTotal { get; set; } + /// + /// Gets or sets net total amount in pricing currency. + /// + [JsonProperty(PropertyName = "netTotal")] + public double? NetTotal { get; set; } + + /// + /// Gets or sets tax amount in pricing currency. + /// + [JsonProperty(PropertyName = "taxTotal")] + public double? TaxTotal { get; set; } + + /// + /// Gets or sets total amount in pricing currency. + /// + [JsonProperty(PropertyName = "grandTotal")] + public double? GrandTotal { get; set; } + + /// + /// Gets or sets whether or not tax is included in grand total + /// + [JsonProperty(PropertyName = "isTaxIncluded")] + public bool? IsTaxIncluded { get; set; } + /// /// Gets or sets true if billing is managed by Microsoft Partner. Used /// only for CSP accounts. diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CalculatePriceResponsePropertiesBillingCurrencyTotal.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CalculatePriceResponsePropertiesBillingCurrencyTotal.cs index 0f1bc21d536b9..75c78d1ef7d59 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CalculatePriceResponsePropertiesBillingCurrencyTotal.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CalculatePriceResponsePropertiesBillingCurrencyTotal.cs @@ -32,6 +32,10 @@ public CalculatePriceResponsePropertiesBillingCurrencyTotal() /// Initializes a new instance of the /// CalculatePriceResponsePropertiesBillingCurrencyTotal class. /// + /// The ISO 4217 3-letter currency code for + /// the currency used by this purchase record. + /// Amount in pricing currency. Tax is not + /// included. public CalculatePriceResponsePropertiesBillingCurrencyTotal(string currencyCode = default(string), double? amount = default(double?)) { CurrencyCode = currencyCode; @@ -45,11 +49,14 @@ public CalculatePriceResponsePropertiesBillingCurrencyTotal() partial void CustomInit(); /// + /// Gets or sets the ISO 4217 3-letter currency code for the currency + /// used by this purchase record. /// [JsonProperty(PropertyName = "currencyCode")] public string CurrencyCode { get; set; } /// + /// Gets or sets amount in pricing currency. Tax is not included. /// [JsonProperty(PropertyName = "amount")] public double? Amount { get; set; } diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CalculatePriceResponsePropertiesPricingCurrencyTotal.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CalculatePriceResponsePropertiesPricingCurrencyTotal.cs index 272e58574bf6d..76ca8bfc035ed 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CalculatePriceResponsePropertiesPricingCurrencyTotal.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CalculatePriceResponsePropertiesPricingCurrencyTotal.cs @@ -32,6 +32,8 @@ public CalculatePriceResponsePropertiesPricingCurrencyTotal() /// Initializes a new instance of the /// CalculatePriceResponsePropertiesPricingCurrencyTotal class. /// + /// The ISO 4217 3-letter currency code for + /// the currency used by this purchase record. public CalculatePriceResponsePropertiesPricingCurrencyTotal(string currencyCode = default(string), double? amount = default(double?)) { CurrencyCode = currencyCode; @@ -45,6 +47,8 @@ public CalculatePriceResponsePropertiesPricingCurrencyTotal() partial void CustomInit(); /// + /// Gets or sets the ISO 4217 3-letter currency code for the currency + /// used by this purchase record. /// [JsonProperty(PropertyName = "currencyCode")] public string CurrencyCode { get; set; } diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/Catalog.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/Catalog.cs index 0af48b78c0d69..3dbb0b825328f 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/Catalog.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/Catalog.cs @@ -35,7 +35,10 @@ public Catalog() /// this SKU. /// Available reservation terms for this /// resource - public Catalog(string resourceType = default(string), string name = default(string), IDictionary> billingPlans = default(IDictionary>), IList terms = default(IList), IList locations = default(IList), IList skuProperties = default(IList), IList restrictions = default(IList)) + /// Pricing information about the SKU + /// The tier of this SKU + /// The size of this SKU + public Catalog(string resourceType = default(string), string name = default(string), IDictionary> billingPlans = default(IDictionary>), IList terms = default(IList), IList locations = default(IList), IList skuProperties = default(IList), CatalogMsrp msrp = default(CatalogMsrp), IList restrictions = default(IList), string tier = default(string), string size = default(string), IList capabilities = default(IList)) { ResourceType = resourceType; Name = name; @@ -43,7 +46,11 @@ public Catalog() Terms = terms; Locations = locations; SkuProperties = skuProperties; + Msrp = msrp; Restrictions = restrictions; + Tier = tier; + Size = size; + Capabilities = capabilities; CustomInit(); } @@ -86,10 +93,33 @@ public Catalog() [JsonProperty(PropertyName = "skuProperties")] public IList SkuProperties { get; private set; } + /// + /// Gets pricing information about the SKU + /// + [JsonProperty(PropertyName = "msrp")] + public CatalogMsrp Msrp { get; private set; } + /// /// [JsonProperty(PropertyName = "restrictions")] public IList Restrictions { get; private set; } + /// + /// Gets the tier of this SKU + /// + [JsonProperty(PropertyName = "tier")] + public string Tier { get; private set; } + + /// + /// Gets the size of this SKU + /// + [JsonProperty(PropertyName = "size")] + public string Size { get; private set; } + + /// + /// + [JsonProperty(PropertyName = "capabilities")] + public IList Capabilities { get; private set; } + } } diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CatalogMsrp.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CatalogMsrp.cs new file mode 100644 index 0000000000000..c9baf1f8a26f0 --- /dev/null +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CatalogMsrp.cs @@ -0,0 +1,52 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Reservations.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// Pricing information about the SKU + /// + public partial class CatalogMsrp + { + /// + /// Initializes a new instance of the CatalogMsrp class. + /// + public CatalogMsrp() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the CatalogMsrp class. + /// + /// Amount in pricing currency. Tax not + /// included. + public CatalogMsrp(Price p1Y = default(Price)) + { + P1Y = p1Y; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets amount in pricing currency. Tax not included. + /// + [JsonProperty(PropertyName = "p1Y")] + public Price P1Y { get; set; } + + } +} diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ChangeDirectoryRequest.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ChangeDirectoryRequest.cs new file mode 100644 index 0000000000000..a7af0592bcf0a --- /dev/null +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ChangeDirectoryRequest.cs @@ -0,0 +1,50 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Reservations.Models +{ + using Newtonsoft.Json; + using System.Linq; + + public partial class ChangeDirectoryRequest + { + /// + /// Initializes a new instance of the ChangeDirectoryRequest class. + /// + public ChangeDirectoryRequest() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ChangeDirectoryRequest class. + /// + /// Tenant id GUID that reservation + /// order is to be transferred to + public ChangeDirectoryRequest(string destinationTenantId = default(string)) + { + DestinationTenantId = destinationTenantId; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets tenant id GUID that reservation order is to be + /// transferred to + /// + [JsonProperty(PropertyName = "destinationTenantId")] + public string DestinationTenantId { get; set; } + + } +} diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ChangeDirectoryResponse.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ChangeDirectoryResponse.cs new file mode 100644 index 0000000000000..2ee490ffbafaf --- /dev/null +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ChangeDirectoryResponse.cs @@ -0,0 +1,57 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Reservations.Models +{ + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Change directory response + /// + public partial class ChangeDirectoryResponse + { + /// + /// Initializes a new instance of the ChangeDirectoryResponse class. + /// + public ChangeDirectoryResponse() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ChangeDirectoryResponse class. + /// + public ChangeDirectoryResponse(ChangeDirectoryResult reservationOrder = default(ChangeDirectoryResult), IList reservations = default(IList)) + { + ReservationOrder = reservationOrder; + Reservations = reservations; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// + [JsonProperty(PropertyName = "reservationOrder")] + public ChangeDirectoryResult ReservationOrder { get; set; } + + /// + /// + [JsonProperty(PropertyName = "reservations")] + public IList Reservations { get; set; } + + } +} diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ChangeDirectoryResult.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ChangeDirectoryResult.cs new file mode 100644 index 0000000000000..6753ed64b5b17 --- /dev/null +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ChangeDirectoryResult.cs @@ -0,0 +1,80 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Reservations.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// Change directory result for reservation order or reservation + /// + public partial class ChangeDirectoryResult + { + /// + /// Initializes a new instance of the ChangeDirectoryResult class. + /// + public ChangeDirectoryResult() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ChangeDirectoryResult class. + /// + /// Identifier of the reservation order or + /// reservation + /// Name of the reservation order or + /// reservation + /// True if change directory operation + /// succeeded on this reservation order or reservation + /// Error reason if operation failed. Null + /// otherwise + public ChangeDirectoryResult(string id = default(string), string name = default(string), bool? isSucceeded = default(bool?), string error = default(string)) + { + Id = id; + Name = name; + IsSucceeded = isSucceeded; + Error = error; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets identifier of the reservation order or reservation + /// + [JsonProperty(PropertyName = "id")] + public string Id { get; set; } + + /// + /// Gets or sets name of the reservation order or reservation + /// + [JsonProperty(PropertyName = "name")] + public string Name { get; set; } + + /// + /// Gets or sets true if change directory operation succeeded on this + /// reservation order or reservation + /// + [JsonProperty(PropertyName = "isSucceeded")] + public bool? IsSucceeded { get; set; } + + /// + /// Gets or sets error reason if operation failed. Null otherwise + /// + [JsonProperty(PropertyName = "error")] + public string Error { get; set; } + + } +} diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CreatedByType.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CreatedByType.cs new file mode 100644 index 0000000000000..289a69934ef29 --- /dev/null +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CreatedByType.cs @@ -0,0 +1,24 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Reservations.Models +{ + + /// + /// Defines values for CreatedByType. + /// + public static class CreatedByType + { + public const string User = "User"; + public const string Application = "Application"; + public const string ManagedIdentity = "ManagedIdentity"; + public const string Key = "Key"; + } +} diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CurrentQuotaLimit.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CurrentQuotaLimit.cs index 57fc5e8608f3d..630fc85bc3301 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CurrentQuotaLimit.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/CurrentQuotaLimit.cs @@ -35,9 +35,10 @@ public CurrentQuotaLimit() /// /// Quota properties for the resource. /// The details of the quota request - /// status. + /// status. Possible values include: 'Accepted', 'Invalid', + /// 'Succeeded', 'Failed', 'InProgress' /// A user friendly message. - public CurrentQuotaLimit(QuotaProperties properties = default(QuotaProperties), object provisioningState = default(object), string message = default(string)) + public CurrentQuotaLimit(QuotaProperties properties = default(QuotaProperties), string provisioningState = default(string), string message = default(string)) { Properties = properties; ProvisioningState = provisioningState; @@ -57,10 +58,11 @@ public CurrentQuotaLimit() public QuotaProperties Properties { get; set; } /// - /// Gets the details of the quota request status. + /// Gets the details of the quota request status. Possible values + /// include: 'Accepted', 'Invalid', 'Succeeded', 'Failed', 'InProgress' /// [JsonProperty(PropertyName = "properties.provisioningState")] - public object ProvisioningState { get; private set; } + public string ProvisioningState { get; private set; } /// /// Gets a user friendly message. diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ErrorDetails.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ErrorDetails.cs new file mode 100644 index 0000000000000..6a65b258602e6 --- /dev/null +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ErrorDetails.cs @@ -0,0 +1,68 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Reservations.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// The details of the error. + /// + public partial class ErrorDetails + { + /// + /// Initializes a new instance of the ErrorDetails class. + /// + public ErrorDetails() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ErrorDetails class. + /// + /// Error code. + /// Error message indicating why the operation + /// failed. + /// The target of the particular error. + public ErrorDetails(string code = default(string), string message = default(string), string target = default(string)) + { + Code = code; + Message = message; + Target = target; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets error code. + /// + [JsonProperty(PropertyName = "code")] + public string Code { get; private set; } + + /// + /// Gets error message indicating why the operation failed. + /// + [JsonProperty(PropertyName = "message")] + public string Message { get; private set; } + + /// + /// Gets the target of the particular error. + /// + [JsonProperty(PropertyName = "target")] + public string Target { get; private set; } + + } +} diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ErrorResponse.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ErrorResponse.cs new file mode 100644 index 0000000000000..a87137f04491a --- /dev/null +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ErrorResponse.cs @@ -0,0 +1,52 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Reservations.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// Error response indicates that the service is not able to process the + /// incoming request. The reason is provided in the error message. + /// + public partial class ErrorResponse + { + /// + /// Initializes a new instance of the ErrorResponse class. + /// + public ErrorResponse() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ErrorResponse class. + /// + /// The details of the error. + public ErrorResponse(ErrorDetails error = default(ErrorDetails)) + { + Error = error; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the details of the error. + /// + [JsonProperty(PropertyName = "error")] + public ErrorDetails Error { get; set; } + + } +} diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ErrorResponseCode.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ErrorResponseCode.cs index ecb9a9162ddfd..8134b8ba74efa 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ErrorResponseCode.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ErrorResponseCode.cs @@ -71,5 +71,6 @@ public static class ErrorResponseCode public const string FulfillmentTransientError = "FulfillmentTransientError"; public const string FulfillmentError = "FulfillmentError"; public const string CalculatePriceFailed = "CalculatePriceFailed"; + public const string AppliedScopesSameAsExisting = "AppliedScopesSameAsExisting"; } } diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ErrorResponseException.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ErrorResponseException.cs new file mode 100644 index 0000000000000..8a5409d30a51a --- /dev/null +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ErrorResponseException.cs @@ -0,0 +1,62 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Reservations.Models +{ + using Microsoft.Rest; + + /// + /// Exception thrown for an invalid response with ErrorResponse + /// information. + /// + public partial class ErrorResponseException : RestException + { + /// + /// Gets information about the associated HTTP request. + /// + public HttpRequestMessageWrapper Request { get; set; } + + /// + /// Gets information about the associated HTTP response. + /// + public HttpResponseMessageWrapper Response { get; set; } + + /// + /// Gets or sets the body object. + /// + public ErrorResponse Body { get; set; } + + /// + /// Initializes a new instance of the ErrorResponseException class. + /// + public ErrorResponseException() + { + } + + /// + /// Initializes a new instance of the ErrorResponseException class. + /// + /// The exception message. + public ErrorResponseException(string message) + : this(message, null) + { + } + + /// + /// Initializes a new instance of the ErrorResponseException class. + /// + /// The exception message. + /// Inner exception. + public ErrorResponseException(string message, System.Exception innerException) + : base(message, innerException) + { + } + } +} diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ExtendedErrorInfo.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ExtendedErrorInfo.cs index 45102e2133aeb..1ebbe4c970a32 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ExtendedErrorInfo.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ExtendedErrorInfo.cs @@ -54,7 +54,8 @@ public ExtendedErrorInfo() /// 'BillingPaymentInstrumentHardError', 'BillingTransientError', /// 'BillingError', 'FulfillmentConfigurationError', /// 'FulfillmentOutOfStockError', 'FulfillmentTransientError', - /// 'FulfillmentError', 'CalculatePriceFailed' + /// 'FulfillmentError', 'CalculatePriceFailed', + /// 'AppliedScopesSameAsExisting' public ExtendedErrorInfo(string code = default(string), string message = default(string)) { Code = code; @@ -96,7 +97,8 @@ public ExtendedErrorInfo() /// 'BillingPaymentInstrumentHardError', 'BillingTransientError', /// 'BillingError', 'FulfillmentConfigurationError', /// 'FulfillmentOutOfStockError', 'FulfillmentTransientError', - /// 'FulfillmentError', 'CalculatePriceFailed' + /// 'FulfillmentError', 'CalculatePriceFailed', + /// 'AppliedScopesSameAsExisting' /// [JsonProperty(PropertyName = "code")] public string Code { get; set; } diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/Kind.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/Kind.cs new file mode 100644 index 0000000000000..aa22e15c1d8c1 --- /dev/null +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/Kind.cs @@ -0,0 +1,54 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Reservations.Models +{ + using Newtonsoft.Json; + using Newtonsoft.Json.Converters; + using System.Runtime; + using System.Runtime.Serialization; + + /// + /// Defines values for Kind. + /// + [JsonConverter(typeof(StringEnumConverter))] + public enum Kind + { + [EnumMember(Value = "Microsoft.Compute")] + MicrosoftCompute + } + internal static class KindEnumExtension + { + internal static string ToSerializedValue(this Kind? value) + { + return value == null ? null : ((Kind)value).ToSerializedValue(); + } + + internal static string ToSerializedValue(this Kind value) + { + switch( value ) + { + case Kind.MicrosoftCompute: + return "Microsoft.Compute"; + } + return null; + } + + internal static Kind? ParseKind(this string value) + { + switch( value ) + { + case "Microsoft.Compute": + return Kind.MicrosoftCompute; + } + return null; + } + } +} diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/OperationResponse.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/OperationResponse.cs index 4b1db69c46193..daabda0b2d885 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/OperationResponse.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/OperationResponse.cs @@ -26,11 +26,19 @@ public OperationResponse() /// /// Initializes a new instance of the OperationResponse class. /// - public OperationResponse(string name = default(string), OperationDisplay display = default(OperationDisplay), string origin = default(string)) + /// Name of the operation + /// Indicates whether the operation is a + /// data action + /// Display of the operation + /// Origin of the operation + /// Properties of the operation + public OperationResponse(string name = default(string), bool? isDataAction = default(bool?), OperationDisplay display = default(OperationDisplay), string origin = default(string), object properties = default(object)) { Name = name; + IsDataAction = isDataAction; Display = display; Origin = origin; + Properties = properties; CustomInit(); } @@ -40,19 +48,34 @@ public OperationResponse() partial void CustomInit(); /// + /// Gets or sets name of the operation /// [JsonProperty(PropertyName = "name")] public string Name { get; set; } /// + /// Gets or sets indicates whether the operation is a data action + /// + [JsonProperty(PropertyName = "isDataAction")] + public bool? IsDataAction { get; set; } + + /// + /// Gets or sets display of the operation /// [JsonProperty(PropertyName = "display")] public OperationDisplay Display { get; set; } /// + /// Gets or sets origin of the operation /// [JsonProperty(PropertyName = "origin")] public string Origin { get; set; } + /// + /// Gets or sets properties of the operation + /// + [JsonProperty(PropertyName = "properties")] + public object Properties { get; set; } + } } diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/PurchaseRequest.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/PurchaseRequest.cs index c9a8481ebc086..a50f98c8d1c83 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/PurchaseRequest.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/PurchaseRequest.cs @@ -38,11 +38,15 @@ public PurchaseRequest() /// 'RedHat', 'SqlDataWarehouse', 'VMwareCloudSimple', 'RedHatOsa', /// 'Databricks', 'AppService', 'ManagedDisk', 'BlockBlob', /// 'RedisCache', 'AzureDataExplorer', 'MySql', 'MariaDb', - /// 'PostgreSql', 'DedicatedHost', 'SapHana', - /// 'SqlAzureHybridBenefit' - /// Possible values include: 'P1Y', 'P3Y' + /// 'PostgreSql', 'DedicatedHost', 'SapHana', 'SqlAzureHybridBenefit', + /// 'AVS', 'DataFactory', 'NetAppStorage', 'AzureFiles', + /// 'SqlEdge' + /// Possible values include: 'P1Y', 'P3Y', + /// 'P5Y' /// Possible values include: 'Upfront', /// 'Monthly' + /// Quantity of the SKUs that are part of the + /// Reservation. /// Friendly name of the Reservation /// Possible values include: 'Single', /// 'Shared' @@ -88,7 +92,8 @@ public PurchaseRequest() /// 'SqlDataWarehouse', 'VMwareCloudSimple', 'RedHatOsa', 'Databricks', /// 'AppService', 'ManagedDisk', 'BlockBlob', 'RedisCache', /// 'AzureDataExplorer', 'MySql', 'MariaDb', 'PostgreSql', - /// 'DedicatedHost', 'SapHana', 'SqlAzureHybridBenefit' + /// 'DedicatedHost', 'SapHana', 'SqlAzureHybridBenefit', 'AVS', + /// 'DataFactory', 'NetAppStorage', 'AzureFiles', 'SqlEdge' /// [JsonProperty(PropertyName = "properties.reservedResourceType")] public string ReservedResourceType { get; set; } @@ -99,7 +104,7 @@ public PurchaseRequest() public string BillingScopeId { get; set; } /// - /// Gets or sets possible values include: 'P1Y', 'P3Y' + /// Gets or sets possible values include: 'P1Y', 'P3Y', 'P5Y' /// [JsonProperty(PropertyName = "properties.term")] public string Term { get; set; } @@ -111,6 +116,7 @@ public PurchaseRequest() public string BillingPlan { get; set; } /// + /// Gets or sets quantity of the SKUs that are part of the Reservation. /// [JsonProperty(PropertyName = "properties.quantity")] public int? Quantity { get; set; } diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaProperties.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaProperties.cs index 64feeefddaa4d..c23139912c205 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaProperties.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaProperties.cs @@ -38,7 +38,9 @@ public QuotaProperties() /// Name of the resource provide by the resource /// provider. Use this property for quotaRequests resource /// operations. - /// The name of the resource type. + /// The name of the resource type. Possible + /// values include: 'standard', 'dedicated', 'lowPriority', 'shared', + /// 'serviceSpecific' /// The time period over which the quota /// usage values are summarized. For example, P1D (per one day), PT1M /// (per one minute), and PT1S (per one second). This parameter is @@ -46,7 +48,7 @@ public QuotaProperties() /// period is irrelevant. /// Additional properties for the specified /// resource provider. - public QuotaProperties(int? limit = default(int?), int? currentValue = default(int?), string unit = default(string), ResourceName name = default(ResourceName), object resourceType = default(object), string quotaPeriod = default(string), object properties = default(object)) + public QuotaProperties(int? limit = default(int?), int? currentValue = default(int?), string unit = default(string), ResourceName name = default(ResourceName), string resourceType = default(string), string quotaPeriod = default(string), object properties = default(object)) { Limit = limit; CurrentValue = currentValue; @@ -90,10 +92,12 @@ public QuotaProperties() public ResourceName Name { get; set; } /// - /// Gets or sets the name of the resource type. + /// Gets or sets the name of the resource type. Possible values + /// include: 'standard', 'dedicated', 'lowPriority', 'shared', + /// 'serviceSpecific' /// [JsonProperty(PropertyName = "resourceType")] - public object ResourceType { get; set; } + public string ResourceType { get; set; } /// /// Gets the time period over which the quota usage values are diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestDetails.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestDetails.cs index e719c27ba3a02..a7ee439c61288 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestDetails.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestDetails.cs @@ -37,14 +37,16 @@ public QuotaRequestDetails() /// /// Quota request ID. /// Quota request name. - /// The quota request status. + /// The quota request status. Possible + /// values include: 'Accepted', 'Invalid', 'Succeeded', 'Failed', + /// 'InProgress' /// User friendly status message. /// The time when the quota request was /// submitted using format: yyyy-MM-ddTHH:mm:ssZ as specified by the /// ISO 8601 standard. /// The quotaRequests. /// Resource type - public QuotaRequestDetails(string id = default(string), string name = default(string), object provisioningState = default(object), string message = default(string), System.DateTime? requestSubmitTime = default(System.DateTime?), IList value = default(IList), string type = default(string)) + public QuotaRequestDetails(string id = default(string), string name = default(string), string provisioningState = default(string), string message = default(string), System.DateTime? requestSubmitTime = default(System.DateTime?), IList value = default(IList), string type = default(string)) { Id = id; Name = name; @@ -74,10 +76,11 @@ public QuotaRequestDetails() public string Name { get; private set; } /// - /// Gets or sets the quota request status. + /// Gets or sets the quota request status. Possible values include: + /// 'Accepted', 'Invalid', 'Succeeded', 'Failed', 'InProgress' /// [JsonProperty(PropertyName = "properties.provisioningState")] - public object ProvisioningState { get; set; } + public string ProvisioningState { get; set; } /// /// Gets user friendly status message. diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestOneResourceSubmitResponse.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestOneResourceSubmitResponse.cs index bdf08a008d39c..b77a918103f6d 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestOneResourceSubmitResponse.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestOneResourceSubmitResponse.cs @@ -39,13 +39,15 @@ public QuotaRequestOneResourceSubmitResponse() /// The name of the quota request. /// Type of resource. /// "Microsoft.Capacity/ServiceLimits" - /// The quota request status. + /// The quota request status. Possible + /// values include: 'Accepted', 'Invalid', 'Succeeded', 'Failed', + /// 'InProgress' /// User friendly status message. /// The time when the quota request was /// submitted using format: yyyy-MM-ddTHH:mm:ssZ as specified by the /// ISO 8601 standard. /// Quota properties for the resource. - public QuotaRequestOneResourceSubmitResponse(string id = default(string), string name = default(string), string type = default(string), object provisioningState = default(object), string message = default(string), System.DateTime? requestSubmitTime = default(System.DateTime?), QuotaProperties properties = default(QuotaProperties)) + public QuotaRequestOneResourceSubmitResponse(string id = default(string), string name = default(string), string type = default(string), string provisioningState = default(string), string message = default(string), System.DateTime? requestSubmitTime = default(System.DateTime?), QuotaProperties properties = default(QuotaProperties)) { Id = id; Name = name; @@ -81,10 +83,11 @@ public QuotaRequestOneResourceSubmitResponse() public string Type { get; private set; } /// - /// Gets the quota request status. + /// Gets the quota request status. Possible values include: 'Accepted', + /// 'Invalid', 'Succeeded', 'Failed', 'InProgress' /// [JsonProperty(PropertyName = "properties.provisioningState")] - public object ProvisioningState { get; private set; } + public string ProvisioningState { get; private set; } /// /// Gets user friendly status message. diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestProperties.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestProperties.cs index a911c473cb5e6..7aad13d4362e5 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestProperties.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestProperties.cs @@ -31,13 +31,15 @@ public QuotaRequestProperties() /// /// Initializes a new instance of the QuotaRequestProperties class. /// - /// The quota request status. + /// The quota request status. Possible + /// values include: 'Accepted', 'Invalid', 'Succeeded', 'Failed', + /// 'InProgress' /// User friendly status message. /// The time when the quota request was /// submitted using format: yyyy-MM-ddTHH:mm:ssZ as specified by the /// ISO 8601 standard. /// The quotaRequests. - public QuotaRequestProperties(object provisioningState = default(object), string message = default(string), System.DateTime? requestSubmitTime = default(System.DateTime?), IList value = default(IList)) + public QuotaRequestProperties(string provisioningState = default(string), string message = default(string), System.DateTime? requestSubmitTime = default(System.DateTime?), IList value = default(IList)) { ProvisioningState = provisioningState; Message = message; @@ -52,10 +54,11 @@ public QuotaRequestProperties() partial void CustomInit(); /// - /// Gets or sets the quota request status. + /// Gets or sets the quota request status. Possible values include: + /// 'Accepted', 'Invalid', 'Succeeded', 'Failed', 'InProgress' /// [JsonProperty(PropertyName = "provisioningState")] - public object ProvisioningState { get; set; } + public string ProvisioningState { get; set; } /// /// Gets user friendly status message. diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestState.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestState.cs new file mode 100644 index 0000000000000..9f37896859986 --- /dev/null +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestState.cs @@ -0,0 +1,25 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Reservations.Models +{ + + /// + /// Defines values for QuotaRequestState. + /// + public static class QuotaRequestState + { + public const string Accepted = "Accepted"; + public const string Invalid = "Invalid"; + public const string Succeeded = "Succeeded"; + public const string Failed = "Failed"; + public const string InProgress = "InProgress"; + } +} diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestSubmitResponse201.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestSubmitResponse201.cs index 67816652f9b67..f7a7c939062f4 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestSubmitResponse201.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/QuotaRequestSubmitResponse201.cs @@ -39,9 +39,10 @@ public QuotaRequestSubmitResponse201() /// Operation ID /// Resource type /// The details of the quota request - /// status. + /// status. Possible values include: 'Accepted', 'Invalid', + /// 'Succeeded', 'Failed', 'InProgress' /// A user friendly message. - public QuotaRequestSubmitResponse201(string id = default(string), string name = default(string), string type = default(string), object provisioningState = default(object), string message = default(string)) + public QuotaRequestSubmitResponse201(string id = default(string), string name = default(string), string type = default(string), string provisioningState = default(string), string message = default(string)) { Id = id; Name = name; @@ -76,10 +77,11 @@ public QuotaRequestSubmitResponse201() public string Type { get; private set; } /// - /// Gets the details of the quota request status. + /// Gets the details of the quota request status. Possible values + /// include: 'Accepted', 'Invalid', 'Succeeded', 'Failed', 'InProgress' /// [JsonProperty(PropertyName = "properties.provisioningState")] - public object ProvisioningState { get; private set; } + public string ProvisioningState { get; private set; } /// /// Gets a user friendly message. diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/RenewPropertiesResponseBillingCurrencyTotal.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/RenewPropertiesResponseBillingCurrencyTotal.cs index 2f300aa306033..fef101899db52 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/RenewPropertiesResponseBillingCurrencyTotal.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/RenewPropertiesResponseBillingCurrencyTotal.cs @@ -32,6 +32,8 @@ public RenewPropertiesResponseBillingCurrencyTotal() /// Initializes a new instance of the /// RenewPropertiesResponseBillingCurrencyTotal class. /// + /// The ISO 4217 3-letter currency code for + /// the currency used by this purchase record. public RenewPropertiesResponseBillingCurrencyTotal(string currencyCode = default(string), double? amount = default(double?)) { CurrencyCode = currencyCode; @@ -45,6 +47,8 @@ public RenewPropertiesResponseBillingCurrencyTotal() partial void CustomInit(); /// + /// Gets or sets the ISO 4217 3-letter currency code for the currency + /// used by this purchase record. /// [JsonProperty(PropertyName = "currencyCode")] public string CurrencyCode { get; set; } diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/RenewPropertiesResponsePricingCurrencyTotal.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/RenewPropertiesResponsePricingCurrencyTotal.cs index 9dc712427432b..12cb62ab9ad64 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/RenewPropertiesResponsePricingCurrencyTotal.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/RenewPropertiesResponsePricingCurrencyTotal.cs @@ -33,6 +33,8 @@ public RenewPropertiesResponsePricingCurrencyTotal() /// Initializes a new instance of the /// RenewPropertiesResponsePricingCurrencyTotal class. /// + /// The ISO 4217 3-letter currency code for + /// the currency used by this purchase record. public RenewPropertiesResponsePricingCurrencyTotal(string currencyCode = default(string), double? amount = default(double?)) { CurrencyCode = currencyCode; @@ -46,6 +48,8 @@ public RenewPropertiesResponsePricingCurrencyTotal() partial void CustomInit(); /// + /// Gets or sets the ISO 4217 3-letter currency code for the currency + /// used by this purchase record. /// [JsonProperty(PropertyName = "currencyCode")] public string CurrencyCode { get; set; } diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationOrderResponse.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationOrderResponse.cs index 444e190d96df9..a01423298f78b 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationOrderResponse.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationOrderResponse.cs @@ -42,14 +42,20 @@ public ReservationOrderResponse() /// reservation was created. /// This is the date when the Reservation will /// expire. - /// Possible values include: 'P1Y', 'P3Y' - /// Current state of the - /// reservation. + /// Total Quantity of the SKUs purchased + /// in the Reservation. + /// Possible values include: 'P1Y', 'P3Y', + /// 'P5Y' + /// Current state of the reservation. + /// Possible values include: 'Creating', 'PendingResourceHold', + /// 'ConfirmedResourceHold', 'PendingBilling', 'ConfirmedBilling', + /// 'Created', 'Succeeded', 'Cancelled', 'Expired', 'BillingFailed', + /// 'Failed', 'Split', 'Merged' /// Possible values include: 'Upfront', /// 'Monthly' /// Type of resource. /// "Microsoft.Capacity/reservations" - public ReservationOrderResponse(int? etag = default(int?), string id = default(string), string name = default(string), string displayName = default(string), System.DateTime? requestDateTime = default(System.DateTime?), System.DateTime? createdDateTime = default(System.DateTime?), System.DateTime? expiryDate = default(System.DateTime?), int? originalQuantity = default(int?), string term = default(string), string provisioningState = default(string), string billingPlan = default(string), ReservationOrderBillingPlanInformation planInformation = default(ReservationOrderBillingPlanInformation), IList reservationsProperty = default(IList), string type = default(string)) + public ReservationOrderResponse(int? etag = default(int?), string id = default(string), string name = default(string), string displayName = default(string), System.DateTime? requestDateTime = default(System.DateTime?), System.DateTime? createdDateTime = default(System.DateTime?), System.DateTime? expiryDate = default(System.DateTime?), int? originalQuantity = default(int?), string term = default(string), string provisioningState = default(string), string billingPlan = default(string), ReservationOrderBillingPlanInformation planInformation = default(ReservationOrderBillingPlanInformation), IList reservationsProperty = default(IList), string type = default(string), SystemData systemData = default(SystemData)) { Etag = etag; Id = id; @@ -65,6 +71,7 @@ public ReservationOrderResponse() PlanInformation = planInformation; ReservationsProperty = reservationsProperty; Type = type; + SystemData = systemData; CustomInit(); } @@ -118,18 +125,24 @@ public ReservationOrderResponse() public System.DateTime? ExpiryDate { get; set; } /// + /// Gets or sets total Quantity of the SKUs purchased in the + /// Reservation. /// [JsonProperty(PropertyName = "properties.originalQuantity")] public int? OriginalQuantity { get; set; } /// - /// Gets or sets possible values include: 'P1Y', 'P3Y' + /// Gets or sets possible values include: 'P1Y', 'P3Y', 'P5Y' /// [JsonProperty(PropertyName = "properties.term")] public string Term { get; set; } /// - /// Gets or sets current state of the reservation. + /// Gets or sets current state of the reservation. Possible values + /// include: 'Creating', 'PendingResourceHold', + /// 'ConfirmedResourceHold', 'PendingBilling', 'ConfirmedBilling', + /// 'Created', 'Succeeded', 'Cancelled', 'Expired', 'BillingFailed', + /// 'Failed', 'Split', 'Merged' /// [JsonProperty(PropertyName = "properties.provisioningState")] public string ProvisioningState { get; set; } @@ -156,5 +169,10 @@ public ReservationOrderResponse() [JsonProperty(PropertyName = "type")] public string Type { get; private set; } + /// + /// + [JsonProperty(PropertyName = "systemData")] + public SystemData SystemData { get; private set; } + } } diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationProperties.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationProperties.cs deleted file mode 100644 index 42278e254ee51..0000000000000 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationProperties.cs +++ /dev/null @@ -1,227 +0,0 @@ -// -// Copyright (c) Microsoft Corporation. All rights reserved. -// Licensed under the MIT License. See License.txt in the project root for -// license information. -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.Azure.Management.Reservations.Models -{ - using Microsoft.Rest; - using Microsoft.Rest.Serialization; - using Newtonsoft.Json; - using System.Collections; - using System.Collections.Generic; - using System.Linq; - - public partial class ReservationProperties - { - /// - /// Initializes a new instance of the ReservationProperties class. - /// - public ReservationProperties() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the ReservationProperties class. - /// - /// Possible values include: - /// 'VirtualMachines', 'SqlDatabases', 'SuseLinux', 'CosmosDb', - /// 'RedHat', 'SqlDataWarehouse', 'VMwareCloudSimple', 'RedHatOsa', - /// 'Databricks', 'AppService', 'ManagedDisk', 'BlockBlob', - /// 'RedisCache', 'AzureDataExplorer', 'MySql', 'MariaDb', - /// 'PostgreSql', 'DedicatedHost', 'SapHana', - /// 'SqlAzureHybridBenefit' - /// Possible values include: 'On', - /// 'Off' - /// Friendly name for user to easily identify - /// the reservation - /// Possible values include: 'Single', - /// 'Shared' - /// Current state of the - /// reservation. - /// DateTime of the Reservation - /// starting when this version is effective from. - /// DateTime of the last time the - /// Reservation was updated. - /// This is the date when the Reservation will - /// expire. - /// Description of the SKU in - /// english. - /// Possible values include: 'Upfront', - /// 'Monthly' - /// Reservation Id of the reservation from - /// which this reservation is renewed. Format of the resource Id is - /// /providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}. - /// Reservation Id of the reservation - /// which is purchased because of renew. Format of the resource Id is - /// /providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}. - /// Possible values include: 'P1Y', 'P3Y' - public ReservationProperties(string reservedResourceType = default(string), string instanceFlexibility = default(string), string displayName = default(string), IList appliedScopes = default(IList), string appliedScopeType = default(string), int? quantity = default(int?), string provisioningState = default(string), System.DateTime? effectiveDateTime = default(System.DateTime?), System.DateTime? lastUpdatedDateTime = default(System.DateTime?), System.DateTime? expiryDate = default(System.DateTime?), string skuDescription = default(string), ExtendedStatusInfo extendedStatusInfo = default(ExtendedStatusInfo), string billingPlan = default(string), ReservationSplitProperties splitProperties = default(ReservationSplitProperties), ReservationMergeProperties mergeProperties = default(ReservationMergeProperties), string billingScopeId = default(string), bool? renew = default(bool?), string renewSource = default(string), string renewDestination = default(string), RenewPropertiesResponse renewProperties = default(RenewPropertiesResponse), string term = default(string)) - { - ReservedResourceType = reservedResourceType; - InstanceFlexibility = instanceFlexibility; - DisplayName = displayName; - AppliedScopes = appliedScopes; - AppliedScopeType = appliedScopeType; - Quantity = quantity; - ProvisioningState = provisioningState; - EffectiveDateTime = effectiveDateTime; - LastUpdatedDateTime = lastUpdatedDateTime; - ExpiryDate = expiryDate; - SkuDescription = skuDescription; - ExtendedStatusInfo = extendedStatusInfo; - BillingPlan = billingPlan; - SplitProperties = splitProperties; - MergeProperties = mergeProperties; - BillingScopeId = billingScopeId; - Renew = renew; - RenewSource = renewSource; - RenewDestination = renewDestination; - RenewProperties = renewProperties; - Term = term; - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets or sets possible values include: 'VirtualMachines', - /// 'SqlDatabases', 'SuseLinux', 'CosmosDb', 'RedHat', - /// 'SqlDataWarehouse', 'VMwareCloudSimple', 'RedHatOsa', 'Databricks', - /// 'AppService', 'ManagedDisk', 'BlockBlob', 'RedisCache', - /// 'AzureDataExplorer', 'MySql', 'MariaDb', 'PostgreSql', - /// 'DedicatedHost', 'SapHana', 'SqlAzureHybridBenefit' - /// - [JsonProperty(PropertyName = "reservedResourceType")] - public string ReservedResourceType { get; set; } - - /// - /// Gets or sets possible values include: 'On', 'Off' - /// - [JsonProperty(PropertyName = "instanceFlexibility")] - public string InstanceFlexibility { get; set; } - - /// - /// Gets or sets friendly name for user to easily identify the - /// reservation - /// - [JsonProperty(PropertyName = "displayName")] - public string DisplayName { get; set; } - - /// - /// - [JsonProperty(PropertyName = "appliedScopes")] - public IList AppliedScopes { get; set; } - - /// - /// Gets or sets possible values include: 'Single', 'Shared' - /// - [JsonProperty(PropertyName = "appliedScopeType")] - public string AppliedScopeType { get; set; } - - /// - /// - [JsonProperty(PropertyName = "quantity")] - public int? Quantity { get; set; } - - /// - /// Gets or sets current state of the reservation. - /// - [JsonProperty(PropertyName = "provisioningState")] - public string ProvisioningState { get; set; } - - /// - /// Gets or sets dateTime of the Reservation starting when this version - /// is effective from. - /// - [JsonProperty(PropertyName = "effectiveDateTime")] - public System.DateTime? EffectiveDateTime { get; set; } - - /// - /// Gets dateTime of the last time the Reservation was updated. - /// - [JsonProperty(PropertyName = "lastUpdatedDateTime")] - public System.DateTime? LastUpdatedDateTime { get; private set; } - - /// - /// Gets or sets this is the date when the Reservation will expire. - /// - [JsonConverter(typeof(DateJsonConverter))] - [JsonProperty(PropertyName = "expiryDate")] - public System.DateTime? ExpiryDate { get; set; } - - /// - /// Gets or sets description of the SKU in english. - /// - [JsonProperty(PropertyName = "skuDescription")] - public string SkuDescription { get; set; } - - /// - /// - [JsonProperty(PropertyName = "extendedStatusInfo")] - public ExtendedStatusInfo ExtendedStatusInfo { get; set; } - - /// - /// Gets or sets possible values include: 'Upfront', 'Monthly' - /// - [JsonProperty(PropertyName = "billingPlan")] - public string BillingPlan { get; set; } - - /// - /// - [JsonProperty(PropertyName = "splitProperties")] - public ReservationSplitProperties SplitProperties { get; set; } - - /// - /// - [JsonProperty(PropertyName = "mergeProperties")] - public ReservationMergeProperties MergeProperties { get; set; } - - /// - /// - [JsonProperty(PropertyName = "billingScopeId")] - public string BillingScopeId { get; set; } - - /// - /// - [JsonProperty(PropertyName = "renew")] - public bool? Renew { get; set; } - - /// - /// Gets or sets reservation Id of the reservation from which this - /// reservation is renewed. Format of the resource Id is - /// /providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}. - /// - [JsonProperty(PropertyName = "renewSource")] - public string RenewSource { get; set; } - - /// - /// Gets or sets reservation Id of the reservation which is purchased - /// because of renew. Format of the resource Id is - /// /providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}. - /// - [JsonProperty(PropertyName = "renewDestination")] - public string RenewDestination { get; set; } - - /// - /// - [JsonProperty(PropertyName = "renewProperties")] - public RenewPropertiesResponse RenewProperties { get; set; } - - /// - /// Gets or sets possible values include: 'P1Y', 'P3Y' - /// - [JsonProperty(PropertyName = "term")] - public string Term { get; set; } - - } -} diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationResponse.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationResponse.cs index 326fa5ddebef3..ee697af3ae55e 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationResponse.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationResponse.cs @@ -15,6 +15,9 @@ namespace Microsoft.Azure.Management.Reservations.Models using Newtonsoft.Json; using System.Linq; + /// + /// The definition of the reservation. + /// public partial class ReservationResponse : IResource { /// @@ -32,9 +35,15 @@ public ReservationResponse() /// lives. /// Identifier of the reservation /// Name of the reservation + /// The sku information associated to this + /// reservation + /// The properties associated to this + /// reservation /// Type of resource. /// "Microsoft.Capacity/reservationOrders/reservations" - public ReservationResponse(string location = default(string), int? etag = default(int?), string id = default(string), string name = default(string), SkuName sku = default(SkuName), ReservationProperties properties = default(ReservationProperties), string type = default(string)) + /// Resource Provider type to be reserved. Possible + /// values include: 'Microsoft.Compute' + public ReservationResponse(string location = default(string), int? etag = default(int?), string id = default(string), string name = default(string), SkuName sku = default(SkuName), ReservationsProperties properties = default(ReservationsProperties), string type = default(string), Kind? kind = default(Kind?), SystemData systemData = default(SystemData)) { Location = location; Etag = etag; @@ -43,6 +52,8 @@ public ReservationResponse() Sku = sku; Properties = properties; Type = type; + Kind = kind; + SystemData = systemData; CustomInit(); } @@ -52,10 +63,10 @@ public ReservationResponse() partial void CustomInit(); /// - /// Gets the Azure Region where the reserved resource lives. + /// Gets or sets the Azure Region where the reserved resource lives. /// [JsonProperty(PropertyName = "location")] - public string Location { get; private set; } + public string Location { get; set; } /// /// @@ -75,14 +86,16 @@ public ReservationResponse() public string Name { get; private set; } /// + /// Gets or sets the sku information associated to this reservation /// [JsonProperty(PropertyName = "sku")] public SkuName Sku { get; set; } /// + /// Gets or sets the properties associated to this reservation /// [JsonProperty(PropertyName = "properties")] - public ReservationProperties Properties { get; set; } + public ReservationsProperties Properties { get; set; } /// /// Gets type of resource. @@ -91,5 +104,17 @@ public ReservationResponse() [JsonProperty(PropertyName = "type")] public string Type { get; private set; } + /// + /// Gets or sets resource Provider type to be reserved. Possible values + /// include: 'Microsoft.Compute' + /// + [JsonProperty(PropertyName = "kind")] + public Kind? Kind { get; set; } + + /// + /// + [JsonProperty(PropertyName = "systemData")] + public SystemData SystemData { get; private set; } + } } diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationSummary.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationSummary.cs new file mode 100644 index 0000000000000..4f5ebd4dfb0e1 --- /dev/null +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationSummary.cs @@ -0,0 +1,97 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Reservations.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// The roll up count summary of reservations in each state + /// + public partial class ReservationSummary + { + /// + /// Initializes a new instance of the ReservationSummary class. + /// + public ReservationSummary() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ReservationSummary class. + /// + /// The number of reservation in Succeeded + /// state + /// The number of reservation in Failed + /// state + /// The number of reservation in Expiring + /// state + /// The number of reservation in Expired + /// state + /// The number of reservation in Pending + /// state + /// The number of reservation in Cancelled + /// state + public ReservationSummary(double? succeededCount = default(double?), double? failedCount = default(double?), double? expiringCount = default(double?), double? expiredCount = default(double?), double? pendingCount = default(double?), double? cancelledCount = default(double?)) + { + SucceededCount = succeededCount; + FailedCount = failedCount; + ExpiringCount = expiringCount; + ExpiredCount = expiredCount; + PendingCount = pendingCount; + CancelledCount = cancelledCount; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets the number of reservation in Succeeded state + /// + [JsonProperty(PropertyName = "succeededCount")] + public double? SucceededCount { get; private set; } + + /// + /// Gets the number of reservation in Failed state + /// + [JsonProperty(PropertyName = "failedCount")] + public double? FailedCount { get; private set; } + + /// + /// Gets the number of reservation in Expiring state + /// + [JsonProperty(PropertyName = "expiringCount")] + public double? ExpiringCount { get; private set; } + + /// + /// Gets the number of reservation in Expired state + /// + [JsonProperty(PropertyName = "expiredCount")] + public double? ExpiredCount { get; private set; } + + /// + /// Gets the number of reservation in Pending state + /// + [JsonProperty(PropertyName = "pendingCount")] + public double? PendingCount { get; private set; } + + /// + /// Gets the number of reservation in Cancelled state + /// + [JsonProperty(PropertyName = "cancelledCount")] + public double? CancelledCount { get; private set; } + + } +} diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationTerm.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationTerm.cs index 10f2d4c0135bc..ff13bcf9f12b7 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationTerm.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationTerm.cs @@ -18,5 +18,6 @@ public static class ReservationTerm { public const string P1Y = "P1Y"; public const string P3Y = "P3Y"; + public const string P5Y = "P5Y"; } } diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationUtilizationAggregates.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationUtilizationAggregates.cs new file mode 100644 index 0000000000000..7b30ced3391c9 --- /dev/null +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationUtilizationAggregates.cs @@ -0,0 +1,77 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Reservations.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// The aggregate values of reservation utilization + /// + public partial class ReservationUtilizationAggregates + { + /// + /// Initializes a new instance of the ReservationUtilizationAggregates + /// class. + /// + public ReservationUtilizationAggregates() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ReservationUtilizationAggregates + /// class. + /// + /// The grain of the aggregate + /// The grain unit of the aggregate + /// The aggregate value + /// The aggregate value unit + public ReservationUtilizationAggregates(double? grain = default(double?), string grainUnit = default(string), double? value = default(double?), string valueUnit = default(string)) + { + Grain = grain; + GrainUnit = grainUnit; + Value = value; + ValueUnit = valueUnit; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets the grain of the aggregate + /// + [JsonProperty(PropertyName = "grain")] + public double? Grain { get; private set; } + + /// + /// Gets the grain unit of the aggregate + /// + [JsonProperty(PropertyName = "grainUnit")] + public string GrainUnit { get; private set; } + + /// + /// Gets the aggregate value + /// + [JsonProperty(PropertyName = "value")] + public double? Value { get; private set; } + + /// + /// Gets the aggregate value unit + /// + [JsonProperty(PropertyName = "valueUnit")] + public string ValueUnit { get; private set; } + + } +} diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationsProperties.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationsProperties.cs new file mode 100644 index 0000000000000..a63cb9c54c9ab --- /dev/null +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationsProperties.cs @@ -0,0 +1,334 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Reservations.Models +{ + using Microsoft.Rest; + using Microsoft.Rest.Serialization; + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// The properties of the reservations + /// + public partial class ReservationsProperties + { + /// + /// Initializes a new instance of the ReservationsProperties class. + /// + public ReservationsProperties() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ReservationsProperties class. + /// + /// The type of the resource that is + /// being reserved. Possible values include: 'VirtualMachines', + /// 'SqlDatabases', 'SuseLinux', 'CosmosDb', 'RedHat', + /// 'SqlDataWarehouse', 'VMwareCloudSimple', 'RedHatOsa', 'Databricks', + /// 'AppService', 'ManagedDisk', 'BlockBlob', 'RedisCache', + /// 'AzureDataExplorer', 'MySql', 'MariaDb', 'PostgreSql', + /// 'DedicatedHost', 'SapHana', 'SqlAzureHybridBenefit', 'AVS', + /// 'DataFactory', 'NetAppStorage', 'AzureFiles', 'SqlEdge' + /// Allows reservation discount to be + /// applied across skus within the same Autofit group. Not all skus + /// support instance size flexibility. Possible values include: 'On', + /// 'Off' + /// Friendly name for user to easily identify + /// the reservation + /// The list of applied scopes + /// The applied scope type. Possible + /// values include: 'Single', 'Shared' + /// Indicates if the reservation is + /// archived + /// Capabilities of the reservation + /// Quantity of the SKUs that are part of the + /// Reservation. + /// Current state of the reservation. + /// Possible values include: 'Creating', 'PendingResourceHold', + /// 'ConfirmedResourceHold', 'PendingBilling', 'ConfirmedBilling', + /// 'Created', 'Succeeded', 'Cancelled', 'Expired', 'BillingFailed', + /// 'Failed', 'Split', 'Merged' + /// DateTime of the Reservation + /// starting when this version is effective from. + /// DateTime of the last time the + /// Reservation was updated. + /// This is the date when the Reservation will + /// expire. + /// Description of the SKU in + /// english. + /// The message giving detailed + /// information about the status code. + /// The billing plan options available for + /// this SKU. Possible values include: 'Upfront', 'Monthly' + /// The provisioning state of + /// the reservation for display, e.g. Succeeded + /// The provisioning state of the + /// reservation, e.g. Succeeded + /// This is the date when the Reservation + /// was purchased. + /// Setting this to true will automatically + /// purchase a new reservation on the expiration date time. + /// Reservation Id of the reservation from + /// which this reservation is renewed. Format of the resource Id is + /// /providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}. + /// Reservation Id of the reservation + /// which is purchased because of renew. Format of the resource Id is + /// /providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}. + /// Represent the term of Reservation. Possible + /// values include: 'P1Y', 'P3Y', 'P5Y' + /// The applied scope type + /// of the reservation for display, e.g. Shared + /// The renew state of the + /// reservation for display, e.g. On + /// Reservation utilization + public ReservationsProperties(string reservedResourceType = default(string), string instanceFlexibility = default(string), string displayName = default(string), IList appliedScopes = default(IList), string appliedScopeType = default(string), bool? archived = default(bool?), string capabilities = default(string), int? quantity = default(int?), string provisioningState = default(string), System.DateTime? effectiveDateTime = default(System.DateTime?), System.DateTime? lastUpdatedDateTime = default(System.DateTime?), System.DateTime? expiryDate = default(System.DateTime?), string skuDescription = default(string), ExtendedStatusInfo extendedStatusInfo = default(ExtendedStatusInfo), string billingPlan = default(string), string displayProvisioningState = default(string), string provisioningSubState = default(string), System.DateTime? purchaseDate = default(System.DateTime?), ReservationSplitProperties splitProperties = default(ReservationSplitProperties), ReservationMergeProperties mergeProperties = default(ReservationMergeProperties), string billingScopeId = default(string), bool? renew = default(bool?), string renewSource = default(string), string renewDestination = default(string), RenewPropertiesResponse renewProperties = default(RenewPropertiesResponse), string term = default(string), string userFriendlyAppliedScopeType = default(string), string userFriendlyRenewState = default(string), ReservationsPropertiesUtilization utilization = default(ReservationsPropertiesUtilization)) + { + ReservedResourceType = reservedResourceType; + InstanceFlexibility = instanceFlexibility; + DisplayName = displayName; + AppliedScopes = appliedScopes; + AppliedScopeType = appliedScopeType; + Archived = archived; + Capabilities = capabilities; + Quantity = quantity; + ProvisioningState = provisioningState; + EffectiveDateTime = effectiveDateTime; + LastUpdatedDateTime = lastUpdatedDateTime; + ExpiryDate = expiryDate; + SkuDescription = skuDescription; + ExtendedStatusInfo = extendedStatusInfo; + BillingPlan = billingPlan; + DisplayProvisioningState = displayProvisioningState; + ProvisioningSubState = provisioningSubState; + PurchaseDate = purchaseDate; + SplitProperties = splitProperties; + MergeProperties = mergeProperties; + BillingScopeId = billingScopeId; + Renew = renew; + RenewSource = renewSource; + RenewDestination = renewDestination; + RenewProperties = renewProperties; + Term = term; + UserFriendlyAppliedScopeType = userFriendlyAppliedScopeType; + UserFriendlyRenewState = userFriendlyRenewState; + Utilization = utilization; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the type of the resource that is being reserved. + /// Possible values include: 'VirtualMachines', 'SqlDatabases', + /// 'SuseLinux', 'CosmosDb', 'RedHat', 'SqlDataWarehouse', + /// 'VMwareCloudSimple', 'RedHatOsa', 'Databricks', 'AppService', + /// 'ManagedDisk', 'BlockBlob', 'RedisCache', 'AzureDataExplorer', + /// 'MySql', 'MariaDb', 'PostgreSql', 'DedicatedHost', 'SapHana', + /// 'SqlAzureHybridBenefit', 'AVS', 'DataFactory', 'NetAppStorage', + /// 'AzureFiles', 'SqlEdge' + /// + [JsonProperty(PropertyName = "reservedResourceType")] + public string ReservedResourceType { get; set; } + + /// + /// Gets or sets allows reservation discount to be applied across skus + /// within the same Autofit group. Not all skus support instance size + /// flexibility. Possible values include: 'On', 'Off' + /// + [JsonProperty(PropertyName = "instanceFlexibility")] + public string InstanceFlexibility { get; set; } + + /// + /// Gets or sets friendly name for user to easily identify the + /// reservation + /// + [JsonProperty(PropertyName = "displayName")] + public string DisplayName { get; set; } + + /// + /// Gets or sets the list of applied scopes + /// + [JsonProperty(PropertyName = "appliedScopes")] + public IList AppliedScopes { get; set; } + + /// + /// Gets or sets the applied scope type. Possible values include: + /// 'Single', 'Shared' + /// + [JsonProperty(PropertyName = "appliedScopeType")] + public string AppliedScopeType { get; set; } + + /// + /// Gets or sets indicates if the reservation is archived + /// + [JsonProperty(PropertyName = "archived")] + public bool? Archived { get; set; } + + /// + /// Gets or sets capabilities of the reservation + /// + [JsonProperty(PropertyName = "capabilities")] + public string Capabilities { get; set; } + + /// + /// Gets or sets quantity of the SKUs that are part of the Reservation. + /// + [JsonProperty(PropertyName = "quantity")] + public int? Quantity { get; set; } + + /// + /// Gets or sets current state of the reservation. Possible values + /// include: 'Creating', 'PendingResourceHold', + /// 'ConfirmedResourceHold', 'PendingBilling', 'ConfirmedBilling', + /// 'Created', 'Succeeded', 'Cancelled', 'Expired', 'BillingFailed', + /// 'Failed', 'Split', 'Merged' + /// + [JsonProperty(PropertyName = "provisioningState")] + public string ProvisioningState { get; set; } + + /// + /// Gets or sets dateTime of the Reservation starting when this version + /// is effective from. + /// + [JsonProperty(PropertyName = "effectiveDateTime")] + public System.DateTime? EffectiveDateTime { get; set; } + + /// + /// Gets dateTime of the last time the Reservation was updated. + /// + [JsonProperty(PropertyName = "lastUpdatedDateTime")] + public System.DateTime? LastUpdatedDateTime { get; private set; } + + /// + /// Gets or sets this is the date when the Reservation will expire. + /// + [JsonConverter(typeof(DateJsonConverter))] + [JsonProperty(PropertyName = "expiryDate")] + public System.DateTime? ExpiryDate { get; set; } + + /// + /// Gets or sets description of the SKU in english. + /// + [JsonProperty(PropertyName = "skuDescription")] + public string SkuDescription { get; set; } + + /// + /// Gets or sets the message giving detailed information about the + /// status code. + /// + [JsonProperty(PropertyName = "extendedStatusInfo")] + public ExtendedStatusInfo ExtendedStatusInfo { get; set; } + + /// + /// Gets or sets the billing plan options available for this SKU. + /// Possible values include: 'Upfront', 'Monthly' + /// + [JsonProperty(PropertyName = "billingPlan")] + public string BillingPlan { get; set; } + + /// + /// Gets the provisioning state of the reservation for display, e.g. + /// Succeeded + /// + [JsonProperty(PropertyName = "displayProvisioningState")] + public string DisplayProvisioningState { get; private set; } + + /// + /// Gets the provisioning state of the reservation, e.g. Succeeded + /// + [JsonProperty(PropertyName = "provisioningSubState")] + public string ProvisioningSubState { get; private set; } + + /// + /// Gets or sets this is the date when the Reservation was purchased. + /// + [JsonConverter(typeof(DateJsonConverter))] + [JsonProperty(PropertyName = "purchaseDate")] + public System.DateTime? PurchaseDate { get; set; } + + /// + /// + [JsonProperty(PropertyName = "splitProperties")] + public ReservationSplitProperties SplitProperties { get; set; } + + /// + /// + [JsonProperty(PropertyName = "mergeProperties")] + public ReservationMergeProperties MergeProperties { get; set; } + + /// + /// + [JsonProperty(PropertyName = "billingScopeId")] + public string BillingScopeId { get; set; } + + /// + /// Gets or sets setting this to true will automatically purchase a new + /// reservation on the expiration date time. + /// + [JsonProperty(PropertyName = "renew")] + public bool? Renew { get; set; } + + /// + /// Gets or sets reservation Id of the reservation from which this + /// reservation is renewed. Format of the resource Id is + /// /providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}. + /// + [JsonProperty(PropertyName = "renewSource")] + public string RenewSource { get; set; } + + /// + /// Gets or sets reservation Id of the reservation which is purchased + /// because of renew. Format of the resource Id is + /// /providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}. + /// + [JsonProperty(PropertyName = "renewDestination")] + public string RenewDestination { get; set; } + + /// + /// + [JsonProperty(PropertyName = "renewProperties")] + public RenewPropertiesResponse RenewProperties { get; set; } + + /// + /// Gets or sets represent the term of Reservation. Possible values + /// include: 'P1Y', 'P3Y', 'P5Y' + /// + [JsonProperty(PropertyName = "term")] + public string Term { get; set; } + + /// + /// Gets the applied scope type of the reservation for display, e.g. + /// Shared + /// + [JsonProperty(PropertyName = "userFriendlyAppliedScopeType")] + public string UserFriendlyAppliedScopeType { get; private set; } + + /// + /// Gets the renew state of the reservation for display, e.g. On + /// + [JsonProperty(PropertyName = "userFriendlyRenewState")] + public string UserFriendlyRenewState { get; private set; } + + /// + /// Gets reservation utilization + /// + [JsonProperty(PropertyName = "utilization")] + public ReservationsPropertiesUtilization Utilization { get; private set; } + + } +} diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationsPropertiesUtilization.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationsPropertiesUtilization.cs new file mode 100644 index 0000000000000..0acfb36794b53 --- /dev/null +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservationsPropertiesUtilization.cs @@ -0,0 +1,65 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Reservations.Models +{ + using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; + using System.Linq; + + /// + /// Reservation utilization + /// + public partial class ReservationsPropertiesUtilization + { + /// + /// Initializes a new instance of the ReservationsPropertiesUtilization + /// class. + /// + public ReservationsPropertiesUtilization() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the ReservationsPropertiesUtilization + /// class. + /// + /// The number of days trend for a + /// reservation + /// The array of aggregates of a reservation's + /// utilization + public ReservationsPropertiesUtilization(string trend = default(string), IList aggregates = default(IList)) + { + Trend = trend; + Aggregates = aggregates; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets the number of days trend for a reservation + /// + [JsonProperty(PropertyName = "trend")] + public string Trend { get; private set; } + + /// + /// Gets or sets the array of aggregates of a reservation's utilization + /// + [JsonProperty(PropertyName = "aggregates")] + public IList Aggregates { get; set; } + + } +} diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservedResourceType.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservedResourceType.cs index ed8328941b955..e76661585b9da 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservedResourceType.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ReservedResourceType.cs @@ -36,5 +36,10 @@ public static class ReservedResourceType public const string DedicatedHost = "DedicatedHost"; public const string SapHana = "SapHana"; public const string SqlAzureHybridBenefit = "SqlAzureHybridBenefit"; + public const string AVS = "AVS"; + public const string DataFactory = "DataFactory"; + public const string NetAppStorage = "NetAppStorage"; + public const string AzureFiles = "AzureFiles"; + public const string SqlEdge = "SqlEdge"; } } diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ResourceType.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ResourceType.cs new file mode 100644 index 0000000000000..ef2eb5e962b97 --- /dev/null +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/ResourceType.cs @@ -0,0 +1,25 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Reservations.Models +{ + + /// + /// Defines values for ResourceType. + /// + public static class ResourceType + { + public const string Standard = "standard"; + public const string Dedicated = "dedicated"; + public const string LowPriority = "lowPriority"; + public const string Shared = "shared"; + public const string ServiceSpecific = "serviceSpecific"; + } +} diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/SkuCapability.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/SkuCapability.cs new file mode 100644 index 0000000000000..cac99b8d0926d --- /dev/null +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/SkuCapability.cs @@ -0,0 +1,57 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Reservations.Models +{ + using Newtonsoft.Json; + using System.Linq; + + public partial class SkuCapability + { + /// + /// Initializes a new instance of the SkuCapability class. + /// + public SkuCapability() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the SkuCapability class. + /// + /// An invariant to describe the feature. + /// An invariant if the feature is measured by + /// quantity. + public SkuCapability(string name = default(string), string value = default(string)) + { + Name = name; + Value = value; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets an invariant to describe the feature. + /// + [JsonProperty(PropertyName = "name")] + public string Name { get; set; } + + /// + /// Gets or sets an invariant if the feature is measured by quantity. + /// + [JsonProperty(PropertyName = "value")] + public string Value { get; set; } + + } +} diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/SubRequest.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/SubRequest.cs index fd5815b6169d6..0c4e408bd5c1b 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/SubRequest.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/SubRequest.cs @@ -36,11 +36,13 @@ public SubRequest() /// The limit units, such as **count** and /// **bytes**. Use the unit field provided in the response of the GET /// quota operation. - /// The quota request status. + /// The quota request status. Possible + /// values include: 'Accepted', 'Invalid', 'Succeeded', 'Failed', + /// 'InProgress' /// User-friendly status message. /// Sub request ID for individual /// request. - public SubRequest(int? limit = default(int?), ResourceName name = default(ResourceName), string resourceType = default(string), string unit = default(string), object provisioningState = default(object), string message = default(string), string subRequestId = default(string)) + public SubRequest(int? limit = default(int?), ResourceName name = default(ResourceName), string resourceType = default(string), string unit = default(string), string provisioningState = default(string), string message = default(string), string subRequestId = default(string)) { Limit = limit; Name = name; @@ -83,10 +85,11 @@ public SubRequest() public string Unit { get; set; } /// - /// Gets or sets the quota request status. + /// Gets or sets the quota request status. Possible values include: + /// 'Accepted', 'Invalid', 'Succeeded', 'Failed', 'InProgress' /// [JsonProperty(PropertyName = "provisioningState")] - public object ProvisioningState { get; set; } + public string ProvisioningState { get; set; } /// /// Gets user-friendly status message. diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/SystemData.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/SystemData.cs new file mode 100644 index 0000000000000..6ee9fd4550210 --- /dev/null +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/Models/SystemData.cs @@ -0,0 +1,103 @@ +// +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for +// license information. +// +// Code generated by Microsoft (R) AutoRest Code Generator. +// Changes may cause incorrect behavior and will be lost if the code is +// regenerated. +// + +namespace Microsoft.Azure.Management.Reservations.Models +{ + using Newtonsoft.Json; + using System.Linq; + + /// + /// Metadata pertaining to creation and last modification of the resource. + /// + public partial class SystemData + { + /// + /// Initializes a new instance of the SystemData class. + /// + public SystemData() + { + CustomInit(); + } + + /// + /// Initializes a new instance of the SystemData class. + /// + /// The identity that created the + /// resource. + /// The type of identity that created the + /// resource. Possible values include: 'User', 'Application', + /// 'ManagedIdentity', 'Key' + /// The timestamp of resource creation + /// (UTC). + /// The identity that last modified the + /// resource. + /// The type of identity that last + /// modified the resource. Possible values include: 'User', + /// 'Application', 'ManagedIdentity', 'Key' + /// The timestamp of resource last + /// modification (UTC) + public SystemData(string createdBy = default(string), string createdByType = default(string), System.DateTime? createdAt = default(System.DateTime?), string lastModifiedBy = default(string), string lastModifiedByType = default(string), System.DateTime? lastModifiedAt = default(System.DateTime?)) + { + CreatedBy = createdBy; + CreatedByType = createdByType; + CreatedAt = createdAt; + LastModifiedBy = lastModifiedBy; + LastModifiedByType = lastModifiedByType; + LastModifiedAt = lastModifiedAt; + CustomInit(); + } + + /// + /// An initialization method that performs custom operations like setting defaults + /// + partial void CustomInit(); + + /// + /// Gets or sets the identity that created the resource. + /// + [JsonProperty(PropertyName = "createdBy")] + public string CreatedBy { get; set; } + + /// + /// Gets or sets the type of identity that created the resource. + /// Possible values include: 'User', 'Application', 'ManagedIdentity', + /// 'Key' + /// + [JsonProperty(PropertyName = "createdByType")] + public string CreatedByType { get; set; } + + /// + /// Gets or sets the timestamp of resource creation (UTC). + /// + [JsonProperty(PropertyName = "createdAt")] + public System.DateTime? CreatedAt { get; set; } + + /// + /// Gets or sets the identity that last modified the resource. + /// + [JsonProperty(PropertyName = "lastModifiedBy")] + public string LastModifiedBy { get; set; } + + /// + /// Gets or sets the type of identity that last modified the resource. + /// Possible values include: 'User', 'Application', 'ManagedIdentity', + /// 'Key' + /// + [JsonProperty(PropertyName = "lastModifiedByType")] + public string LastModifiedByType { get; set; } + + /// + /// Gets or sets the timestamp of resource last modification (UTC) + /// + [JsonProperty(PropertyName = "lastModifiedAt")] + public System.DateTime? LastModifiedAt { get; set; } + + } +} diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/OperationOperations.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/OperationOperations.cs index de05d3b1fa966..10eaec27fb197 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/OperationOperations.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/OperationOperations.cs @@ -73,7 +73,7 @@ internal OperationOperations(AzureReservationAPIClient client) /// public async Task>> ListWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - string apiVersion = "2020-10-01-preview"; + string apiVersion = "2021-07-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ReservationOperations.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ReservationOperations.cs index 49fbc47c5e669..80348c8087d87 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ReservationOperations.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ReservationOperations.cs @@ -166,7 +166,7 @@ internal ReservationOperations(AzureReservationAPIClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "reservationOrderId"); } - string apiVersion = "2020-10-01-preview"; + string apiVersion = "2021-07-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -354,7 +354,7 @@ internal ReservationOperations(AzureReservationAPIClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "reservationOrderId"); } - string apiVersion = "2020-10-01-preview"; + string apiVersion = "2021-07-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -574,7 +574,7 @@ internal ReservationOperations(AzureReservationAPIClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "reservationOrderId"); } - string apiVersion = "2020-10-01-preview"; + string apiVersion = "2021-07-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -718,6 +718,222 @@ internal ReservationOperations(AzureReservationAPIClient client) return _result; } + /// + /// List the reservations and the roll up counts of reservations group by + /// provisioning states that the user has access to in the current tenant. + /// + /// + /// May be used to filter by reservation properties. The filter supports 'eq', + /// 'or', and 'and'. It does not currently support 'ne', 'gt', 'le', 'ge', or + /// 'not'. Reservation properties include sku/name, + /// properties/{appliedScopeType, archived, displayName, + /// displayProvisioningState, effectiveDateTime, expiryDate, provisioningState, + /// quantity, renew, reservedResourceType, term, userFriendlyAppliedScopeType, + /// userFriendlyRenewState} + /// + /// + /// May be used to sort order by reservation properties. + /// + /// + /// To indicate whether to refresh the roll up counts of the reservations group + /// by provisioning states + /// + /// + /// The number of reservations to skip from the list before returning results + /// + /// + /// The selected provisioning state + /// + /// + /// To number of reservations to return + /// + /// + /// Headers that will be added to request. + /// + /// + /// The cancellation token. + /// + /// + /// Thrown when the operation returned an invalid status code + /// + /// + /// Thrown when unable to deserialize the response + /// + /// + /// A response object containing the response body and response headers. + /// + public async Task>> ListAllWithHttpMessagesAsync(string filter = default(string), string orderby = default(string), string refreshSummary = default(string), double? skiptoken = default(double?), string selectedState = default(string), double? take = default(double?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + string apiVersion = "2021-07-01"; + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("apiVersion", apiVersion); + tracingParameters.Add("filter", filter); + tracingParameters.Add("orderby", orderby); + tracingParameters.Add("refreshSummary", refreshSummary); + tracingParameters.Add("skiptoken", skiptoken); + tracingParameters.Add("selectedState", selectedState); + tracingParameters.Add("take", take); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "ListAll", tracingParameters); + } + // Construct URL + var _baseUrl = Client.BaseUri.AbsoluteUri; + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Capacity/reservations").ToString(); + List _queryParameters = new List(); + if (apiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + } + if (filter != null) + { + _queryParameters.Add(string.Format("$filter={0}", System.Uri.EscapeDataString(filter))); + } + if (orderby != null) + { + _queryParameters.Add(string.Format("$orderby={0}", System.Uri.EscapeDataString(orderby))); + } + if (refreshSummary != null) + { + _queryParameters.Add(string.Format("refreshSummary={0}", System.Uri.EscapeDataString(refreshSummary))); + } + if (skiptoken != null) + { + _queryParameters.Add(string.Format("$skiptoken={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(skiptoken, Client.SerializationSettings).Trim('"')))); + } + if (selectedState != null) + { + _queryParameters.Add(string.Format("selectedState={0}", System.Uri.EscapeDataString(selectedState))); + } + if (take != null) + { + _queryParameters.Add(string.Format("take={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(take, Client.SerializationSettings).Trim('"')))); + } + if (_queryParameters.Count > 0) + { + _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); + } + // Create HTTP transport objects + var _httpRequest = new HttpRequestMessage(); + HttpResponseMessage _httpResponse = null; + _httpRequest.Method = new HttpMethod("GET"); + _httpRequest.RequestUri = new System.Uri(_url); + // Set Headers + if (Client.GenerateClientRequestId != null && Client.GenerateClientRequestId.Value) + { + _httpRequest.Headers.TryAddWithoutValidation("x-ms-client-request-id", System.Guid.NewGuid().ToString()); + } + if (Client.AcceptLanguage != null) + { + if (_httpRequest.Headers.Contains("accept-language")) + { + _httpRequest.Headers.Remove("accept-language"); + } + _httpRequest.Headers.TryAddWithoutValidation("accept-language", Client.AcceptLanguage); + } + + + if (customHeaders != null) + { + foreach(var _header in customHeaders) + { + if (_httpRequest.Headers.Contains(_header.Key)) + { + _httpRequest.Headers.Remove(_header.Key); + } + _httpRequest.Headers.TryAddWithoutValidation(_header.Key, _header.Value); + } + } + + // Serialize Request + string _requestContent = null; + // Set Credentials + if (Client.Credentials != null) + { + cancellationToken.ThrowIfCancellationRequested(); + await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + } + // Send Request + if (_shouldTrace) + { + ServiceClientTracing.SendRequest(_invocationId, _httpRequest); + } + cancellationToken.ThrowIfCancellationRequested(); + _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + if (_shouldTrace) + { + ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); + } + HttpStatusCode _statusCode = _httpResponse.StatusCode; + cancellationToken.ThrowIfCancellationRequested(); + string _responseContent = null; + if ((int)_statusCode != 200) + { + var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + try + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + ErrorResponse _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + if (_errorBody != null) + { + ex.Body = _errorBody; + } + } + catch (JsonException) + { + // Ignore the exception + } + ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); + ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + 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; + } + /// /// Get Available Scopes for `Reservation`. /// @@ -768,7 +984,7 @@ internal ReservationOperations(AzureReservationAPIClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "body"); } - string apiVersion = "2020-10-01-preview"; + string apiVersion = "2021-07-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -963,7 +1179,7 @@ internal ReservationOperations(AzureReservationAPIClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "body"); } - string apiVersion = "2020-10-01-preview"; + string apiVersion = "2021-07-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1156,7 +1372,7 @@ internal ReservationOperations(AzureReservationAPIClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "body"); } - string apiVersion = "2020-10-01-preview"; + string apiVersion = "2021-07-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1355,7 +1571,7 @@ internal ReservationOperations(AzureReservationAPIClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "parameters"); } - string apiVersion = "2020-10-01-preview"; + string apiVersion = "2021-07-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -1848,5 +2064,174 @@ internal ReservationOperations(AzureReservationAPIClient client) return _result; } + /// + /// List the reservations and the roll up counts of reservations group by + /// provisioning states that the user has access to in the current tenant. + /// + /// + /// 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>> ListAllNextWithHttpMessagesAsync(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, "ListAllNext", 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) + { + var ex = new ErrorResponseException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + try + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + ErrorResponse _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + if (_errorBody != null) + { + ex.Body = _errorBody; + } + } + catch (JsonException) + { + // Ignore the exception + } + ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); + ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + 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/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ReservationOperationsExtensions.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ReservationOperationsExtensions.cs index db5eb86880488..3d6abe1afdc91 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ReservationOperationsExtensions.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ReservationOperationsExtensions.cs @@ -361,6 +361,86 @@ public static IPage ListRevisions(this IReservationOperatio } } + /// + /// List the reservations and the roll up counts of reservations group by + /// provisioning states that the user has access to in the current tenant. + /// + /// + /// The operations group for this extension method. + /// + /// + /// May be used to filter by reservation properties. The filter supports 'eq', + /// 'or', and 'and'. It does not currently support 'ne', 'gt', 'le', 'ge', or + /// 'not'. Reservation properties include sku/name, + /// properties/{appliedScopeType, archived, displayName, + /// displayProvisioningState, effectiveDateTime, expiryDate, provisioningState, + /// quantity, renew, reservedResourceType, term, userFriendlyAppliedScopeType, + /// userFriendlyRenewState} + /// + /// + /// May be used to sort order by reservation properties. + /// + /// + /// To indicate whether to refresh the roll up counts of the reservations group + /// by provisioning states + /// + /// + /// The number of reservations to skip from the list before returning results + /// + /// + /// The selected provisioning state + /// + /// + /// To number of reservations to return + /// + public static IPage ListAll(this IReservationOperations operations, string filter = default(string), string orderby = default(string), string refreshSummary = default(string), double? skiptoken = default(double?), string selectedState = default(string), double? take = default(double?)) + { + return operations.ListAllAsync(filter, orderby, refreshSummary, skiptoken, selectedState, take).GetAwaiter().GetResult(); + } + + /// + /// List the reservations and the roll up counts of reservations group by + /// provisioning states that the user has access to in the current tenant. + /// + /// + /// The operations group for this extension method. + /// + /// + /// May be used to filter by reservation properties. The filter supports 'eq', + /// 'or', and 'and'. It does not currently support 'ne', 'gt', 'le', 'ge', or + /// 'not'. Reservation properties include sku/name, + /// properties/{appliedScopeType, archived, displayName, + /// displayProvisioningState, effectiveDateTime, expiryDate, provisioningState, + /// quantity, renew, reservedResourceType, term, userFriendlyAppliedScopeType, + /// userFriendlyRenewState} + /// + /// + /// May be used to sort order by reservation properties. + /// + /// + /// To indicate whether to refresh the roll up counts of the reservations group + /// by provisioning states + /// + /// + /// The number of reservations to skip from the list before returning results + /// + /// + /// The selected provisioning state + /// + /// + /// To number of reservations to return + /// + /// + /// The cancellation token. + /// + public static async Task> ListAllAsync(this IReservationOperations operations, string filter = default(string), string orderby = default(string), string refreshSummary = default(string), double? skiptoken = default(double?), string selectedState = default(string), double? take = default(double?), CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.ListAllWithHttpMessagesAsync(filter, orderby, refreshSummary, skiptoken, selectedState, take, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + /// /// Get Available Scopes for `Reservation`. /// @@ -641,5 +721,41 @@ public static IPage ListRevisionsNext(this IReservationOper } } + /// + /// List the reservations and the roll up counts of reservations group by + /// provisioning states that the user has access to in the current tenant. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + public static IPage ListAllNext(this IReservationOperations operations, string nextPageLink) + { + return operations.ListAllNextAsync(nextPageLink).GetAwaiter().GetResult(); + } + + /// + /// List the reservations and the roll up counts of reservations group by + /// provisioning states that the user has access to in the current tenant. + /// + /// + /// The operations group for this extension method. + /// + /// + /// The NextLink from the previous successful call to List operation. + /// + /// + /// The cancellation token. + /// + public static async Task> ListAllNextAsync(this IReservationOperations operations, string nextPageLink, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.ListAllNextWithHttpMessagesAsync(nextPageLink, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + } } diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ReservationOrderOperations.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ReservationOrderOperations.cs index 115202823e69b..430a4e1c3e447 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ReservationOrderOperations.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ReservationOrderOperations.cs @@ -86,7 +86,7 @@ internal ReservationOrderOperations(AzureReservationAPIClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "body"); } - string apiVersion = "2020-10-01-preview"; + string apiVersion = "2021-07-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -257,7 +257,7 @@ internal ReservationOrderOperations(AzureReservationAPIClient client) /// public async Task>> ListWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - string apiVersion = "2020-10-01-preview"; + string apiVersion = "2021-07-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -461,7 +461,7 @@ internal ReservationOrderOperations(AzureReservationAPIClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "reservationOrderId"); } - string apiVersion = "2020-10-01-preview"; + string apiVersion = "2021-07-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; @@ -608,6 +608,199 @@ internal ReservationOrderOperations(AzureReservationAPIClient client) return _result; } + /// + /// Change directory of `ReservationOrder`. + /// + /// + /// Change directory (tenant) of `ReservationOrder` and all `Reservation` under + /// it to specified tenant id + /// + /// + /// Order Id of the reservation + /// + /// + /// Information needed to change directory of reservation order + /// + /// + /// 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> ChangeDirectoryWithHttpMessagesAsync(string reservationOrderId, ChangeDirectoryRequest body, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) + { + if (reservationOrderId == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "reservationOrderId"); + } + if (body == null) + { + throw new ValidationException(ValidationRules.CannotBeNull, "body"); + } + string apiVersion = "2021-07-01"; + // Tracing + bool _shouldTrace = ServiceClientTracing.IsEnabled; + string _invocationId = null; + if (_shouldTrace) + { + _invocationId = ServiceClientTracing.NextInvocationId.ToString(); + Dictionary tracingParameters = new Dictionary(); + tracingParameters.Add("reservationOrderId", reservationOrderId); + tracingParameters.Add("apiVersion", apiVersion); + tracingParameters.Add("body", body); + tracingParameters.Add("cancellationToken", cancellationToken); + ServiceClientTracing.Enter(_invocationId, this, "ChangeDirectory", tracingParameters); + } + // Construct URL + var _baseUrl = Client.BaseUri.AbsoluteUri; + var _url = new System.Uri(new System.Uri(_baseUrl + (_baseUrl.EndsWith("/") ? "" : "/")), "providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/changeDirectory").ToString(); + _url = _url.Replace("{reservationOrderId}", System.Uri.EscapeDataString(reservationOrderId)); + List _queryParameters = new List(); + if (apiVersion != null) + { + _queryParameters.Add(string.Format("api-version={0}", System.Uri.EscapeDataString(apiVersion))); + } + if (_queryParameters.Count > 0) + { + _url += (_url.Contains("?") ? "&" : "?") + string.Join("&", _queryParameters); + } + // Create HTTP transport objects + var _httpRequest = new HttpRequestMessage(); + HttpResponseMessage _httpResponse = null; + _httpRequest.Method = new HttpMethod("POST"); + _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; + if(body != null) + { + _requestContent = Rest.Serialization.SafeJsonConvert.SerializeObject(body, Client.SerializationSettings); + _httpRequest.Content = new StringContent(_requestContent, System.Text.Encoding.UTF8); + _httpRequest.Content.Headers.ContentType =System.Net.Http.Headers.MediaTypeHeaderValue.Parse("application/json; charset=utf-8"); + } + // Set Credentials + if (Client.Credentials != null) + { + cancellationToken.ThrowIfCancellationRequested(); + await Client.Credentials.ProcessHttpRequestAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + } + // Send Request + if (_shouldTrace) + { + ServiceClientTracing.SendRequest(_invocationId, _httpRequest); + } + cancellationToken.ThrowIfCancellationRequested(); + _httpResponse = await Client.HttpClient.SendAsync(_httpRequest, cancellationToken).ConfigureAwait(false); + if (_shouldTrace) + { + ServiceClientTracing.ReceiveResponse(_invocationId, _httpResponse); + } + HttpStatusCode _statusCode = _httpResponse.StatusCode; + cancellationToken.ThrowIfCancellationRequested(); + string _responseContent = null; + if ((int)_statusCode != 200) + { + var ex = new ErrorException(string.Format("Operation returned an invalid status code '{0}'", _statusCode)); + try + { + _responseContent = await _httpResponse.Content.ReadAsStringAsync().ConfigureAwait(false); + Error _errorBody = Rest.Serialization.SafeJsonConvert.DeserializeObject(_responseContent, Client.DeserializationSettings); + if (_errorBody != null) + { + ex.Body = _errorBody; + } + } + catch (JsonException) + { + // Ignore the exception + } + ex.Request = new HttpRequestMessageWrapper(_httpRequest, _requestContent); + ex.Response = new HttpResponseMessageWrapper(_httpResponse, _responseContent); + 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; + } + /// /// Purchase `ReservationOrder` /// @@ -651,7 +844,7 @@ internal ReservationOrderOperations(AzureReservationAPIClient client) { throw new ValidationException(ValidationRules.CannotBeNull, "body"); } - string apiVersion = "2020-10-01-preview"; + string apiVersion = "2021-07-01"; // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; string _invocationId = null; diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ReservationOrderOperationsExtensions.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ReservationOrderOperationsExtensions.cs index 1129492036810..854ec433bfcec 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ReservationOrderOperationsExtensions.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/ReservationOrderOperationsExtensions.cs @@ -189,6 +189,54 @@ public static ReservationOrderResponse Purchase(this IReservationOrderOperations } } + /// + /// Change directory of `ReservationOrder`. + /// + /// + /// Change directory (tenant) of `ReservationOrder` and all `Reservation` under + /// it to specified tenant id + /// + /// + /// The operations group for this extension method. + /// + /// + /// Order Id of the reservation + /// + /// + /// Information needed to change directory of reservation order + /// + public static ChangeDirectoryResponse ChangeDirectory(this IReservationOrderOperations operations, string reservationOrderId, ChangeDirectoryRequest body) + { + return operations.ChangeDirectoryAsync(reservationOrderId, body).GetAwaiter().GetResult(); + } + + /// + /// Change directory of `ReservationOrder`. + /// + /// + /// Change directory (tenant) of `ReservationOrder` and all `Reservation` under + /// it to specified tenant id + /// + /// + /// The operations group for this extension method. + /// + /// + /// Order Id of the reservation + /// + /// + /// Information needed to change directory of reservation order + /// + /// + /// The cancellation token. + /// + public static async Task ChangeDirectoryAsync(this IReservationOrderOperations operations, string reservationOrderId, ChangeDirectoryRequest body, CancellationToken cancellationToken = default(CancellationToken)) + { + using (var _result = await operations.ChangeDirectoryWithHttpMessagesAsync(reservationOrderId, body, null, cancellationToken).ConfigureAwait(false)) + { + return _result.Body; + } + } + /// /// Purchase `ReservationOrder` /// diff --git a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/SdkInfo_AzureReservationAPI.cs b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/SdkInfo_AzureReservationAPI.cs index 430cc5e0414b9..a403dde8f8091 100644 --- a/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/SdkInfo_AzureReservationAPI.cs +++ b/sdk/reservations/Microsoft.Azure.Management.Reservations/src/Generated/SdkInfo_AzureReservationAPI.cs @@ -19,15 +19,15 @@ public static IEnumerable> ApiInfo_AzureReservatio { return new Tuple[] { - new Tuple("Capacity", "CalculateExchange", "2020-10-01-preview"), - new Tuple("Capacity", "Exchange", "2020-10-01-preview"), - new Tuple("Capacity", "GetAppliedReservationList", "2020-10-01-preview"), - new Tuple("Capacity", "GetCatalog", "2020-10-01-preview"), - new Tuple("Capacity", "Operation", "2020-10-01-preview"), + new Tuple("Capacity", "CalculateExchange", "2021-07-01"), + new Tuple("Capacity", "Exchange", "2021-07-01"), + new Tuple("Capacity", "GetAppliedReservationList", "2021-07-01"), + new Tuple("Capacity", "GetCatalog", "2021-07-01"), + new Tuple("Capacity", "Operation", "2021-07-01"), new Tuple("Capacity", "Quota", "2020-10-25"), new Tuple("Capacity", "QuotaRequestStatus", "2020-10-25"), - new Tuple("Capacity", "Reservation", "2020-10-01-preview"), - new Tuple("Capacity", "ReservationOrder", "2020-10-01-preview"), + new Tuple("Capacity", "Reservation", "2021-07-01"), + new Tuple("Capacity", "ReservationOrder", "2021-07-01"), }.AsEnumerable(); } }