hs-test: refactor test cases from ns suite

[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 1b24e08..b32d66e 100644 (file)
--- a/extras/hs-test/echo_test.go
+++ b/extras/hs-test/echo_test.go
@@ -2,18 +2,16 @@ package main
 
 func (s *VethsSuite) TestEchoBuiltin() {
        serverVpp := s.getContainerByName("server-vpp").vppInstance
-       serverVeth := s.veths["vppsrv"]
+       serverVeth := s.netInterfaces["vppsrv"]
 
-       _, err := serverVpp.vppctl("test echo server " +
+       serverVpp.vppctl("test echo server " +
                " private-segment-size 1g fifo-size 4 no-echo" +
-               " uri tcp://" + serverVeth.Address() + "/1234")
-       s.assertNil(err)
+               " uri tcp://" + serverVeth.Ip4AddressString() + "/1234")
 
        clientVpp := s.getContainerByName("client-vpp").vppInstance
 
-       o, err := clientVpp.vppctl("test echo client nclients 10000 bytes 1" +
+       o := clientVpp.vppctl("test echo client nclients 10000 bytes 1" +
                " syn-timeout 100 test-timeout 100 no-return private-segment-size 1g" +
-               " fifo-size 4 uri tcp://" + serverVeth.Address() + "/1234")
-       s.assertNil(err)
+               " fifo-size 4 uri tcp://" + serverVeth.Ip4AddressString() + "/1234")
        s.log(o)
 }