add netpoolsize to tests

Signed-off-by: Amory Hoste <[email protected]>

Author: amohoste

ctriface/bench_test.go

@@ -56,7 +56,7 @@ func TestBenchmarkStart(t *testing.T) {
 	ctx, cancel := context.WithTimeout(namespaces.WithNamespace(context.Background(), namespaceName), testTimeout)
 	defer cancel()
 
-	orch := NewOrchestrator("devmapper", "", WithTestModeOn(true), WithUPF(*isUPFEnabled))
+	orch := NewOrchestrator("devmapper", "", 10, WithTestModeOn(true), WithUPF(*isUPFEnabled))
 
 	images := getAllImages()
 	benchCount := 10

ctriface/failing_test.go

@@ -51,7 +51,7 @@ func TestStartSnapStop(t *testing.T) {
 	ctx, cancel := context.WithTimeout(namespaces.WithNamespace(context.Background(), namespaceName), testTimeout)
 	defer cancel()
 
-	orch := NewOrchestrator("devmapper", "", WithTestModeOn(true))
+	orch := NewOrchestrator("devmapper", "", 10, WithTestModeOn(true))
 
 	vmID := "2"
 

ctriface/iface_test.go

@@ -62,6 +62,7 @@ func TestPauseSnapResume(t *testing.T) {
 	orch := NewOrchestrator(
 		"devmapper",
 		"",
+		10,
 		WithTestModeOn(true),
 		WithUPF(*isUPFEnabled),
 		WithLazyMode(*isLazyMode),
@@ -105,6 +106,7 @@ func TestStartStopSerial(t *testing.T) {
 	orch := NewOrchestrator(
 		"devmapper",
 		"",
+		10,
 		WithTestModeOn(true),
 		WithUPF(*isUPFEnabled),
 		WithLazyMode(*isLazyMode),
@@ -139,6 +141,7 @@ func TestPauseResumeSerial(t *testing.T) {
 	orch := NewOrchestrator(
 		"devmapper",
 		"",
+		10,
 		WithTestModeOn(true),
 		WithUPF(*isUPFEnabled),
 		WithLazyMode(*isLazyMode),
@@ -180,6 +183,7 @@ func TestStartStopParallel(t *testing.T) {
 	orch := NewOrchestrator(
 		"devmapper",
 		"",
+		10,
 		WithTestModeOn(true),
 		WithUPF(*isUPFEnabled),
 		WithLazyMode(*isLazyMode),
@@ -239,6 +243,7 @@ func TestPauseResumeParallel(t *testing.T) {
 	orch := NewOrchestrator(
 		"devmapper",
 		"",
+		10,
 		WithTestModeOn(true),
 		WithUPF(*isUPFEnabled),
 		WithLazyMode(*isLazyMode),

ctriface/manual_cleanup_test.go

@@ -56,6 +56,7 @@ func TestSnapLoad(t *testing.T) {
 	orch := NewOrchestrator(
 		"devmapper",
 		"",
+		10,
 		WithTestModeOn(true),
 		WithUPF(*isUPFEnabled),
 		WithLazyMode(*isLazyMode),
@@ -106,6 +107,7 @@ func TestSnapLoadMultiple(t *testing.T) {
 	orch := NewOrchestrator(
 		"devmapper",
 		"",
+		10,
 		WithTestModeOn(true),
 		WithUPF(*isUPFEnabled),
 		WithLazyMode(*isLazyMode),
@@ -168,6 +170,7 @@ func TestParallelSnapLoad(t *testing.T) {
 	orch := NewOrchestrator(
 		"devmapper",
 		"",
+		10,
 		WithTestModeOn(true),
 		WithUPF(*isUPFEnabled),
 		WithLazyMode(*isLazyMode),
@@ -230,6 +233,7 @@ func TestParallelPhasedSnapLoad(t *testing.T) {
 	orch := NewOrchestrator(
 		"devmapper",
 		"",
+		10,
 		WithTestModeOn(true),
 		WithUPF(*isUPFEnabled),
 		WithLazyMode(*isLazyMode),

ctriface/orch.go

@@ -156,7 +156,7 @@ func (o *Orchestrator) setupCloseHandler() {
 // Cleanup Removes the bridges created by the VM pool's tap manager
 // Cleans up snapshots directory
 func (o *Orchestrator) Cleanup() {
-	o.vmPool.RemoveBridges()
+	o.vmPool.CleanupNetwork()
 	if err := os.RemoveAll(o.snapshotsDir); err != nil {
 		log.Panic("failed to delete snapshots dir", err)
 	}