1 files changed, 102 insertions, 0 deletions
diff --git a/extras/hs-test/vcl_test.go b/extras/hs-test/vcl_test.go
index 8c4afe8fe30..96ca7f64823 100755
--- a/extras/hs-test/vcl_test.go
+++ b/extras/hs-test/vcl_test.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"fmt"
+	"time"
 
 	"github.com/edwarnicke/exechelper"
 )
@@ -84,3 +85,104 @@ func (s *Veths2Suite) testVclEcho(proto string) {
 	}
 	fmt.Println(o)
 }
+
+func (s *Veths2Suite) TestVclRetryAttach() {
+	s.testRetryAttach("tcp")
+}
+
+func (s *Veths2Suite) testRetryAttach(proto string) {
+	t := s.T()
+
+	exechelper.Run("docker volume create --name=echo-srv-vol")
+	exechelper.Run("docker volume create --name=echo-cln-vol")
+
+	srvInstance := "vpp-vcl-test-srv"
+	clnInstance := "vpp-vcl-test-cln"
+	echoSrv := "echo-srv"
+	echoCln := "echo-cln"
+
+	err := dockerRun(srvInstance, "-v echo-srv-vol:/tmp/2veths")
+	if err != nil {
+		t.Errorf("%v", err)
+		return
+	}
+	defer func() { exechelper.Run("docker stop " + srvInstance) }()
+
+	err = dockerRun(clnInstance, "-v echo-cln-vol:/tmp/2veths")
+	if err != nil {
+		t.Errorf("%v", err)
+		return
+	}
+	defer func() { exechelper.Run("docker stop " + clnInstance) }()
+
+	err = dockerRun(echoSrv, fmt.Sprintf("-v echo-srv-vol:/tmp/%s", echoSrv))
+	if err != nil {
+		t.Errorf("%v", err)
+		return
+	}
+	defer func() { exechelper.Run("docker stop " + echoSrv) }()
+
+	err = dockerRun(echoCln, fmt.Sprintf("-v echo-cln-vol:/tmp/%s", echoCln))
+	if err != nil {
+		t.Errorf("%v", err)
+		return
+	}
+	defer func() { exechelper.Run("docker stop " + echoCln) }()
+
+	_, err = hstExec("2veths srv-with-preset-hw-addr", srvInstance)
+	if err != nil {
+		t.Errorf("%v", err)
+		return
+	}
+
+	_, err = hstExec("2veths cln", clnInstance)
+	if err != nil {
+		t.Errorf("%v", err)
+		return
+	}
+
+	_, err = hstExec("vcl-test-server "+proto, echoSrv)
+	if err != nil {
+		t.Errorf("vcl test server: %v", err)
+		return
+	}
+
+	fmt.Println("This whole test case can take around 3 minutes to run. Please be patient.")
+	fmt.Println("... Running first echo client test, before disconnect.")
+	_, err = hstExec("vcl-test-client "+proto, echoCln)
+	if err != nil {
+		t.Errorf("vcl test client: %v", err)
+		return
+	}
+	fmt.Println("... First test ended. Stopping VPP server now.")
+
+	// Stop server-vpp-instance, start it again and then run vcl-test-client once more
+	stopVppCommand := "/bin/bash -c 'ps -C vpp_main -o pid= | xargs kill -9'"
+	_, err = dockerExec(stopVppCommand, srvInstance)
+	if err != nil {
+		t.Errorf("error while stopping vpp: %v", err)
+		return
+	}
+	time.Sleep(5 * time.Second) // Give parent process time to reap the killed child process
+	stopVppCommand = "/bin/bash -c 'ps -C hs-test -o pid= | xargs kill -9'"
+	_, err = dockerExec(stopVppCommand, srvInstance)
+	if err != nil {
+		t.Errorf("error while stopping hs-test: %v", err)
+		return
+	}
+	_, err = hstExec("2veths srv-with-preset-hw-addr", srvInstance)
+	if err != nil {
+		t.Errorf("%v", err)
+		return
+	}
+
+	fmt.Println("... VPP server is starting again, so waiting for a bit.")
+	time.Sleep(30 * time.Second) // Wait a moment for the re-attachment to happen
+
+	fmt.Println("... Running second echo client test, after disconnect and re-attachment.")
+	_, err = hstExec("vcl-test-client "+proto, echoCln)
+	if err != nil {
+		t.Errorf("vcl test client: %v", err)
+	}
+	fmt.Println("Done.")
+}