ffa3f60290
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
98 lines
2.0 KiB
Go
98 lines
2.0 KiB
Go
package main
|
|
|
|
import (
|
|
"time"
|
|
)
|
|
|
|
const (
|
|
// These correspond to names used in yaml config
|
|
serverInterfaceName = "vppsrv"
|
|
clientInterfaceName = "vppcln"
|
|
)
|
|
|
|
type VethsSuite struct {
|
|
HstSuite
|
|
}
|
|
|
|
var ConvertedTests = map[string]any{
|
|
"TestVeths/TestEchoBuiltin": "",
|
|
"TestVeths/TestHttpCli": "",
|
|
"TestVeths/TestVclEchoTcp": "",
|
|
"TestVeths/TestVclRetryAttach": "",
|
|
}
|
|
|
|
func (s *VethsSuite) SetupSuite() {
|
|
time.Sleep(1 * time.Second)
|
|
|
|
s.configureNetworkTopology("2peerVeth")
|
|
|
|
s.loadContainerTopology("2peerVeth")
|
|
}
|
|
|
|
func (s *VethsSuite) SetupTest() {
|
|
s.SetupVolumes()
|
|
s.SetupContainers()
|
|
|
|
// TODO remove this after all tests are converted to configuration from test suite
|
|
if _, ok := ConvertedTests[s.T().Name()]; !ok {
|
|
return
|
|
}
|
|
|
|
// Setup test conditions
|
|
|
|
var startupConfig Stanza
|
|
startupConfig.
|
|
NewStanza("session").
|
|
Append("enable").
|
|
Append("use-app-socket-api").Close()
|
|
|
|
// ... For server
|
|
serverContainer := s.getContainerByName("server-vpp")
|
|
|
|
serverVpp, _ := serverContainer.newVppInstance(startupConfig)
|
|
s.assertNotNil(serverVpp)
|
|
|
|
s.setupServerVpp()
|
|
|
|
// ... For client
|
|
clientContainer := s.getContainerByName("client-vpp")
|
|
|
|
clientVpp, _ := clientContainer.newVppInstance(startupConfig)
|
|
s.assertNotNil(clientVpp)
|
|
|
|
s.setupClientVpp()
|
|
}
|
|
|
|
func (s *VethsSuite) setupServerVpp() {
|
|
serverVpp := s.getContainerByName("server-vpp").vppInstance
|
|
|
|
err := serverVpp.start()
|
|
s.assertNil(err)
|
|
|
|
serverVeth := s.veths["vppsrv"]
|
|
idx, err := serverVpp.createAfPacket(serverVeth)
|
|
s.assertNil(err)
|
|
s.assertNotEqual(0, idx)
|
|
|
|
namespaceSecret := "1"
|
|
err = serverVpp.addAppNamespace(1, idx, namespaceSecret)
|
|
s.assertNil(err)
|
|
|
|
}
|
|
|
|
func (s *VethsSuite) setupClientVpp() {
|
|
clientVpp := s.getContainerByName("client-vpp").vppInstance
|
|
|
|
err := clientVpp.start()
|
|
s.assertNil(err)
|
|
|
|
clientVeth := s.veths["vppcln"]
|
|
idx, err := clientVpp.createAfPacket(clientVeth)
|
|
s.assertNil(err)
|
|
s.assertNotEqual(0, idx)
|
|
|
|
clientNamespaceSecret := "2"
|
|
err = clientVpp.addAppNamespace(2, idx, clientNamespaceSecret)
|
|
s.assertNil(err)
|
|
}
|