Merge pull request #1206 from ioito/hotfix/qx-azure-reservation-list

fix(azure): add reservation list

Author: ioito

pkg/multicloud/azure/azure_v2.go

@@ -147,6 +147,9 @@ func (self *SAzureClient) _post_v2(service string, resource, apiVersion string,
 
 func (self *SAzureClient) _request_v2(service string, method httputils.THttpMethod, resource, apiVersion string, params url.Values, body map[string]interface{}) (jsonutils.JSONObject, error) {
 	value := []jsonutils.JSONObject{}
+	if gotypes.IsNil(params) {
+		params = url.Values{}
+	}
 	for {
 		resp, err := self.__request_v2(service, method, resource, apiVersion, params, body)
 		if err != nil {

pkg/multicloud/azure/reservation.go

@@ -0,0 +1,110 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package azure
+
+import "time"
+
+type SReservationOrder struct {
+	Id         string
+	Name       string
+	Type       string
+	Properties struct {
+		OriginalQuantity int
+		RequestDateTime  time.Time
+		BillingPlan      string
+		Reservations     []struct {
+			Id string
+		}
+		Term              string
+		DisplayName       string
+		CreatedDateTime   time.Time
+		BenefitStartTime  time.Time
+		ProvisioningState string
+		BillingProfileId  string
+		BillingAccountId  string
+		ExpiryDate        time.Time
+		ExpiryDateTime    time.Time
+	}
+}
+
+func (client *SAzureClient) ListReservationOrders() ([]SReservationOrder, error) {
+	result := []SReservationOrder{}
+	resp, err := client.list_v2("/providers/Microsoft.Capacity/reservationOrders", "2022-11-01", nil)
+	if err != nil {
+		return nil, err
+	}
+	err = resp.Unmarshal(&result, "value")
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}
+
+type SReservation struct {
+	Id       string
+	Name     string
+	Type     string
+	Location string
+	Etag     int
+	Sku      struct {
+		Name string
+	}
+	Properties struct {
+		ReservedResourceType         string
+		UserFriendlyRenewState       string
+		SkuDescription               string
+		Renew                        bool
+		Archived                     bool
+		Quantity                     int
+		AppliedScopeType             string
+		DisplayName                  string
+		ProvisioningState            string
+		Term                         string
+		DisplayProvisioningState     string
+		UserFriendlyAppliedScopeType string
+		ExpiryDateTime               time.Time
+		PurchaseDateTime             time.Time
+		BenefitStartTime             time.Time
+		LastUpdatedDateTime          time.Time
+		ExpiryDate                   string
+		PurchaseDate                 string
+		EffectiveDateTime            time.Time
+		InstanceFlexibility          string
+		Utilization                  struct {
+			Trend      string
+			Aggregates []struct {
+				Grain     float64
+				GrainUnit string
+				Value     float64
+				ValueUnit string
+			}
+		}
+		BillingPlan    string
+		BillingScopeId string
+	}
+}
+
+func (client *SAzureClient) ListReservations() ([]SReservation, error) {
+	result := []SReservation{}
+	resp, err := client.list_v2("/providers/Microsoft.Capacity/reservations", "2022-11-01", nil)
+	if err != nil {
+		return nil, err
+	}
+	err = resp.Unmarshal(&result, "value")
+	if err != nil {
+		return nil, err
+	}
+	return result, nil
+}

pkg/multicloud/azure/shell/reservation.go

@@ -0,0 +1,46 @@
+// Copyright 2019 Yunion
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package shell
+
+import (
+	"yunion.io/x/pkg/util/shellutils"
+
+	"yunion.io/x/cloudmux/pkg/multicloud/azure"
+)
+
+func init() {
+	type ReservationOrderListOptions struct {
+	}
+	shellutils.R(&ReservationOrderListOptions{}, "reservation-order-list", "List reservation orders", func(cli *azure.SRegion, args *ReservationOrderListOptions) error {
+		ret, err := cli.GetClient().ListReservationOrders()
+		if err != nil {
+			return err
+		}
+		printList(ret, len(ret), 0, 0, []string{})
+		return nil
+	})
+
+	type ReservationListOptions struct {
+	}
+	shellutils.R(&ReservationListOptions{}, "reservation-list", "List reservations", func(cli *azure.SRegion, args *ReservationListOptions) error {
+		ret, err := cli.GetClient().ListReservations()
+		if err != nil {
+			return err
+		}
+		printList(ret, len(ret), 0, 0, []string{})
+		return nil
+	})
+
+}