hs-test: configure VPP from test context

[vpp.git] / extras / hs-test / http_test.go
diff --git a/extras/hs-test/http_test.go b/extras/hs-test/http_test.go

index 28d27bb..52b7c39 100644 (file)
--- a/extras/hs-test/http_test.go
+++ b/extras/hs-test/http_test.go
@@ -31,22 +31,18 @@ func (s *VethsSuite) TestHttpCli() {
         serverContainer := s.getContainerByName("server-vpp")
         clientContainer := s.getContainerByName("client-vpp")
  
-       _, err := serverContainer.execAction("Configure2Veths srv")
-       s.assertNil(err)
-
-       _, err = clientContainer.execAction("Configure2Veths cln")
-       s.assertNil(err)
-
-       s.log("configured IPs...")
+       serverVeth := s.veths["vppsrv"]
  
-       _, err = serverContainer.execAction("RunHttpCliSrv")
+       _, err := serverContainer.vppInstance.vppctl("http cli server")
         s.assertNil(err)
  
-       s.log("configured http server")
+       uri := "http://" + serverVeth.Address() + "/80"
  
-       o, err := clientContainer.execAction("RunHttpCliCln /show/version")
+       o, err := clientContainer.vppInstance.vppctl("http cli client" +
+               " uri " + uri + " query /show/version")
         s.assertNil(err)
  
+       s.log(o)
         s.assertContains(o, "<html>", "<html> not found in the result!")
  }