hs-test: abstract away topology from test cases

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

diff --git a/extras/hs-test/echo_test.go b/extras/hs-test/echo_test.go
index 9f91e2a..9bc8f76 100755 (executable)
--- a/extras/hs-test/echo_test.go
+++ b/extras/hs-test/echo_test.go
@@ -2,30 +2,21 @@ package main
 
 import (
        "fmt"
-
-       "github.com/edwarnicke/exechelper"
 )
 
 func (s *VethsSuite) TestEchoBuiltin() {
-       srvInstance := "echo-srv-internal"
-       clnInstance := "echo-cln-internal"
-
-       s.assertNil(dockerRun(srvInstance, ""), "failed to start docker (srv)")
-       defer func() { exechelper.Run("docker stop " + srvInstance) }()
-
-       s.assertNil(dockerRun(clnInstance, ""), "failed to start docker (cln)")
-       defer func() { exechelper.Run("docker stop " + clnInstance) }()
-
-       _, err := hstExec("Configure2Veths srv", srvInstance)
+       serverContainer := s.getContainerByName("server-vpp")
+       _, err := serverContainer.execAction("Configure2Veths srv")
        s.assertNil(err)
 
-       _, err = hstExec("Configure2Veths cln", clnInstance)
+       clientContainer := s.getContainerByName("client-vpp")
+       _, err = clientContainer.execAction("Configure2Veths cln")
        s.assertNil(err)
 
-       _, err = hstExec("RunEchoSrvInternal private-segment-size 1g fifo-size 4 no-echo", srvInstance)
+       _, err = serverContainer.execAction("RunEchoSrvInternal private-segment-size 1g fifo-size 4 no-echo")
        s.assertNil(err)
 
-       o, err := hstExec("RunEchoClnInternal nclients 10000 bytes 1 syn-timeout 100 test-timeout 100 no-return private-segment-size 1g fifo-size 4", clnInstance)
+       o, err := clientContainer.execAction("RunEchoClnInternal nclients 10000 bytes 1 syn-timeout 100 test-timeout 100 no-return private-segment-size 1g fifo-size 4")
        s.assertNil(err)
        fmt.Println(o)
 }