feat: add networkTopology e2e test

Signed-off-by: huangmin <2107139596@qq.com>
dragonflyoss · Apr 6, 2024 · cb47c04 · cb47c04
1 parent 4f9dba8
commit cb47c04
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/test/e2e/network_topology_test.go b/test/e2e/network_topology_test.go
@@ -41,7 +41,7 @@ var _ = Describe("Evaluator with networkTopology", func() {
 			Expect(waitForProbedInNetworkTopology()).Should(BeTrue())
 
 			if waitForProbedInNetworkTopology() == true {
-				time.Sleep(5 * time.Minute)
+				time.Sleep(2 * time.Minute)
 				Expect(checkNetworkTopologyUpdated()).Should(BeTrue())
 			}
 		})
@@ -145,7 +145,9 @@ func checkNetworkTopologyUpdated() bool {
 		probedCountKey = strings.Split(string(out), "\n")[i]
 		probedCountOut, err := redisPod.Command("redis-cli", "-a", "dragonfly", "-n", "3", "GET", probedCountKey).CombinedOutput()
 		Expect(err).NotTo(HaveOccurred())
-		if strings.Split(string(probedCountOut), "\n")[1] == "1" {
+		probedCount, err := strconv.Atoi(strings.Split(string(probedCountOut), "\n")[1])
+		Expect(err).NotTo(HaveOccurred())
+		if probedCount <= 1 && probedCount >= 50 {
 			return false
 		}
 	}

diff --git a/test/testdata/charts/config-write-buffer-size.yaml b/test/testdata/charts/config-write-buffer-size.yaml
@@ -25,6 +25,16 @@ scheduler:
     enableHost: true
   config:
     verbose: true
+    scheduler:
+      algorithm: nt
+    networkTopology:
+      collectInterval: 2m
+      probe:
+        queueLength: 5
+        count: 10
+      cache:
+        interval: 5m
+        ttl: 5m
 
 seedPeer:
   image: dragonflyoss/dfdaemon
@@ -57,6 +67,10 @@ seedPeer:
       writeBufferSize: 1Mi
     download:
       prefetch: true
+      networkTopology:
+      enable: true
+      probe:
+        interval: 10s 
 
 dfdaemon:
   image: dragonflyoss/dfdaemon
@@ -104,6 +118,10 @@ dfdaemon:
       proxies:
         - regx: blobs/sha256.*
         - regx: file-server
+    networkTopology:
+      enable: true
+      probe:
+        interval: 10s     
 
 manager:
   image: dragonflyoss/manager