From e759e49720156d16796519fad5389783484e1373 Mon Sep 17 00:00:00 2001
From: TommyLike <ytommylikehu@gmail.com>
Date: Thu, 19 Sep 2019 17:29:10 +0800
Subject: [PATCH] Fix ces

---
 openstack/ces/v1/metricdata/requests.go |  2 +-
 openstack/ces/v1/metricdata/results.go  | 16 ++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/openstack/ces/v1/metricdata/requests.go b/openstack/ces/v1/metricdata/requests.go
index 809c2d13b..0901c75cf 100644
--- a/openstack/ces/v1/metricdata/requests.go
+++ b/openstack/ces/v1/metricdata/requests.go
@@ -20,7 +20,7 @@ type Metric struct {
 	MetricName string `json:"metric_name" required:"true"`
 
 	// Specifies the list of the metric dimensions.
-	Dimensions []map[string]string `json:"dimensions" required:"true"`
+	Dimensions []Dimension `json:"dimensions" required:"true"`
 }
 
 // BatchQueryOpts represents options for batch query metric data.
diff --git a/openstack/ces/v1/metricdata/results.go b/openstack/ces/v1/metricdata/results.go
index 779db7ccb..0c0aa6c41 100644
--- a/openstack/ces/v1/metricdata/results.go
+++ b/openstack/ces/v1/metricdata/results.go
@@ -14,15 +14,23 @@ type MetricData struct {
 	MetricName string `json:"metric_name"`
 
 	//Specifies the list of the metric dimensions.
-	Dimensions []map[string]interface{} `json:"dimensions"`
-
-	// Specifies the metric data list.
-	Datapoints []map[string]interface{} `json:"datapoints"`
+	Dimensions []Dimension `json:"dimensions"`
+	Datapoints []Data      `json:"datapoints"`
 
 	// Specifies the metric unit.
 	Unit string `json:"unit"`
 }
 
+type Dimension struct {
+	Name  string `json:"name"`
+	Value string `json:"value"`
+}
+
+type Data struct {
+	Average   float64 `json:"average"`
+	Timestamp int     `json:"timestamp"`
+}
+
 type MetricDatasResult struct {
 	golangsdk.Result
 }