X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fhs-test%2Fvcl_test.go;h=109b242ee7957ef9555dd5bec731d335f8c77bdf;hb=5c476e7ac;hp=f699a65295c0cead419e9265b97e046efbd51ce3;hpb=1a9dc75fe8099fdde9b1dd248a8fca35b001f9fc;p=vpp.git diff --git a/extras/hs-test/vcl_test.go b/extras/hs-test/vcl_test.go old mode 100755 new mode 100644 index f699a65295c..109b242ee79 --- a/extras/hs-test/vcl_test.go +++ b/extras/hs-test/vcl_test.go @@ -3,187 +3,110 @@ package main import ( "fmt" "time" - - "github.com/edwarnicke/exechelper" ) -func (s *Veths2Suite) TestVclEchoQuic() { - s.T().Skip("quic test skipping..") - s.testVclEcho("quic") -} +func (s *VethsSuite) testVclEcho(proto string) { + port := "12345" + srvVppCont := s.getContainerByName("server-vpp") + srvAppCont := s.getContainerByName("server-app") -func (s *Veths2Suite) TestVclEchoUdp() { - s.T().Skip("udp echo currently broken in vpp, skipping..") - s.testVclEcho("udp") + serverVclConfContent := fmt.Sprintf(vclTemplate, srvVppCont.getContainerWorkDir(), "1") + srvAppCont.createFile("/vcl.conf", serverVclConfContent) + srvAppCont.addEnvVar("VCL_CONFIG", "/vcl.conf") + srvAppCont.execServer("vcl_test_server " + port) + + serverVeth := s.netInterfaces[serverInterfaceName] + serverVethAddress := serverVeth.ip4AddressString() + + echoClnContainer := s.getTransientContainerByName("client-app") + clientVclConfContent := fmt.Sprintf(vclTemplate, echoClnContainer.getContainerWorkDir(), "2") + echoClnContainer.createFile("/vcl.conf", clientVclConfContent) + + testClientCommand := "vcl_test_client -p " + proto + " " + serverVethAddress + " " + port + echoClnContainer.addEnvVar("VCL_CONFIG", "/vcl.conf") + o := echoClnContainer.exec(testClientCommand) + s.log(o) } -func (s *Veths2Suite) TestVclEchoTcp() { +func (s *VethsSuite) TestVclEchoTcp() { s.testVclEcho("tcp") } -func (s *Veths2Suite) testVclEcho(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-echo-srv" - clnInstance := "vpp-echo-cln" - echoSrv := "echo-srv" - echoCln := "echo-cln" - - err := dockerRun(srvInstance, "-v echo-srv-vol:/tmp/Configure2Veths") - if err != nil { - t.Errorf("%v", err) - return - } - defer func() { exechelper.Run("docker stop " + srvInstance) }() - - err = dockerRun(clnInstance, "-v echo-cln-vol:/tmp/Configure2Veths") - 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("Configure2Veths srv", srvInstance) - if err != nil { - t.Errorf("%v", err) - return - } - - _, err = hstExec("Configure2Veths cln", clnInstance) - if err != nil { - t.Errorf("%v", err) - return - } - - // run server app - _, err = hstExec("RunEchoServer "+proto, echoSrv) - if err != nil { - t.Errorf("echo server: %v", err) - return - } - - o, err := hstExec("RunEchoClient "+proto, echoCln) - if err != nil { - t.Errorf("echo client: %v", err) - } - fmt.Println(o) +func (s *VethsSuite) TestVclEchoUdp() { + s.testVclEcho("udp") } -func (s *Veths2Suite) TestVclRetryAttach() { - s.T().Skip() +func (s *VethsSuite) TestVclRetryAttach() { + s.skip("this test takes too long, for now it's being skipped") 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/Configure2Veths") - if err != nil { - t.Errorf("%v", err) - return - } - defer func() { exechelper.Run("docker stop " + srvInstance) }() - - err = dockerRun(clnInstance, "-v echo-cln-vol:/tmp/Configure2Veths") - 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("Configure2Veths srv-with-preset-hw-addr", srvInstance) - if err != nil { - t.Errorf("%v", err) - return - } - - _, err = hstExec("Configure2Veths cln", clnInstance) - if err != nil { - t.Errorf("%v", err) - return - } - - _, err = hstExec("RunVclEchoServer "+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("RunVclEchoClient "+proto, echoCln) - if err != nil { - t.Errorf("vcl test client: %v", err) - return - } - fmt.Println("... First test ended. Stopping VPP server now.") +func (s *VethsSuite) testRetryAttach(proto string) { + srvVppContainer := s.getTransientContainerByName("server-vpp") + + echoSrvContainer := s.getContainerByName("server-app") + + serverVclConfContent := fmt.Sprintf(vclTemplate, echoSrvContainer.getContainerWorkDir(), "1") + echoSrvContainer.createFile("/vcl.conf", serverVclConfContent) + + echoSrvContainer.addEnvVar("VCL_CONFIG", "/vcl.conf") + echoSrvContainer.execServer("vcl_test_server -p " + proto + " 12346") + + s.log("This whole test case can take around 3 minutes to run. Please be patient.") + s.log("... Running first echo client test, before disconnect.") + + serverVeth := s.netInterfaces[serverInterfaceName] + serverVethAddress := serverVeth.ip4AddressString() + + echoClnContainer := s.getTransientContainerByName("client-app") + clientVclConfContent := fmt.Sprintf(vclTemplate, echoClnContainer.getContainerWorkDir(), "2") + echoClnContainer.createFile("/vcl.conf", clientVclConfContent) + + testClientCommand := "vcl_test_client -U -p " + proto + " " + serverVethAddress + " 12346" + echoClnContainer.addEnvVar("VCL_CONFIG", "/vcl.conf") + o := echoClnContainer.exec(testClientCommand) + s.log(o) + s.log("... First test ended. Stopping VPP server now.") // Stop server-vpp-instance, start it again and then run vcl-test-client once more + srvVppContainer.vppInstance.disconnect() 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("Configure2Veths 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.") + srvVppContainer.exec(stopVppCommand) + + s.setupServerVpp() + + s.log("... 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("RunVclEchoClient "+proto, echoCln) - if err != nil { - t.Errorf("vcl test client: %v", err) - } - fmt.Println("Done.") + s.log("... Running second echo client test, after disconnect and re-attachment.") + o = echoClnContainer.exec(testClientCommand) + s.log(o) + s.log("Done.") +} + +func (s *VethsSuite) TestTcpWithLoss() { + serverVpp := s.getContainerByName("server-vpp").vppInstance + + serverVeth := s.netInterfaces[serverInterfaceName] + serverVpp.vppctl("test echo server uri tcp://%s/20022", + serverVeth.ip4AddressString()) + + clientVpp := s.getContainerByName("client-vpp").vppInstance + + // Ensure that VPP doesn't abort itself with NSIM enabled + // Warning: Removing this ping will make the test fail! + clientVpp.vppctl("ping %s", serverVeth.ip4AddressString()) + + // Add loss of packets with Network Delay Simulator + clientVpp.vppctl("set nsim poll-main-thread delay 0.01 ms bandwidth 40 gbit" + + " packet-size 1400 packets-per-drop 1000") + + clientVpp.vppctl("nsim output-feature enable-disable host-vppcln") + + // Do echo test from client-vpp container + output := clientVpp.vppctl("test echo client uri tcp://%s/20022 mbytes 50", + serverVeth.ip4AddressString()) + s.assertEqual(true, len(output) != 0) + s.assertNotContains(output, "failed: timeout") + s.log(output) }