From f2a0365766b8f14eadad9d5749e14520a9bf9730 Mon Sep 17 00:00:00 2001
From: Nan Deng <dengnan@google.com>
Date: Tue, 8 Jul 2014 17:20:04 -0700
Subject: [PATCH] gofmt -r "CpuUsagePercentages->CpuUsagePercentiles"

---
 client/client_test.go   | 2 +-
 info/container.go       | 9 +++++----
 info/test/datagen.go    | 4 ++--
 manager/manager.go      | 2 +-
 manager/manager_test.go | 6 +++---
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/client/client_test.go b/client/client_test.go
index 62c0f8e4..32890971 100644
--- a/client/client_test.go
+++ b/client/client_test.go
@@ -95,7 +95,7 @@ func TestGetContainerInfo(t *testing.T) {
 	query := &info.ContainerInfoQuery{
 		NumStats:               3,
 		NumSamples:             2,
-		CpuUsagePercentages:    []int{10, 50, 90},
+		CpuUsagePercentiles:    []int{10, 50, 90},
 		MemoryUsagePercentages: []int{10, 80, 90},
 	}
 	containerName := "/some/container"
diff --git a/info/container.go b/info/container.go
index 55410a79..ea3ea642 100644
--- a/info/container.go
+++ b/info/container.go
@@ -58,12 +58,13 @@ type ContainerReference struct {
 	Aliases []string `json:"aliases,omitempty"`
 }
 
+// ContainerInfoQuery specifies how much data users want to get about a container
 type ContainerInfoQuery struct {
 	NumStats   int `json:"num_stats,omitempty"`
 	NumSamples int `json:"num_samples,omitempty"`
 
-	CpuUsagePercentages    []int `json:"cpu_usage_percentages,omitempty"`
-	MemoryUsagePercentages []int `json:"memory_usage_percentages,omitempty"`
+	CpuUsagePercentiles    []int `json:"cpu_usage_percentiles,omitempty"`
+	MemoryUsagePercentages []int `json:"memory_usage_percentiles,omitempty"`
 }
 
 func (self *ContainerInfoQuery) FillWithDefaultValues() *ContainerInfoQuery {
@@ -77,8 +78,8 @@ func (self *ContainerInfoQuery) FillWithDefaultValues() *ContainerInfoQuery {
 	if ret.NumSamples <= 0 {
 		ret.NumSamples = 1024
 	}
-	if len(ret.CpuUsagePercentages) == 0 {
-		ret.CpuUsagePercentages = []int{50, 80, 90, 99}
+	if len(ret.CpuUsagePercentiles) == 0 {
+		ret.CpuUsagePercentiles = []int{50, 80, 90, 99}
 	}
 	if len(ret.MemoryUsagePercentages) == 0 {
 		ret.MemoryUsagePercentages = []int{50, 80, 90, 99}
diff --git a/info/test/datagen.go b/info/test/datagen.go
index 3f6872bc..48c160b3 100644
--- a/info/test/datagen.go
+++ b/info/test/datagen.go
@@ -74,11 +74,11 @@ func GenerateRandomContainerInfo(containerName string, numCores int, query *info
 	if len(samples) > query.NumSamples {
 		samples = samples[:query.NumSamples]
 	}
-	cpuPercentiles := make([]info.Percentile, 0, len(query.CpuUsagePercentages))
+	cpuPercentiles := make([]info.Percentile, 0, len(query.CpuUsagePercentiles))
 
 	// TODO(monnand): This will generate percentiles where 50%tile data may
 	// be larger than 90%tile data.
-	for _, p := range query.CpuUsagePercentages {
+	for _, p := range query.CpuUsagePercentiles {
 		percentile := info.Percentile{p, uint64(rand.Int63n(1000))}
 		cpuPercentiles = append(cpuPercentiles, percentile)
 	}
diff --git a/manager/manager.go b/manager/manager.go
index 07f09225..8ed243ce 100644
--- a/manager/manager.go
+++ b/manager/manager.go
@@ -133,7 +133,7 @@ func (m *manager) GetContainerInfo(containerName string, query *info.ContainerIn
 	query = query.FillWithDefaultValues()
 	percentiles, err = m.storageDriver.Percentiles(
 		cinfo.Name,
-		query.CpuUsagePercentages,
+		query.CpuUsagePercentiles,
 		query.MemoryUsagePercentages,
 	)
 	if err != nil {
diff --git a/manager/manager_test.go b/manager/manager_test.go
index 48a12c5e..851acce2 100644
--- a/manager/manager_test.go
+++ b/manager/manager_test.go
@@ -80,7 +80,7 @@ func TestGetContainerInfo(t *testing.T) {
 	query := &info.ContainerInfoQuery{
 		NumStats:               256,
 		NumSamples:             128,
-		CpuUsagePercentages:    []int{10, 50, 90},
+		CpuUsagePercentiles:    []int{10, 50, 90},
 		MemoryUsagePercentages: []int{10, 80, 90},
 	}
 
@@ -104,7 +104,7 @@ func TestGetContainerInfo(t *testing.T) {
 			driver.On(
 				"Percentiles",
 				h.Name,
-				query.CpuUsagePercentages,
+				query.CpuUsagePercentiles,
 				query.MemoryUsagePercentages,
 			).Return(
 				percentiles,
@@ -192,7 +192,7 @@ func TestGetContainerInfoWithDefaultValue(t *testing.T) {
 			driver.On(
 				"Percentiles",
 				h.Name,
-				query.CpuUsagePercentages,
+				query.CpuUsagePercentiles,
 				query.MemoryUsagePercentages,
 			).Return(
 				percentiles,