fix(serializing): corrected mapstructure metadata

Author: dudymas

openstack/telemetry/v2/meters/fixtures.go

@@ -4,7 +4,6 @@ package meters
 
 import (
 	"fmt"
-	"log"
 	"net/http"
 	"testing"
 
@@ -16,7 +15,7 @@ import (
 const MeterListBody = `
 [
     {
-        "meter_id": "YmQ5NDMxYzEtOGQ2OS00YWQzLTgwM2EtOGQ0YTZiODlmZDM2K2luc3RhbmNl\n",
+        "meter_id": "YmQ5NDMxYzEtOGQ2OS00YWQzLTgwM2EtOGQ0YTZiODlmZDM2K2luc3RhbmNl",
         "name": "instance",
         "project_id": "35b17138-b364-4e6a-a131-8f3099c5be68",
         "resource_id": "bd9431c1-8d69-4ad3-803a-8d4a6b89fd36",
@@ -30,10 +29,10 @@ const MeterListBody = `
 		"name": "cpu_util",
 		"resource_id": "5b88239b-8ba1-44ff-a154-978cbda23479",
 		"source": "region2",
-		"meter_id": "NWI4ODIzOWAtOGJhMS00NGZhLWExNTQtOTc4Y2JkYTIzNDc5K2NwdV91dGls\n",
+		"meter_id": "NWI4ODIzOWAtOGJhMS00NGZhLWExNTQtOTc4Y2JkYTIzNDc5K2NwdV91dGls",
 		"project_id": "69e6e7c4ed8b434e92feacbf3d4891fd",
 		"type": "gauge",
-		"unit": "%"
+		"unit": "%%"
 	}
 ]
 `
@@ -90,7 +89,7 @@ const MeterStatisticsBody = `
         "period_start": "2015-07-17T16:43:31",
         "avg": 1.5856751105737468,
         "groupby": null,
-        "unit": "%"
+        "unit": "%%"
     }
 ]
 `
@@ -136,7 +135,7 @@ var (
 		Unit:          "GiB",
 	}
 
-	// StatisticsDerp is a MeterStatisticsResult struct that should correspond to the first result in *[]MeterStatisticsResult.
+	// StatisticsDerp is a MeterStatisticsResult struct that should correspond to the second result in *[]MeterStatisticsResult.
 	StatisticsDerp = MeterStatisticsResult{
 		Avg:           1.5856751105737468,
 		Count:         28162,
@@ -186,6 +185,5 @@ func HandleMeterStatisticsSuccessfully(t *testing.T) {
 		w.Header().Add("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 		fmt.Fprintf(w, MeterStatisticsBody)
-		log.Printf("%s\n", MeterStatisticsBody)
 	})
 }

openstack/telemetry/v2/meters/requests.go

@@ -1,9 +1,6 @@
 package meters
 
 import (
-	"fmt"
-	"net/http"
-
 	"github.com/rackspace/gophercloud"
 )
 
@@ -90,8 +87,6 @@ func MeterStatistics(client *gophercloud.ServiceClient, n string, opts MeterStat
 		url += query
 	}
 
-	var b *http.Response
-	b, res.Err = client.Get(url, &res.Body, &gophercloud.RequestOpts{})
-	fmt.Printf("%+v\n%+v\n", res, b)
+	_, res.Err = client.Get(url, &res.Body, &gophercloud.RequestOpts{})
 	return res
 }

openstack/telemetry/v2/meters/results.go

@@ -8,14 +8,14 @@ import (
 )
 
 type MeterListResult struct {
-	MeterId    string `json:"meter_id"`
+	MeterId    string `mapstructure:"meter_id"`
 	Name       string `json:"name"`
-	ProjectId  string `json:"project_id"`
-	ResourceId string `json:"resource_id"`
+	ProjectId  string `mapstructure:"project_id"`
+	ResourceId string `mapstructure:"resource_id"`
 	Source     string `json:"source"`
 	Type       string `json:"type"`
 	Unit       string `json:"user"`
-	UserId     string `json:"user_id"`
+	UserId     string `mapstructure:"user_id"`
 }
 
 type listResult struct {
@@ -51,13 +51,13 @@ type MeterStatisticsResult struct {
 	Avg           float32 `json:"avg"`
 	Count         int     `json:"count"`
 	Duration      float32 `json:"duration"`
-	DurationEnd   string  `json:"duration_end"`
-	DurationStart string  `json:"duration_start"`
+	DurationEnd   string  `mapstructure:"duration_end"`
+	DurationStart string  `mapstructure:"duration_start"`
 	Max           float32 `json:"max"`
 	Min           float32 `json:"min"`
 	Period        int     `json:"user_id"`
-	PeriodEnd     string  `json:"period_end"`
-	PeriodStart   string  `json:"period_start"`
+	PeriodEnd     string  `mapstructure:"period_end"`
+	PeriodStart   string  `mapstructure:"period_start"`
 	Sum           float32 `json:"sum"`
 	Unit          string  `json:"unit"`
 }