hsa: unify echo test setup

[vpp.git] / extras / hs-test / echo_test.go

diff --git a/extras/hs-test/echo_test.go b/extras/hs-test/echo_test.go
old mode 100755 (executable)
new mode 100644 (file)
index 74ff4cb..fc221aa
--- a/extras/hs-test/echo_test.go
+++ b/extras/hs-test/echo_test.go
@@ -1,51 +1,44 @@
 package main
 
-import (
-       "fmt"
-
-       "github.com/edwarnicke/exechelper"
-)
-
-func (s *Veths2Suite) TestEchoBuiltin() {
-       t := s.T()
-       srvInstance := "echo-srv-internal"
-       clnInstance := "echo-cln-internal"
-       err := dockerRun(srvInstance, "")
-       if err != nil {
-               t.Errorf("%v", err)
-               return
-       }
-       defer func() { exechelper.Run("docker stop " + srvInstance) }()
-
-       err = dockerRun(clnInstance, "")
-       if err != nil {
-               t.Errorf("%v", err)
-               return
-       }
-       defer func() { exechelper.Run("docker stop " + clnInstance) }()
-
-       _, 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
-       }
-
-       _, err = hstExec("RunEchoSrvInternal private-segment-size 1g fifo-size 4 no-echo", srvInstance)
-       if err != nil {
-               t.Errorf("%v", err)
-               return
-       }
-
-       o, err := hstExec("RunEchoClnInternal nclients 10000 bytes 1 syn-timeout 100 test-timeout 100 no-return private-segment-size 1g fifo-size 4", clnInstance)
-       if err != nil {
-               t.Errorf("%v", err)
-               return
-       }
-       fmt.Println(o)
+func (s *VethsSuite) TestEchoBuiltin() {
+       serverVpp := s.getContainerByName("server-vpp").vppInstance
+       serverVeth := s.netInterfaces["vppsrv"]
+
+       serverVpp.vppctl("test echo server " +
+               " uri tcp://" + serverVeth.ip4AddressString() + "/1234")
+
+       clientVpp := s.getContainerByName("client-vpp").vppInstance
+
+       o := clientVpp.vppctl("test echo client nclients 100 bytes 1 verbose" +
+               " syn-timeout 100 test-timeout 100" +
+               " uri tcp://" + serverVeth.ip4AddressString() + "/1234")
+       s.log(o)
+       s.assertNotContains(o, "failed:")
+}
+
+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 verbose echo-bytes mbytes 50",
+               serverVeth.ip4AddressString())
+       s.log(output)
+       s.assertNotEqual(len(output), 0)
+       s.assertNotContains(output, "failed: timeout")
 }