From 4a7af87984a04c61cd2e67f4178c1bcda3409405 Mon Sep 17 00:00:00 2001
From: Wojciech Tyczynski <wojtekt@google.com>
Date: Tue, 1 Mar 2016 11:53:06 +0100
Subject: [PATCH] Set requests in scalability tests

---
 pkg/kubelet/cadvisor/cadvisor_fake.go |  7 ++++++-
 test/e2e/density.go                   |  2 ++
 test/e2e/load.go                      | 16 +++++++++-------
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkg/kubelet/cadvisor/cadvisor_fake.go b/pkg/kubelet/cadvisor/cadvisor_fake.go
index 780147f932c..d5b51476560 100644
--- a/pkg/kubelet/cadvisor/cadvisor_fake.go
+++ b/pkg/kubelet/cadvisor/cadvisor_fake.go
@@ -49,7 +49,12 @@ func (c *Fake) DockerContainer(name string, req *cadvisorapi.ContainerInfoReques
 }
 
 func (c *Fake) MachineInfo() (*cadvisorapi.MachineInfo, error) {
-	return new(cadvisorapi.MachineInfo), nil
+	// Simulate a matchin with 1 core and 3.75GB of memory.
+	// We set it to non-zero values to make non-zero-capacity machines in Kubemark.
+	return &cadvisorapi.MachineInfo{
+		NumCores:       1,
+		MemoryCapacity: 4026531840,
+	}, nil
 }
 
 func (c *Fake) VersionInfo() (*cadvisorapi.VersionInfo, error) {
diff --git a/test/e2e/density.go b/test/e2e/density.go
index 738824b7348..00f8334ae76 100644
--- a/test/e2e/density.go
+++ b/test/e2e/density.go
@@ -218,6 +218,8 @@ var _ = Describe("Density", func() {
 				PollInterval:         itArg.interval,
 				PodStatusFile:        fileHndl,
 				Replicas:             totalPods,
+				CpuRequest:           20,       // 0.02 core
+				MemRequest:           52428800, // 50MB
 				MaxContainerFailures: &MaxContainerFailures,
 			}
 
diff --git a/test/e2e/load.go b/test/e2e/load.go
index b1dcb28758b..55e760720e8 100644
--- a/test/e2e/load.go
+++ b/test/e2e/load.go
@@ -183,13 +183,15 @@ func generateRCConfigsForGroup(c *client.Client, ns, groupName string, size, cou
 	configs := make([]*RCConfig, 0, count)
 	for i := 1; i <= count; i++ {
 		config := &RCConfig{
-			Client:    c,
-			Name:      groupName + "-" + strconv.Itoa(i),
-			Namespace: ns,
-			Timeout:   10 * time.Minute,
-			Image:     image,
-			Command:   command,
-			Replicas:  size,
+			Client:     c,
+			Name:       groupName + "-" + strconv.Itoa(i),
+			Namespace:  ns,
+			Timeout:    10 * time.Minute,
+			Image:      image,
+			Command:    command,
+			Replicas:   size,
+			CpuRequest: 20,       // 0.02 core
+			MemRequest: 52428800, // 50MB
 		}
 		configs = append(configs, config)
 	}