hs-test: support for multiple workers

[vpp.git] / extras / hs-test / vppinstance.go

diff --git a/extras/hs-test/vppinstance.go b/extras/hs-test/vppinstance.go
index c6771f6..a9b97bc 100644 (file)
--- a/extras/hs-test/vppinstance.go
+++ b/extras/hs-test/vppinstance.go
@@ -72,34 +72,35 @@ const (
 
 type VppInstance struct {
        container        *Container
-       additionalConfig Stanza
+       additionalConfig []Stanza
        connection       *core.Connection
        apiChannel       api.Channel
+       cpus             []int
 }
 
-func (vpp *VppInstance) Suite() *HstSuite {
+func (vpp *VppInstance) getSuite() *HstSuite {
        return vpp.container.suite
 }
 
 func (vpp *VppInstance) getCliSocket() string {
-       return fmt.Sprintf("%s%s", vpp.container.GetContainerWorkDir(), defaultCliSocketFilePath)
+       return fmt.Sprintf("%s%s", vpp.container.getContainerWorkDir(), defaultCliSocketFilePath)
 }
 
 func (vpp *VppInstance) getRunDir() string {
-       return vpp.container.GetContainerWorkDir() + "/var/run/vpp"
+       return vpp.container.getContainerWorkDir() + "/var/run/vpp"
 }
 
 func (vpp *VppInstance) getLogDir() string {
-       return vpp.container.GetContainerWorkDir() + "/var/log/vpp"
+       return vpp.container.getContainerWorkDir() + "/var/log/vpp"
 }
 
 func (vpp *VppInstance) getEtcDir() string {
-       return vpp.container.GetContainerWorkDir() + "/etc/vpp"
+       return vpp.container.getContainerWorkDir() + "/etc/vpp"
 }
 
 func (vpp *VppInstance) start() error {
        // Create folders
-       containerWorkDir := vpp.container.GetContainerWorkDir()
+       containerWorkDir := vpp.container.getContainerWorkDir()
 
        vpp.container.exec("mkdir --mode=0700 -p " + vpp.getRunDir())
        vpp.container.exec("mkdir --mode=0700 -p " + vpp.getLogDir())
@@ -113,11 +114,20 @@ func (vpp *VppInstance) start() error {
                defaultApiSocketFilePath,
                defaultLogFilePath,
        )
-       configContent += vpp.additionalConfig.ToString()
+       configContent += vpp.generateCpuConfig()
+       for _, c := range vpp.additionalConfig {
+               configContent += c.toString()
+       }
        startupFileName := vpp.getEtcDir() + "/startup.conf"
        vpp.container.createFile(startupFileName, configContent)
 
-       if *IsVppDebug {
+       // create wrapper script for vppctl with proper CLI socket path
+       cliContent := "#!/usr/bin/bash\nvppctl -s " + vpp.getRunDir() + "/cli.sock"
+       vppcliFileName := "/usr/bin/vppcli"
+       vpp.container.createFile(vppcliFileName, cliContent)
+       vpp.container.exec("chmod 0755 " + vppcliFileName)
+
+       if *isVppDebug {
                sig := make(chan os.Signal, 1)
                signal.Notify(sig, syscall.SIGINT)
                cont := make(chan bool, 1)
@@ -139,7 +149,7 @@ func (vpp *VppInstance) start() error {
        }
 
        // Connect to VPP and store the connection
-       sockAddress := vpp.container.GetHostWorkDir() + defaultApiSocketFilePath
+       sockAddress := vpp.container.getHostWorkDir() + defaultApiSocketFilePath
        conn, connEv, err := govpp.AsyncConnect(
                sockAddress,
                core.DefaultMaxReconnectAttempts,
@@ -175,9 +185,9 @@ func (vpp *VppInstance) vppctl(command string, arguments ...any) string {
        vppCliCommand := fmt.Sprintf(command, arguments...)
        containerExecCommand := fmt.Sprintf("docker exec --detach=false %[1]s vppctl -s %[2]s %[3]s",
                vpp.container.name, vpp.getCliSocket(), vppCliCommand)
-       vpp.Suite().log(containerExecCommand)
+       vpp.getSuite().log(containerExecCommand)
        output, err := exechelper.CombinedOutput(containerExecCommand)
-       vpp.Suite().assertNil(err)
+       vpp.getSuite().assertNil(err)
 
        return string(output)
 }
@@ -190,8 +200,7 @@ func (vpp *VppInstance) waitForApp(appName string, timeout int) {
                }
                time.Sleep(1 * time.Second)
        }
-       vpp.Suite().assertNil(1, "Timeout while waiting for app '%s'", appName)
-       return
+       vpp.getSuite().assertNil(1, "Timeout while waiting for app '%s'", appName)
 }
 
 func (vpp *VppInstance) createAfPacket(
@@ -201,20 +210,20 @@ func (vpp *VppInstance) createAfPacket(
                UseRandomHwAddr: true,
                HostIfName:      veth.Name(),
        }
-       if veth.HwAddress() != (MacAddress{}) {
+       if veth.hwAddress != (MacAddress{}) {
                createReq.UseRandomHwAddr = false
-               createReq.HwAddr = veth.HwAddress()
+               createReq.HwAddr = veth.hwAddress
        }
        createReply := &af_packet.AfPacketCreateV2Reply{}
 
        if err := vpp.apiChannel.SendRequest(createReq).ReceiveReply(createReply); err != nil {
                return 0, err
        }
-       veth.SetIndex(createReply.SwIfIndex)
+       veth.index = createReply.SwIfIndex
 
        // Set to up
        upReq := &interfaces.SwInterfaceSetFlags{
-               SwIfIndex: veth.Index(),
+               SwIfIndex: veth.index,
                Flags:     interface_types.IF_STATUS_API_FLAG_ADMIN_UP,
        }
        upReply := &interfaces.SwInterfaceSetFlagsReply{}
@@ -224,19 +233,19 @@ func (vpp *VppInstance) createAfPacket(
        }
 
        // Add address
-       if veth.AddressWithPrefix() == (AddressWithPrefix{}) {
+       if veth.addressWithPrefix() == (AddressWithPrefix{}) {
                var err error
                var ip4Address string
-               if ip4Address, err = veth.addresser.NewIp4Address(veth.Peer().networkNumber); err == nil {
-                       veth.SetAddress(ip4Address)
+               if ip4Address, err = veth.addresser.newIp4Address(veth.peer.networkNumber); err == nil {
+                       veth.ip4Address = ip4Address
                } else {
                        return 0, err
                }
        }
        addressReq := &interfaces.SwInterfaceAddDelAddress{
                IsAdd:     true,
-               SwIfIndex: veth.Index(),
-               Prefix:    veth.AddressWithPrefix(),
+               SwIfIndex: veth.index,
+               Prefix:    veth.addressWithPrefix(),
        }
        addressReply := &interfaces.SwInterfaceAddDelAddressReply{}
 
@@ -244,7 +253,7 @@ func (vpp *VppInstance) createAfPacket(
                return 0, err
        }
 
-       return veth.Index(), nil
+       return veth.index, nil
 }
 
 func (vpp *VppInstance) addAppNamespace(
@@ -288,7 +297,7 @@ func (vpp *VppInstance) createTap(
                HostIfNameSet:    true,
                HostIfName:       tap.Name(),
                HostIP4PrefixSet: true,
-               HostIP4Prefix:    tap.IP4AddressWithPrefix(),
+               HostIP4Prefix:    tap.ip4AddressWithPrefix(),
        }
        createTapReply := &tapv2.TapCreateV2Reply{}
 
@@ -301,7 +310,7 @@ func (vpp *VppInstance) createTap(
        addAddressReq := &interfaces.SwInterfaceAddDelAddress{
                IsAdd:     true,
                SwIfIndex: createTapReply.SwIfIndex,
-               Prefix:    tap.Peer().AddressWithPrefix(),
+               Prefix:    tap.peer.addressWithPrefix(),
        }
        addAddressReply := &interfaces.SwInterfaceAddDelAddressReply{}
 
@@ -325,10 +334,10 @@ func (vpp *VppInstance) createTap(
 
 func (vpp *VppInstance) saveLogs() {
        logTarget := vpp.container.getLogDirPath() + "vppinstance-" + vpp.container.name + ".log"
-       logSource := vpp.container.GetHostWorkDir() + defaultLogFilePath
+       logSource := vpp.container.getHostWorkDir() + defaultLogFilePath
        cmd := exec.Command("cp", logSource, logTarget)
-       vpp.Suite().T().Helper()
-       vpp.Suite().log(cmd.String())
+       vpp.getSuite().T().Helper()
+       vpp.getSuite().log(cmd.String())
        cmd.Run()
 }
 
@@ -336,3 +345,25 @@ func (vpp *VppInstance) disconnect() {
        vpp.connection.Disconnect()
        vpp.apiChannel.Close()
 }
+
+func (vpp *VppInstance) generateCpuConfig() string {
+       var c Stanza
+       var s string
+       if len(vpp.cpus) < 1 {
+               return ""
+       }
+       c.newStanza("cpu").
+               append(fmt.Sprintf("main-core %d", vpp.cpus[0]))
+       workers := vpp.cpus[1:]
+
+       if len(workers) > 0 {
+               for i := 0; i < len(workers); i++ {
+                       if i != 0 {
+                               s = s + ", "
+                       }
+                       s = s + fmt.Sprintf("%d", workers[i])
+               }
+               c.append(fmt.Sprintf("corelist-workers %s", s))
+       }
+       return c.close().toString()
+}