From 082da18e8a96f1df73cc9b951bae9370dd331bb6 Mon Sep 17 00:00:00 2001
From: Yu-Ju Hong <yjhong@google.com>
Date: Fri, 12 Feb 2016 13:19:12 -0800
Subject: [PATCH] e2e: change memory fields to use unit64

---
 test/e2e/kubelet_stats.go           | 20 ++++++++++----------
 test/e2e/resource_usage_gatherer.go | 12 ++++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/test/e2e/kubelet_stats.go b/test/e2e/kubelet_stats.go
index 97d32a2705..b46937d24d 100644
--- a/test/e2e/kubelet_stats.go
+++ b/test/e2e/kubelet_stats.go
@@ -197,8 +197,8 @@ type containerResourceUsage struct {
 	Name                    string
 	Timestamp               time.Time
 	CPUUsageInCores         float64
-	MemoryUsageInBytes      int64
-	MemoryWorkingSetInBytes int64
+	MemoryUsageInBytes      uint64
+	MemoryWorkingSetInBytes uint64
 	MemoryRSSInBytes        uint64
 	// The interval used to calculate CPUUsageInCores.
 	CPUInterval time.Duration
@@ -303,16 +303,16 @@ func formatResourceUsageStats(nodeName string, containerStats resourceUsagePerCo
 	return fmt.Sprintf("Resource usage on node %q:\n%s", nodeName, buf.String())
 }
 
-type int64arr []int64
+type uint64arr []uint64
 
-func (a int64arr) Len() int           { return len(a) }
-func (a int64arr) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a int64arr) Less(i, j int) bool { return a[i] < a[j] }
+func (a uint64arr) Len() int           { return len(a) }
+func (a uint64arr) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
+func (a uint64arr) Less(i, j int) bool { return a[i] < a[j] }
 
 type usageDataPerContainer struct {
 	cpuData        []float64
-	memUseData     []int64
-	memWorkSetData []int64
+	memUseData     []uint64
+	memWorkSetData []uint64
 }
 
 // Performs a get on a node proxy endpoint given the nodename and rest client.
@@ -365,8 +365,8 @@ func computeContainerResourceUsage(name string, oldStats, newStats *cadvisorapi.
 		Name:                    name,
 		Timestamp:               newStats.Timestamp,
 		CPUUsageInCores:         float64(newStats.Cpu.Usage.Total-oldStats.Cpu.Usage.Total) / float64(newStats.Timestamp.Sub(oldStats.Timestamp).Nanoseconds()),
-		MemoryUsageInBytes:      int64(newStats.Memory.Usage),
-		MemoryWorkingSetInBytes: int64(newStats.Memory.WorkingSet),
+		MemoryUsageInBytes:      newStats.Memory.Usage,
+		MemoryWorkingSetInBytes: newStats.Memory.WorkingSet,
 		MemoryRSSInBytes:        newStats.Memory.RSS,
 		CPUInterval:             newStats.Timestamp.Sub(oldStats.Timestamp),
 	}
diff --git a/test/e2e/resource_usage_gatherer.go b/test/e2e/resource_usage_gatherer.go
index 09ee5252a3..1ea8817202 100644
--- a/test/e2e/resource_usage_gatherer.go
+++ b/test/e2e/resource_usage_gatherer.go
@@ -38,7 +38,7 @@ const (
 
 type resourceConstraint struct {
 	cpuConstraint    float64
-	memoryConstraint int64
+	memoryConstraint uint64
 }
 
 type containerResourceGatherer struct {
@@ -51,7 +51,7 @@ type containerResourceGatherer struct {
 type SingleContainerSummary struct {
 	Name string
 	Cpu  float64
-	Mem  int64
+	Mem  uint64
 }
 
 // we can't have int here, as JSON does not accept integer keys.
@@ -165,8 +165,8 @@ func (g *containerResourceGatherer) computePercentiles(timeSeries map[time.Time]
 			if dataMap[name] == nil {
 				dataMap[name] = &usageDataPerContainer{
 					cpuData:        make([]float64, len(timeSeries)),
-					memUseData:     make([]int64, len(timeSeries)),
-					memWorkSetData: make([]int64, len(timeSeries)),
+					memUseData:     make([]uint64, len(timeSeries)),
+					memWorkSetData: make([]uint64, len(timeSeries)),
 				}
 			}
 			dataMap[name].cpuData = append(dataMap[name].cpuData, data.CPUUsageInCores)
@@ -176,8 +176,8 @@ func (g *containerResourceGatherer) computePercentiles(timeSeries map[time.Time]
 	}
 	for _, v := range dataMap {
 		sort.Float64s(v.cpuData)
-		sort.Sort(int64arr(v.memUseData))
-		sort.Sort(int64arr(v.memWorkSetData))
+		sort.Sort(uint64arr(v.memUseData))
+		sort.Sort(uint64arr(v.memWorkSetData))
 	}
 
 	result := make(map[int]resourceUsagePerContainer)