describe nodes improvements

This commit is contained in:
derekwaynecarr
2015-07-30 17:33:48 -04:00
parent 8535f13a2b
commit 9cdeb4cb20
2 changed files with 63 additions and 56 deletions

View File

@@ -359,53 +359,55 @@ func TestDefaultDescribers(t *testing.T) {
func TestGetPodsTotalRequests(t *testing.T) {
testCases := []struct {
pods []*api.Pod
pods *api.PodList
expectedReqs, expectedLimits map[api.ResourceName]resource.Quantity
}{
{
pods: []*api.Pod{
{
Spec: api.PodSpec{
Containers: []api.Container{
{
Resources: api.ResourceRequirements{
Requests: api.ResourceList{
api.ResourceName(api.ResourceCPU): resource.MustParse("1"),
api.ResourceName(api.ResourceMemory): resource.MustParse("300Mi"),
api.ResourceName(api.ResourceStorage): resource.MustParse("1G"),
pods: &api.PodList{
Items: []api.Pod{
{
Spec: api.PodSpec{
Containers: []api.Container{
{
Resources: api.ResourceRequirements{
Requests: api.ResourceList{
api.ResourceName(api.ResourceCPU): resource.MustParse("1"),
api.ResourceName(api.ResourceMemory): resource.MustParse("300Mi"),
api.ResourceName(api.ResourceStorage): resource.MustParse("1G"),
},
},
},
},
{
Resources: api.ResourceRequirements{
Requests: api.ResourceList{
api.ResourceName(api.ResourceCPU): resource.MustParse("90m"),
api.ResourceName(api.ResourceMemory): resource.MustParse("120Mi"),
api.ResourceName(api.ResourceStorage): resource.MustParse("200M"),
{
Resources: api.ResourceRequirements{
Requests: api.ResourceList{
api.ResourceName(api.ResourceCPU): resource.MustParse("90m"),
api.ResourceName(api.ResourceMemory): resource.MustParse("120Mi"),
api.ResourceName(api.ResourceStorage): resource.MustParse("200M"),
},
},
},
},
},
},
},
{
Spec: api.PodSpec{
Containers: []api.Container{
{
Resources: api.ResourceRequirements{
Requests: api.ResourceList{
api.ResourceName(api.ResourceCPU): resource.MustParse("60m"),
api.ResourceName(api.ResourceMemory): resource.MustParse("43Mi"),
api.ResourceName(api.ResourceStorage): resource.MustParse("500M"),
{
Spec: api.PodSpec{
Containers: []api.Container{
{
Resources: api.ResourceRequirements{
Requests: api.ResourceList{
api.ResourceName(api.ResourceCPU): resource.MustParse("60m"),
api.ResourceName(api.ResourceMemory): resource.MustParse("43Mi"),
api.ResourceName(api.ResourceStorage): resource.MustParse("500M"),
},
},
},
},
{
Resources: api.ResourceRequirements{
Requests: api.ResourceList{
api.ResourceName(api.ResourceCPU): resource.MustParse("34m"),
api.ResourceName(api.ResourceMemory): resource.MustParse("83Mi"),
api.ResourceName(api.ResourceStorage): resource.MustParse("700M"),
{
Resources: api.ResourceRequirements{
Requests: api.ResourceList{
api.ResourceName(api.ResourceCPU): resource.MustParse("34m"),
api.ResourceName(api.ResourceMemory): resource.MustParse("83Mi"),
api.ResourceName(api.ResourceStorage): resource.MustParse("700M"),
},
},
},
},