diff --git a/profiles/preview/preview/reservations/mgmt/reservations/models.go b/profiles/preview/preview/reservations/mgmt/reservations/models.go index 4c58cf519eef..af54cdd1ddbe 100644 --- a/profiles/preview/preview/reservations/mgmt/reservations/models.go +++ b/profiles/preview/preview/reservations/mgmt/reservations/models.go @@ -173,9 +173,6 @@ type Properties = original.Properties type PurchaseRequest = original.PurchaseRequest type PurchaseRequestProperties = original.PurchaseRequestProperties type PurchaseRequestPropertiesReservedResourceProperties = original.PurchaseRequestPropertiesReservedResourceProperties -type RenewPropertiesResponse = original.RenewPropertiesResponse -type RenewPropertiesResponseLinks = original.RenewPropertiesResponseLinks -type RenewPropertiesResponseLockedPriceTotal = original.RenewPropertiesResponseLockedPriceTotal type ReservationMergeFuture = original.ReservationMergeFuture type ReservationUpdateFuture = original.ReservationUpdateFuture type Response = original.Response diff --git a/services/preview/reservations/mgmt/2019-04-01/reservations/models.go b/services/preview/reservations/mgmt/2019-04-01/reservations/models.go index 795fe69332cd..13d14926791d 100644 --- a/services/preview/reservations/mgmt/2019-04-01/reservations/models.go +++ b/services/preview/reservations/mgmt/2019-04-01/reservations/models.go @@ -1090,8 +1090,6 @@ type PatchProperties struct { // AppliedScopeType - Possible values include: 'Single', 'Shared' AppliedScopeType AppliedScopeType `json:"appliedScopeType,omitempty"` AppliedScopes *[]string `json:"appliedScopes,omitempty"` - Renew *bool `json:"renew,omitempty"` - RenewProperties *PurchaseRequest `json:"renewProperties,omitempty"` // InstanceFlexibility - Possible values include: 'On', 'Off' InstanceFlexibility InstanceFlexibility `json:"instanceFlexibility,omitempty"` // Name - Name of the Reservation @@ -1119,12 +1117,10 @@ type Properties struct { // ExpiryDate - This is the date when the Reservation will expire. ExpiryDate *date.Date `json:"expiryDate,omitempty"` // SkuDescription - Description of the SKU in english. - SkuDescription *string `json:"skuDescription,omitempty"` - ExtendedStatusInfo *ExtendedStatusInfo `json:"extendedStatusInfo,omitempty"` - SplitProperties *SplitPropertiesType `json:"splitProperties,omitempty"` - MergeProperties *MergePropertiesType `json:"mergeProperties,omitempty"` - Renew *bool `json:"renew,omitempty"` - RenewProperties *RenewPropertiesResponse `json:"renewProperties,omitempty"` + SkuDescription *string `json:"skuDescription,omitempty"` + ExtendedStatusInfo *ExtendedStatusInfo `json:"extendedStatusInfo,omitempty"` + SplitProperties *SplitPropertiesType `json:"splitProperties,omitempty"` + MergeProperties *MergePropertiesType `json:"mergeProperties,omitempty"` } // PurchaseRequest ... @@ -1205,7 +1201,6 @@ type PurchaseRequestProperties struct { // AppliedScopeType - Possible values include: 'Single', 'Shared' AppliedScopeType AppliedScopeType `json:"appliedScopeType,omitempty"` AppliedScopes *[]string `json:"appliedScopes,omitempty"` - Renew *bool `json:"renew,omitempty"` // ReservedResourceProperties - Properties specific to each reserved resource type. Not required if not applicable. ReservedResourceProperties *PurchaseRequestPropertiesReservedResourceProperties `json:"reservedResourceProperties,omitempty"` } @@ -1217,30 +1212,6 @@ type PurchaseRequestPropertiesReservedResourceProperties struct { InstanceFlexibility InstanceFlexibility `json:"instanceFlexibility,omitempty"` } -// RenewPropertiesResponse ... -type RenewPropertiesResponse struct { - PurchaseProperties *PurchaseRequest `json:"purchaseProperties,omitempty"` - // LockedPriceTotal - Locked currency & amount for new reservation purchase at the time of renewal. Price is locked 30 days before expiry date time if renew is true. - LockedPriceTotal *RenewPropertiesResponseLockedPriceTotal `json:"lockedPriceTotal,omitempty"` - // Links - Contains prev and next reservation Ids' because of renewal. - Links *RenewPropertiesResponseLinks `json:"links,omitempty"` -} - -// RenewPropertiesResponseLinks contains prev and next reservation Ids' because of renewal. -type RenewPropertiesResponseLinks struct { - // RenewSource - Reservation Id of the reservation from which this reservation is renewed. Format of the resource Id is /providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}. - RenewSource *string `json:"renewSource,omitempty"` - // RenewDestination - Reservation Id of the reservation which is purchased because of renew. Format of the resource Id is /providers/Microsoft.Capacity/reservationOrders/{reservationOrderId}/reservations/{reservationId}. - RenewDestination *string `json:"renewDestination,omitempty"` -} - -// RenewPropertiesResponseLockedPriceTotal locked currency & amount for new reservation purchase at the -// time of renewal. Price is locked 30 days before expiry date time if renew is true. -type RenewPropertiesResponseLockedPriceTotal struct { - CurrencyCode *string `json:"currencyCode,omitempty"` - Amount *string `json:"amount,omitempty"` -} - // ReservationMergeFuture an abstraction for monitoring and retrieving the results of a long-running // operation. type ReservationMergeFuture struct { diff --git a/services/preview/reservations/mgmt/2019-04-01/reservations/reservation.go b/services/preview/reservations/mgmt/2019-04-01/reservations/reservation.go index ef79d833727c..7ea4c3a4afef 100644 --- a/services/preview/reservations/mgmt/2019-04-01/reservations/reservation.go +++ b/services/preview/reservations/mgmt/2019-04-01/reservations/reservation.go @@ -44,8 +44,7 @@ func NewClientWithBaseURI(baseURI string) Client { // Parameters: // reservationID - id of the Reservation Item // reservationOrderID - order Id of the reservation -// appendParameter - supported value of this query is renewProperties -func (client Client) Get(ctx context.Context, reservationID string, reservationOrderID string, appendParameter string) (result Response, err error) { +func (client Client) Get(ctx context.Context, reservationID string, reservationOrderID string) (result Response, err error) { if tracing.IsEnabled() { ctx = tracing.StartSpan(ctx, fqdn+"/Client.Get") defer func() { @@ -56,7 +55,7 @@ func (client Client) Get(ctx context.Context, reservationID string, reservationO tracing.EndSpan(ctx, sc, err) }() } - req, err := client.GetPreparer(ctx, reservationID, reservationOrderID, appendParameter) + req, err := client.GetPreparer(ctx, reservationID, reservationOrderID) if err != nil { err = autorest.NewErrorWithError(err, "reservations.Client", "Get", nil, "Failure preparing request") return @@ -78,7 +77,7 @@ func (client Client) Get(ctx context.Context, reservationID string, reservationO } // GetPreparer prepares the Get request. -func (client Client) GetPreparer(ctx context.Context, reservationID string, reservationOrderID string, appendParameter string) (*http.Request, error) { +func (client Client) GetPreparer(ctx context.Context, reservationID string, reservationOrderID string) (*http.Request, error) { pathParameters := map[string]interface{}{ "reservationId": autorest.Encode("path", reservationID), "reservationOrderId": autorest.Encode("path", reservationOrderID), @@ -88,9 +87,6 @@ func (client Client) GetPreparer(ctx context.Context, reservationID string, rese queryParameters := map[string]interface{}{ "api-version": APIVersion, } - if len(appendParameter) > 0 { - queryParameters["append"] = autorest.Encode("query", appendParameter) - } preparer := autorest.CreatePreparer( autorest.AsGet(), diff --git a/services/preview/reservations/mgmt/2019-04-01/reservations/reservationsapi/interfaces.go b/services/preview/reservations/mgmt/2019-04-01/reservations/reservationsapi/interfaces.go index 79cd246dd623..fb7faec0646d 100644 --- a/services/preview/reservations/mgmt/2019-04-01/reservations/reservationsapi/interfaces.go +++ b/services/preview/reservations/mgmt/2019-04-01/reservations/reservationsapi/interfaces.go @@ -42,7 +42,7 @@ var _ OrderClientAPI = (*reservations.OrderClient)(nil) // ClientAPI contains the set of methods on the Client type. type ClientAPI interface { - Get(ctx context.Context, reservationID string, reservationOrderID string, appendParameter string) (result reservations.Response, err error) + Get(ctx context.Context, reservationID string, reservationOrderID string) (result reservations.Response, err error) List(ctx context.Context, reservationOrderID string) (result reservations.ListPage, err error) ListRevisions(ctx context.Context, reservationID string, reservationOrderID string) (result reservations.ListPage, err error) Merge(ctx context.Context, reservationOrderID string, body reservations.MergeRequest) (result reservations.ReservationMergeFuture, err error)