ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hs-test: configure VPP from test context

Browse Source 
Instead of configuring VPP instances running inside of a container,
now the configuration is going to be done from within the test context
by using binary API and shared volume that exposes api socket.

This converts just some of the test cases, rest is to follow.

Type: test
Signed-off-by: Maros Ondrejicka <maros.ondrejicka@pantheon.tech>
Change-Id: I87e4ab15de488f0eebb01ff514596265fc2a787f
This commit is contained in:
Maros Ondrejicka
2023-01-26 10:07:29 +01:00
committed by Florin Coras
parent 7a6532bb9f
commit ffa3f60290
16 changed files with 895 additions and 421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
extras/hs-test/ldp_test.go
View File

@ -10,12 +10,10 @@ func (s *VethsSuite) TestLDPreloadIperfVpp() {
var clnVclConf, srvVclConf Stanza
serverContainer := s.getContainerByName("server-vpp")
serverVolume := serverContainer.getVolumeByHostDir("/tmp/server")
srvVcl := serverVolume.containerDir + "/vcl_srv.conf"
srvVcl := serverContainer.GetHostWorkDir() + "/vcl_srv.conf"
clientContainer := s.getContainerByName("client-vpp")
clientVolume := clientContainer.getVolumeByHostDir("/tmp/client")
clnVcl := clientVolume.containerDir + "/vcl_cln.conf"
clnVcl := clientContainer.GetHostWorkDir() + "/vcl_cln.conf"
ldpreload := os.Getenv("HST_LDPRELOAD")
s.assertNotEqual("", ldpreload)
@ -28,20 +26,14 @@ func (s *VethsSuite) TestLDPreloadIperfVpp() {
s.log("starting VPPs")
originalWorkDir := serverContainer.workDir
serverContainer.workDir = serverVolume.containerDir
_, err := serverContainer.execAction("Configure2Veths srv")
s.assertNil(err)
serverContainer.workDir = originalWorkDir
originalWorkDir = clientContainer.workDir
clientContainer.workDir = clientVolume.containerDir
_, err = clientContainer.execAction("Configure2Veths cln")
s.assertNil(err)
clientContainer.workDir = originalWorkDir
clientAppSocketApi := fmt.Sprintf("app-socket-api %s/var/run/app_ns_sockets/2",
clientVolume.containerDir)
clientContainer.GetContainerWorkDir())
err = clnVclConf.
NewStanza("vcl").
Append("rx-fifo-size 4000000").
@ -54,7 +46,7 @@ func (s *VethsSuite) TestLDPreloadIperfVpp() {
s.assertNil(err)
serverAppSocketApi := fmt.Sprintf("app-socket-api %s/var/run/app_ns_sockets/1",
serverVolume.containerDir)
serverContainer.GetContainerWorkDir())
err = srvVclConf.
NewStanza("vcl").
Append("rx-fifo-size 4000000").