mirror of
				https://github.com/optim-enterprises-bv/kubernetes.git
				synced 2025-11-03 19:58:17 +00:00 
			
		
		
		
	cadvisor_provider, unit tests: ensure container-level metrics are collected
Signed-off-by: Itamar Holder <iholder@redhat.com>
This commit is contained in:
		@@ -313,6 +313,7 @@ func TestCadvisorListPodStats(t *testing.T) {
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
	if ps.Swap != nil {
 | 
						if ps.Swap != nil {
 | 
				
			||||||
		checkSwapStats(t, "Pod0", seedPod0Infra, infos["/pod0-i"], ps.Swap)
 | 
							checkSwapStats(t, "Pod0", seedPod0Infra, infos["/pod0-i"], ps.Swap)
 | 
				
			||||||
 | 
							checkContainersSwapStats(t, ps, infos["/pod0-c0"], infos["/pod0-c1"])
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// Validate Pod1 Results
 | 
						// Validate Pod1 Results
 | 
				
			||||||
@@ -325,6 +326,7 @@ func TestCadvisorListPodStats(t *testing.T) {
 | 
				
			|||||||
	checkMemoryStats(t, "Pod1Container0", seedPod1Container, infos["/pod1-c0"], con.Memory)
 | 
						checkMemoryStats(t, "Pod1Container0", seedPod1Container, infos["/pod1-c0"], con.Memory)
 | 
				
			||||||
	checkSwapStats(t, "Pod1Container0", seedPod1Container, infos["/pod1-c0"], con.Swap)
 | 
						checkSwapStats(t, "Pod1Container0", seedPod1Container, infos["/pod1-c0"], con.Swap)
 | 
				
			||||||
	checkNetworkStats(t, "Pod1", seedPod1Infra, ps.Network)
 | 
						checkNetworkStats(t, "Pod1", seedPod1Infra, ps.Network)
 | 
				
			||||||
 | 
						checkContainersSwapStats(t, ps, infos["/pod1-c0"])
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// Validate Pod2 Results
 | 
						// Validate Pod2 Results
 | 
				
			||||||
	ps, found = indexPods[prf2]
 | 
						ps, found = indexPods[prf2]
 | 
				
			||||||
@@ -336,6 +338,7 @@ func TestCadvisorListPodStats(t *testing.T) {
 | 
				
			|||||||
	checkMemoryStats(t, "Pod2Container0", seedPod2Container, infos["/pod2-c0"], con.Memory)
 | 
						checkMemoryStats(t, "Pod2Container0", seedPod2Container, infos["/pod2-c0"], con.Memory)
 | 
				
			||||||
	checkSwapStats(t, "Pod2Container0", seedPod2Container, infos["/pod2-c0"], con.Swap)
 | 
						checkSwapStats(t, "Pod2Container0", seedPod2Container, infos["/pod2-c0"], con.Swap)
 | 
				
			||||||
	checkNetworkStats(t, "Pod2", seedPod2Infra, ps.Network)
 | 
						checkNetworkStats(t, "Pod2", seedPod2Infra, ps.Network)
 | 
				
			||||||
 | 
						checkContainersSwapStats(t, ps, infos["/pod2-c0"])
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// Validate Pod3 Results
 | 
						// Validate Pod3 Results
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -352,6 +355,7 @@ func TestCadvisorListPodStats(t *testing.T) {
 | 
				
			|||||||
	checkCPUStats(t, "Pod3Container1", seedPod3Container1, con.CPU)
 | 
						checkCPUStats(t, "Pod3Container1", seedPod3Container1, con.CPU)
 | 
				
			||||||
	checkMemoryStats(t, "Pod3Container1", seedPod3Container1, infos["/pod3-c1"], con.Memory)
 | 
						checkMemoryStats(t, "Pod3Container1", seedPod3Container1, infos["/pod3-c1"], con.Memory)
 | 
				
			||||||
	checkSwapStats(t, "Pod3Container1", seedPod3Container1, infos["/pod3-c1"], con.Swap)
 | 
						checkSwapStats(t, "Pod3Container1", seedPod3Container1, infos["/pod3-c1"], con.Swap)
 | 
				
			||||||
 | 
						checkContainersSwapStats(t, ps, infos["/pod3-c1"])
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
func TestCadvisorListPodCPUAndMemoryStats(t *testing.T) {
 | 
					func TestCadvisorListPodCPUAndMemoryStats(t *testing.T) {
 | 
				
			||||||
@@ -495,6 +499,7 @@ func TestCadvisorListPodCPUAndMemoryStats(t *testing.T) {
 | 
				
			|||||||
	}
 | 
						}
 | 
				
			||||||
	if ps.Swap != nil {
 | 
						if ps.Swap != nil {
 | 
				
			||||||
		checkSwapStats(t, "Pod0", seedPod0Infra, infos["/pod0-i"], ps.Swap)
 | 
							checkSwapStats(t, "Pod0", seedPod0Infra, infos["/pod0-i"], ps.Swap)
 | 
				
			||||||
 | 
							checkContainersSwapStats(t, ps, infos["/pod0-c0"], infos["/pod0-c1"])
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// Validate Pod1 Results
 | 
						// Validate Pod1 Results
 | 
				
			||||||
@@ -506,6 +511,7 @@ func TestCadvisorListPodCPUAndMemoryStats(t *testing.T) {
 | 
				
			|||||||
	checkCPUStats(t, "Pod1Container0", seedPod1Container, con.CPU)
 | 
						checkCPUStats(t, "Pod1Container0", seedPod1Container, con.CPU)
 | 
				
			||||||
	checkMemoryStats(t, "Pod1Container0", seedPod1Container, infos["/pod1-c0"], con.Memory)
 | 
						checkMemoryStats(t, "Pod1Container0", seedPod1Container, infos["/pod1-c0"], con.Memory)
 | 
				
			||||||
	checkSwapStats(t, "Pod1Container0", seedPod1Container, infos["/pod1-c0"], con.Swap)
 | 
						checkSwapStats(t, "Pod1Container0", seedPod1Container, infos["/pod1-c0"], con.Swap)
 | 
				
			||||||
 | 
						checkContainersSwapStats(t, ps, infos["/pod1-c0"])
 | 
				
			||||||
	assert.Nil(t, ps.EphemeralStorage)
 | 
						assert.Nil(t, ps.EphemeralStorage)
 | 
				
			||||||
	assert.Nil(t, ps.VolumeStats)
 | 
						assert.Nil(t, ps.VolumeStats)
 | 
				
			||||||
	assert.Nil(t, ps.Network)
 | 
						assert.Nil(t, ps.Network)
 | 
				
			||||||
@@ -519,6 +525,7 @@ func TestCadvisorListPodCPUAndMemoryStats(t *testing.T) {
 | 
				
			|||||||
	checkCPUStats(t, "Pod2Container0", seedPod2Container, con.CPU)
 | 
						checkCPUStats(t, "Pod2Container0", seedPod2Container, con.CPU)
 | 
				
			||||||
	checkMemoryStats(t, "Pod2Container0", seedPod2Container, infos["/pod2-c0"], con.Memory)
 | 
						checkMemoryStats(t, "Pod2Container0", seedPod2Container, infos["/pod2-c0"], con.Memory)
 | 
				
			||||||
	checkSwapStats(t, "Pod2Container0", seedPod2Container, infos["/pod2-c0"], con.Swap)
 | 
						checkSwapStats(t, "Pod2Container0", seedPod2Container, infos["/pod2-c0"], con.Swap)
 | 
				
			||||||
 | 
						checkContainersSwapStats(t, ps, infos["/pod2-c0"])
 | 
				
			||||||
	assert.Nil(t, ps.EphemeralStorage)
 | 
						assert.Nil(t, ps.EphemeralStorage)
 | 
				
			||||||
	assert.Nil(t, ps.VolumeStats)
 | 
						assert.Nil(t, ps.VolumeStats)
 | 
				
			||||||
	assert.Nil(t, ps.Network)
 | 
						assert.Nil(t, ps.Network)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user