[CES] Reimplement Alarm Rules v1 API

acceptance/openstack/ces/v1/alarms_test.go

@@ -12,14 +12,13 @@ func TestAlarms(t *testing.T) {
 	client, err := clients.NewCesV1Client()
 	th.AssertNoErr(t, err)
 
-	lim := 10
 	alarmsRes, err := alarms.ListAlarms(client, alarms.ListAlarmsRequest{
-		Limit: &lim,
+		Limit: 10,
 		Order: "desc",
-	}).Extract()
+	})
 
 	th.AssertNoErr(t, err)
-	th.AssertEquals(t, alarmsRes.MetaData.Count <= lim, true)
+	th.AssertEquals(t, alarmsRes.MetaData.Count <= 10, true)
 
 	f := false
 	newAlarm, err := alarms.CreateAlarm(client, alarms.CreateAlarmRequest{
@@ -43,18 +42,20 @@ func TestAlarms(t *testing.T) {
 		},
 		AlarmEnabled:       &f,
 		AlarmActionEnabled: &f,
-	}).Extract()
+	})
 	th.AssertNoErr(t, err)
 
-	err = alarms.UpdateAlarmAction(client, newAlarm.AlarmId, alarms.ModifyAlarmActionReq{
-		AlarmEnabled: true,
+	t.Cleanup(func() {
+		err = alarms.DeleteAlarm(client, newAlarm)
+		th.AssertNoErr(t, err)
 	})
-	th.AssertNoErr(t, err)
 
-	showAlarm, err := alarms.ShowAlarm(client, newAlarm.AlarmId).Extract()
+	err = alarms.UpdateAlarmAction(client, newAlarm, alarms.ModifyAlarmActionRequest{
+		AlarmEnabled: true,
+	})
 	th.AssertNoErr(t, err)
-	th.AssertEquals(t, showAlarm.MetricAlarms[0].AlarmEnabled, true)
 
-	err = alarms.DeleteAlarm(client, newAlarm.AlarmId)
+	showAlarm, err := alarms.ShowAlarm(client, newAlarm)
 	th.AssertNoErr(t, err)
+	th.AssertEquals(t, showAlarm[0].AlarmEnabled, true)
 }

openstack/ces/v1/alarms/requests.go

@@ -1,52 +1,64 @@
 package alarms
 
 import (
-	"fmt"
-
 	golangsdk "github.com/opentelekomcloud/gophertelekomcloud"
 )
 
 type ListAlarmsRequest struct {
 	// The value ranges from 1 to 100, and is 100 by default.
 	// This parameter is used to limit the number of query results.
-	Limit *int `q:"limit,omitempty"`
+	Limit int `q:"limit"`
 	// Specifies the result sorting method, which is sorted by timestamp.
 	// The default value is desc.
 	// asc: The query results are displayed in the ascending order.
 	// desc: The query results are displayed in the descending order.
-	Order string `q:"order,omitempty"`
+	Order string `q:"order"`
 	// Specifies the first queried alarm to be displayed on a page.
-	Start string `q:"start,omitempty"`
+	Start string `q:"start"`
 }
 
-func ListAlarms(client *golangsdk.ServiceClient, req ListAlarmsRequest) (r ListAlarmsResult) {
+func ListAlarms(client *golangsdk.ServiceClient, opts ListAlarmsRequest) (*ListAlarmsResponse, error) {
 	url := alarmsURL(client)
-	query, err := golangsdk.BuildQueryString(req)
+	query, err := golangsdk.BuildQueryString(opts)
 	if err != nil {
-		return
+		return nil, err
 	}
 
+	raw := golangsdk.Result{}
 	url += query.String()
-	_, r.Err = client.Get(url, &r.Body, nil)
-	r.Err = err
-	return
+
+	_, err = client.Get(url, &raw.Body, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	var s ListAlarmsResponse
+	err = raw.ExtractInto(&s)
+	return &s, err
 }
 
 // ------------------------------------------------------------------------------------------------
 
-func ShowAlarm(client *golangsdk.ServiceClient, id string) (r ShowAlarmResult) {
-	_, r.Err = client.Get(alarmIdURL(client, id), &r.Body, nil)
-	return
+func ShowAlarm(client *golangsdk.ServiceClient, id string) ([]MetricAlarms, error) {
+	raw := golangsdk.Result{}
+	_, err := client.Get(alarmIdURL(client, id), &raw.Body, nil)
+	if err != nil {
+		return nil, err
+	}
+
+	var res []MetricAlarms
+	err = raw.ExtractIntoSlicePtr(&res, "metric_alarms")
+	return res, err
 }
 
 // ------------------------------------------------------------------------------------------------
 
-type ModifyAlarmActionReq struct {
+type ModifyAlarmActionRequest struct {
 	// Specifies whether the alarm rule is enabled.
 	AlarmEnabled bool `json:"alarm_enabled"`
 }
 
-func UpdateAlarmAction(client *golangsdk.ServiceClient, id string, req ModifyAlarmActionReq) (err error) {
+func UpdateAlarmAction(client *golangsdk.ServiceClient, id string, req ModifyAlarmActionRequest) (err error) {
 	reqBody, err := golangsdk.BuildRequestBody(req, "")
 	if err != nil {
 		return
@@ -71,7 +83,6 @@ func DeleteAlarm(client *golangsdk.ServiceClient, id string) (err error) {
 
 type CreateAlarmRequest struct {
 	// Specifies the alarm rule name.
-	//
 	// Enter 1 to 128 characters. Only letters, digits, underscores (_), and hyphens (-) are allowed.
 	AlarmName string `json:"alarm_name"`
 	// Provides supplementary information about the alarm rule. Enter 0 to 256 characters.
@@ -107,14 +118,21 @@ type MetricForAlarm struct {
 	ResourceGroupId string `json:"resource_group_id,omitempty"`
 }
 
-func CreateAlarm(client *golangsdk.ServiceClient, req CreateAlarmRequest) (r CreateAlarmResult) {
-	reqBody, err := golangsdk.BuildRequestBody(req, "")
+func CreateAlarm(client *golangsdk.ServiceClient, opts CreateAlarmRequest) (string, error) {
+	reqBody, err := golangsdk.BuildRequestBody(opts, "")
 	if err != nil {
-		r.Err = fmt.Errorf("failed to create Alarm Request map: %s", err)
-		return
+		return "", err
 	}
 
-	_, err = client.Post(alarmsURL(client), reqBody, &r.Body, nil)
-	r.Err = err
-	return
+	raw := golangsdk.Result{}
+	_, err = client.Post(alarmsURL(client), reqBody, &raw.Body, nil)
+	if err != nil {
+		return "", err
+	}
+
+	var s struct {
+		AlarmId string `json:"alarm_id"`
+	}
+	err = raw.ExtractInto(&s)
+	return s.AlarmId, err
 }

openstack/ces/v1/alarms/results.go

@@ -1,11 +1,5 @@
 package alarms
 
-import (
-	"fmt"
-
-	golangsdk "github.com/opentelekomcloud/gophertelekomcloud"
-)
-
 type ListAlarmsResponse struct {
 	MetricAlarms []MetricAlarms `json:"metric_alarms,omitempty"`
 	MetaData     MetaData       `json:"meta_data,omitempty"`
@@ -60,7 +54,7 @@ type Condition struct {
 	ComparisonOperator string `json:"comparison_operator"`
 	// Specifies the number of consecutive occurrence times that the alarm policy was met.
 	// The value ranges from 1 to 5.
-	Count int32 `json:"count"`
+	Count int `json:"count"`
 	// Specifies the data rollup method. The following methods are supported:
 	//
 	// average: Cloud Eye calculates the average value of metric data within a rollup period.
@@ -92,63 +86,3 @@ type AlarmActions struct {
 	// If you set type to autoscaling, you must set notificationList to [].
 	NotificationList []string `json:"notificationList"`
 }
-
-type ListAlarmsResult struct {
-	golangsdk.Result
-}
-
-func (r ListAlarmsResult) Extract() (*ListAlarmsResponse, error) {
-	var s = ListAlarmsResponse{}
-	if r.Err != nil {
-		return nil, r.Err
-	}
-	err := r.ExtractInto(&s)
-	if err != nil {
-		return nil, fmt.Errorf("failed to extract List Alarms Response")
-	}
-	return &s, nil
-}
-
-// ------------------------------------------------------------------------------------------------
-
-type ShowAlarmResponse struct {
-	MetricAlarms []MetricAlarms `json:"metric_alarms,omitempty"`
-}
-
-type ShowAlarmResult struct {
-	golangsdk.Result
-}
-
-func (r ShowAlarmResult) Extract() (*ShowAlarmResponse, error) {
-	var s = ShowAlarmResponse{}
-	if r.Err != nil {
-		return nil, r.Err
-	}
-	err := r.ExtractInto(&s)
-	if err != nil {
-		return nil, fmt.Errorf("failed to extract Show Alarms Response")
-	}
-	return &s, nil
-}
-
-// ------------------------------------------------------------------------------------------------
-
-type CreateAlarmResponse struct {
-	AlarmId string `json:"alarm_id,omitempty"`
-}
-
-type CreateAlarmResult struct {
-	golangsdk.Result
-}
-
-func (r CreateAlarmResult) Extract() (*CreateAlarmResponse, error) {
-	var s = CreateAlarmResponse{}
-	if r.Err != nil {
-		return nil, r.Err
-	}
-	err := r.ExtractInto(&s)
-	if err != nil {
-		return nil, fmt.Errorf("failed to extract Create Alarms Response")
-	}
-	return &s, nil
-}