Update names per PR comments

Author: carlpett

openstack/telemetry/v2/meters/fixtures.go

@@ -95,8 +95,8 @@ const MeterStatisticsBody = `
 `
 
 var (
-	// MeterHerp is a MeterListResult struct that should correspond to the first result in *[]MeterListResult.
-	MeterHerp = MeterListResult{
+	// MeterHerp is a Meter struct that should correspond to the first result in *[]Meter.
+	MeterHerp = Meter{
 		MeterId:    "YmQ5NDMxYzEtOGQ2OS00YWQzLTgwM2EtOGQ0YTZiODlmZDM2K2luc3RhbmNl",
 		Name:       "instance",
 		ProjectId:  "35b17138-b364-4e6a-a131-8f3099c5be68",
@@ -107,8 +107,8 @@ var (
 		UserId:     "efd87807-12d2-4b38-9c70-5f5c2ac427ff",
 	}
 
-	// MeterDerp is a MeterListResult struct that should correspond to the second result in *[]MeterListResult.
-	MeterDerp = MeterListResult{
+	// MeterDerp is a Meter struct that should correspond to the second result in *[]Meter.
+	MeterDerp = Meter{
 		MeterId:    "NWI4ODIzOWAtOGJhMS00NGZhLWExNTQtOTc4Y2JkYTIzNDc5K2NwdV91dGls",
 		Name:       "cpu_util",
 		ProjectId:  "69e6e7c4ed8b434e92feacbf3d4891fd",
@@ -119,8 +119,8 @@ var (
 		UserId:     "7ya0f7a33717400b951037d55b929c53",
 	}
 
-	// StatisticsHerp is a MeterStatisticsResult struct that should correspond to the first result in *[]MeterStatisticsResult.
-	StatisticsHerp = MeterStatisticsResult{
+	// StatisticsHerp is a Statistics struct that should correspond to the first result in *[]Statistics.
+	StatisticsHerp = Statistics{
 		Avg:           4.5,
 		Count:         10,
 		Duration:      300.0,
@@ -135,8 +135,8 @@ var (
 		Unit:          "GiB",
 	}
 
-	// StatisticsDerp is a MeterStatisticsResult struct that should correspond to the second result in *[]MeterStatisticsResult.
-	StatisticsDerp = MeterStatisticsResult{
+	// StatisticsDerp is a Statistics struct that should correspond to the second result in *[]Statistics.
+	StatisticsDerp = Statistics{
 		Avg:           1.5856751105737468,
 		Count:         28162,
 		Duration:      2591694.0,

openstack/telemetry/v2/meters/requests.go

@@ -16,7 +16,7 @@ type ListOptsBuilder interface {
 type ListOpts struct {
 }
 
-// ToServerListQuery formats a ListOpts into a query string.
+// ToMeterListQuery formats a ListOpts into a query string.
 func (opts ListOpts) ToMeterListQuery() (string, error) {
 	q, err := gophercloud.BuildQueryString(opts)
 	if err != nil {
@@ -26,8 +26,8 @@ func (opts ListOpts) ToMeterListQuery() (string, error) {
 }
 
 // List makes a request against the API to list meters accessible to you.
-func List(client *gophercloud.ServiceClient, opts ListOptsBuilder) listResult {
-	var res listResult
+func List(client *gophercloud.ServiceClient, opts ListOptsBuilder) ListResult {
+	var res ListResult
 	url := listURL(client)
 
 	if opts != nil {
@@ -74,8 +74,8 @@ func (opts MeterStatisticsOpts) ToMeterStatisticsQuery() (string, error) {
 }
 
 // List makes a request against the API to list meters accessible to you.
-func MeterStatistics(client *gophercloud.ServiceClient, n string, opts MeterStatisticsOptsBuilder) statisticsResult {
-	var res statisticsResult
+func MeterStatistics(client *gophercloud.ServiceClient, n string, opts MeterStatisticsOptsBuilder) StatisticsResult {
+	var res StatisticsResult
 	url := statisticsURL(client, n)
 
 	if opts != nil {

openstack/telemetry/v2/meters/results.go

@@ -7,7 +7,7 @@ import (
 	"github.com/rackspace/gophercloud"
 )
 
-type MeterListResult struct {
+type Meter struct {
 	MeterId    string `mapstructure:"meter_id"`
 	Name       string `json:"name"`
 	ProjectId  string `mapstructure:"project_id"`
@@ -18,17 +18,17 @@ type MeterListResult struct {
 	UserId     string `mapstructure:"user_id"`
 }
 
-type listResult struct {
+type ListResult struct {
 	gophercloud.Result
 }
 
-// Extract interprets any listResult as an array of MeterListResult
-func (r listResult) Extract() ([]MeterListResult, error) {
+// Extract interprets any ListResult as an array of Meter
+func (r ListResult) Extract() ([]Meter, error) {
 	if r.Err != nil {
 		return nil, r.Err
 	}
 
-	var response []MeterListResult
+	var response []Meter
 
 	config := &mapstructure.DecoderConfig{
 		DecodeHook: toMapFromString,
@@ -47,7 +47,7 @@ func (r listResult) Extract() ([]MeterListResult, error) {
 	return response, nil
 }
 
-type MeterStatisticsResult struct {
+type Statistics struct {
 	Avg           float32 `json:"avg"`
 	Count         int     `json:"count"`
 	Duration      float32 `json:"duration"`
@@ -62,17 +62,17 @@ type MeterStatisticsResult struct {
 	Unit          string  `json:"unit"`
 }
 
-type statisticsResult struct {
+type StatisticsResult struct {
 	gophercloud.Result
 }
 
 // Extract interprets any serverResult as a Server, if possible.
-func (r statisticsResult) Extract() ([]MeterStatisticsResult, error) {
+func (r StatisticsResult) Extract() ([]Statistics, error) {
 	if r.Err != nil {
 		return nil, r.Err
 	}
 
-	var response []MeterStatisticsResult
+	var response []Statistics
 
 	config := &mapstructure.DecoderConfig{
 		DecodeHook: toMapFromString,