aboutsummaryrefslogtreecommitdiffstats
path: root/extras/hs-test/vppinstance.go
diff options
context:
space:
mode:
Diffstat (limited to 'extras/hs-test/vppinstance.go')
-rw-r--r--extras/hs-test/vppinstance.go164
1 files changed, 121 insertions, 43 deletions
diff --git a/extras/hs-test/vppinstance.go b/extras/hs-test/vppinstance.go
index 1a058c8e0e3..11f68a61eac 100644
--- a/extras/hs-test/vppinstance.go
+++ b/extras/hs-test/vppinstance.go
@@ -1,7 +1,9 @@
package main
import (
+ "context"
"fmt"
+ "io"
"os"
"os/exec"
"os/signal"
@@ -11,6 +13,8 @@ import (
"time"
"github.com/edwarnicke/exechelper"
+ . "github.com/onsi/ginkgo/v2"
+ "github.com/sirupsen/logrus"
"go.fd.io/govpp"
"go.fd.io/govpp/api"
@@ -19,7 +23,6 @@ import (
"go.fd.io/govpp/binapi/interface_types"
"go.fd.io/govpp/binapi/session"
"go.fd.io/govpp/binapi/tapv2"
- "go.fd.io/govpp/binapi/vpe"
"go.fd.io/govpp/core"
)
@@ -59,6 +62,8 @@ plugins {
plugin http_static_plugin.so { enable }
plugin prom_plugin.so { enable }
plugin tlsopenssl_plugin.so { enable }
+ plugin ping_plugin.so { enable }
+ plugin nsim_plugin.so { enable }
}
logging {
@@ -78,7 +83,7 @@ type VppInstance struct {
container *Container
additionalConfig []Stanza
connection *core.Connection
- apiChannel api.Channel
+ apiStream api.Stream
cpus []int
}
@@ -103,6 +108,10 @@ func (vpp *VppInstance) getEtcDir() string {
}
func (vpp *VppInstance) start() error {
+ // Replace default logger in govpp with our own
+ govppLogger := logrus.New()
+ govppLogger.SetOutput(io.MultiWriter(vpp.getSuite().logger.Writer(), GinkgoWriter))
+ core.SetLogger(govppLogger)
// Create folders
containerWorkDir := vpp.container.getContainerWorkDir()
@@ -131,9 +140,10 @@ func (vpp *VppInstance) start() error {
vpp.container.createFile(vppcliFileName, cliContent)
vpp.container.exec("chmod 0755 " + vppcliFileName)
+ vpp.getSuite().log("starting vpp")
if *isVppDebug {
sig := make(chan os.Signal, 1)
- signal.Notify(sig, syscall.SIGINT)
+ signal.Notify(sig, syscall.SIGQUIT)
cont := make(chan bool, 1)
go func() {
<-sig
@@ -143,7 +153,7 @@ func (vpp *VppInstance) start() error {
vpp.container.execServer("su -c \"vpp -c " + startupFileName + " &> /proc/1/fd/1\"")
fmt.Println("run following command in different terminal:")
fmt.Println("docker exec -it " + vpp.container.name + " gdb -ex \"attach $(docker exec " + vpp.container.name + " pidof vpp)\"")
- fmt.Println("Afterwards press CTRL+C to continue")
+ fmt.Println("Afterwards press CTRL+\\ to continue")
<-cont
fmt.Println("continuing...")
} else {
@@ -151,6 +161,7 @@ func (vpp *VppInstance) start() error {
vpp.container.execServer("su -c \"vpp -c " + startupFileName + " &> /proc/1/fd/1\"")
}
+ vpp.getSuite().log("connecting to vpp")
// Connect to VPP and store the connection
sockAddress := vpp.container.getHostWorkDir() + defaultApiSocketFilePath
conn, connEv, err := govpp.AsyncConnect(
@@ -158,7 +169,7 @@ func (vpp *VppInstance) start() error {
core.DefaultMaxReconnectAttempts,
core.DefaultReconnectInterval)
if err != nil {
- fmt.Println("async connect error: ", err)
+ vpp.getSuite().log("async connect error: " + fmt.Sprint(err))
return err
}
vpp.connection = conn
@@ -166,24 +177,19 @@ func (vpp *VppInstance) start() error {
// ... wait for Connected event
e := <-connEv
if e.State != core.Connected {
- fmt.Println("connecting to VPP failed: ", e.Error)
+ vpp.getSuite().log("connecting to VPP failed: " + fmt.Sprint(e.Error))
}
- // ... check compatibility of used messages
- ch, err := conn.NewAPIChannel()
+ ch, err := conn.NewStream(
+ context.Background(),
+ core.WithRequestSize(50),
+ core.WithReplySize(50),
+ core.WithReplyTimeout(time.Second*10))
if err != nil {
- fmt.Println("creating channel failed: ", err)
+ vpp.getSuite().log("creating stream failed: " + fmt.Sprint(err))
return err
}
- if err := ch.CheckCompatiblity(vpe.AllMessages()...); err != nil {
- fmt.Println("compatibility error: ", err)
- return err
- }
- if err := ch.CheckCompatiblity(interfaces.AllMessages()...); err != nil {
- fmt.Println("compatibility error: ", err)
- return err
- }
- vpp.apiChannel = ch
+ vpp.apiStream = ch
return nil
}
@@ -207,7 +213,7 @@ func (vpp *VppInstance) GetSessionStat(stat string) int {
tokens := strings.Split(strings.TrimSpace(line), " ")
val, err := strconv.Atoi(tokens[0])
if err != nil {
- vpp.getSuite().FailNow("failed to parse stat value %s", err)
+ Fail("failed to parse stat value %s" + fmt.Sprint(err))
return 0
}
return val
@@ -217,6 +223,7 @@ func (vpp *VppInstance) GetSessionStat(stat string) int {
}
func (vpp *VppInstance) waitForApp(appName string, timeout int) {
+ vpp.getSuite().log("waiting for app " + appName)
for i := 0; i < timeout; i++ {
o := vpp.vppctl("show app")
if strings.Contains(o, appName) {
@@ -230,29 +237,50 @@ func (vpp *VppInstance) waitForApp(appName string, timeout int) {
func (vpp *VppInstance) createAfPacket(
veth *NetInterface,
) (interface_types.InterfaceIndex, error) {
- createReq := &af_packet.AfPacketCreateV2{
+ createReq := &af_packet.AfPacketCreateV3{
+ Mode: 1,
UseRandomHwAddr: true,
HostIfName: veth.Name(),
+ Flags: af_packet.AfPacketFlags(11),
}
if veth.hwAddress != (MacAddress{}) {
createReq.UseRandomHwAddr = false
createReq.HwAddr = veth.hwAddress
}
- createReply := &af_packet.AfPacketCreateV2Reply{}
- if err := vpp.apiChannel.SendRequest(createReq).ReceiveReply(createReply); err != nil {
+ vpp.getSuite().log("create af-packet interface " + veth.Name())
+ if err := vpp.apiStream.SendMsg(createReq); err != nil {
+ vpp.getSuite().hstFail()
+ return 0, err
+ }
+ replymsg, err := vpp.apiStream.RecvMsg()
+ if err != nil {
+ return 0, err
+ }
+ reply := replymsg.(*af_packet.AfPacketCreateV3Reply)
+ err = api.RetvalToVPPApiError(reply.Retval)
+ if err != nil {
return 0, err
}
- veth.index = createReply.SwIfIndex
+
+ veth.index = reply.SwIfIndex
// Set to up
upReq := &interfaces.SwInterfaceSetFlags{
SwIfIndex: veth.index,
Flags: interface_types.IF_STATUS_API_FLAG_ADMIN_UP,
}
- upReply := &interfaces.SwInterfaceSetFlagsReply{}
- if err := vpp.apiChannel.SendRequest(upReq).ReceiveReply(upReply); err != nil {
+ vpp.getSuite().log("set af-packet interface " + veth.Name() + " up")
+ if err := vpp.apiStream.SendMsg(upReq); err != nil {
+ return 0, err
+ }
+ replymsg, err = vpp.apiStream.RecvMsg()
+ if err != nil {
+ return 0, err
+ }
+ reply2 := replymsg.(*interfaces.SwInterfaceSetFlagsReply)
+ if err = api.RetvalToVPPApiError(reply2.Retval); err != nil {
return 0, err
}
@@ -271,9 +299,18 @@ func (vpp *VppInstance) createAfPacket(
SwIfIndex: veth.index,
Prefix: veth.addressWithPrefix(),
}
- addressReply := &interfaces.SwInterfaceAddDelAddressReply{}
- if err := vpp.apiChannel.SendRequest(addressReq).ReceiveReply(addressReply); err != nil {
+ vpp.getSuite().log("af-packet interface " + veth.Name() + " add address " + veth.ip4Address)
+ if err := vpp.apiStream.SendMsg(addressReq); err != nil {
+ return 0, err
+ }
+ replymsg, err = vpp.apiStream.RecvMsg()
+ if err != nil {
+ return 0, err
+ }
+ reply3 := replymsg.(*interfaces.SwInterfaceAddDelAddressReply)
+ err = api.RetvalToVPPApiError(reply3.Retval)
+ if err != nil {
return 0, err
}
@@ -285,23 +322,41 @@ func (vpp *VppInstance) addAppNamespace(
ifx interface_types.InterfaceIndex,
namespaceId string,
) error {
- req := &session.AppNamespaceAddDelV2{
+ req := &session.AppNamespaceAddDelV4{
+ IsAdd: true,
Secret: secret,
SwIfIndex: ifx,
NamespaceID: namespaceId,
+ SockName: defaultApiSocketFilePath,
}
- reply := &session.AppNamespaceAddDelV2Reply{}
- if err := vpp.apiChannel.SendRequest(req).ReceiveReply(reply); err != nil {
+ vpp.getSuite().log("add app namespace " + namespaceId)
+ if err := vpp.apiStream.SendMsg(req); err != nil {
+ return err
+ }
+ replymsg, err := vpp.apiStream.RecvMsg()
+ if err != nil {
+ return err
+ }
+ reply := replymsg.(*session.AppNamespaceAddDelV4Reply)
+ if err = api.RetvalToVPPApiError(reply.Retval); err != nil {
return err
}
sessionReq := &session.SessionEnableDisable{
IsEnable: true,
}
- sessionReply := &session.SessionEnableDisableReply{}
- if err := vpp.apiChannel.SendRequest(sessionReq).ReceiveReply(sessionReply); err != nil {
+ vpp.getSuite().log("enable app namespace " + namespaceId)
+ if err := vpp.apiStream.SendMsg(sessionReq); err != nil {
+ return err
+ }
+ replymsg, err = vpp.apiStream.RecvMsg()
+ if err != nil {
+ return err
+ }
+ reply2 := replymsg.(*session.SessionEnableDisableReply)
+ if err = api.RetvalToVPPApiError(reply2.Retval); err != nil {
return err
}
@@ -316,40 +371,64 @@ func (vpp *VppInstance) createTap(
if len(tapId) > 0 {
id = tapId[0]
}
- createTapReq := &tapv2.TapCreateV2{
+ createTapReq := &tapv2.TapCreateV3{
ID: id,
HostIfNameSet: true,
HostIfName: tap.Name(),
HostIP4PrefixSet: true,
HostIP4Prefix: tap.ip4AddressWithPrefix(),
}
- createTapReply := &tapv2.TapCreateV2Reply{}
+ vpp.getSuite().log("create tap interface " + tap.Name())
// Create tap interface
- if err := vpp.apiChannel.SendRequest(createTapReq).ReceiveReply(createTapReply); err != nil {
+ if err := vpp.apiStream.SendMsg(createTapReq); err != nil {
+ return err
+ }
+ replymsg, err := vpp.apiStream.RecvMsg()
+ if err != nil {
+ return err
+ }
+ reply := replymsg.(*tapv2.TapCreateV3Reply)
+ if err = api.RetvalToVPPApiError(reply.Retval); err != nil {
return err
}
// Add address
addAddressReq := &interfaces.SwInterfaceAddDelAddress{
IsAdd: true,
- SwIfIndex: createTapReply.SwIfIndex,
+ SwIfIndex: reply.SwIfIndex,
Prefix: tap.peer.addressWithPrefix(),
}
- addAddressReply := &interfaces.SwInterfaceAddDelAddressReply{}
- if err := vpp.apiChannel.SendRequest(addAddressReq).ReceiveReply(addAddressReply); err != nil {
+ vpp.getSuite().log("tap interface " + tap.Name() + " add address " + tap.peer.ip4Address)
+ if err := vpp.apiStream.SendMsg(addAddressReq); err != nil {
+ return err
+ }
+ replymsg, err = vpp.apiStream.RecvMsg()
+ if err != nil {
+ return err
+ }
+ reply2 := replymsg.(*interfaces.SwInterfaceAddDelAddressReply)
+ if err = api.RetvalToVPPApiError(reply2.Retval); err != nil {
return err
}
// Set interface to up
upReq := &interfaces.SwInterfaceSetFlags{
- SwIfIndex: createTapReply.SwIfIndex,
+ SwIfIndex: reply.SwIfIndex,
Flags: interface_types.IF_STATUS_API_FLAG_ADMIN_UP,
}
- upReply := &interfaces.SwInterfaceSetFlagsReply{}
- if err := vpp.apiChannel.SendRequest(upReq).ReceiveReply(upReply); err != nil {
+ vpp.getSuite().log("set tap interface " + tap.Name() + " up")
+ if err := vpp.apiStream.SendMsg(upReq); err != nil {
+ return err
+ }
+ replymsg, err = vpp.apiStream.RecvMsg()
+ if err != nil {
+ return err
+ }
+ reply3 := replymsg.(*interfaces.SwInterfaceSetFlagsReply)
+ if err = api.RetvalToVPPApiError(reply3.Retval); err != nil {
return err
}
@@ -360,14 +439,13 @@ func (vpp *VppInstance) saveLogs() {
logTarget := vpp.container.getLogDirPath() + "vppinstance-" + vpp.container.name + ".log"
logSource := vpp.container.getHostWorkDir() + defaultLogFilePath
cmd := exec.Command("cp", logSource, logTarget)
- vpp.getSuite().T().Helper()
vpp.getSuite().log(cmd.String())
cmd.Run()
}
func (vpp *VppInstance) disconnect() {
vpp.connection.Disconnect()
- vpp.apiChannel.Close()
+ vpp.apiStream.Close()
}
func (vpp *VppInstance) generateCpuConfig() string {