hs-test: add vppctl wrapper script

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

diff --git a/extras/hs-test/vppinstance.go b/extras/hs-test/vppinstance.go
index 4092d35..89e67d0 100644 (file)
--- a/extras/hs-test/vppinstance.go
+++ b/extras/hs-test/vppinstance.go
@@ -2,11 +2,15 @@ package main
 
 import (
        "fmt"
-       "github.com/edwarnicke/exechelper"
+       "os"
        "os/exec"
+       "os/signal"
        "strings"
+       "syscall"
        "time"
 
+       "github.com/edwarnicke/exechelper"
+
        "go.fd.io/govpp"
        "go.fd.io/govpp/api"
        "go.fd.io/govpp/binapi/af_packet"
@@ -113,8 +117,32 @@ func (vpp *VppInstance) start() error {
        startupFileName := vpp.getEtcDir() + "/startup.conf"
        vpp.container.createFile(startupFileName, configContent)
 
-       // Start VPP
-       vpp.container.execServer("su -c \"vpp -c " + startupFileName + " &> /proc/1/fd/1\"")
+       // 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)
+               go func() {
+                       <-sig
+                       cont <- true
+               }()
+
+               // Start VPP in GDB and wait for user to attach it
+               vpp.container.execServer("su -c \"gdb -ex run --args 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 gdb)\"")
+               fmt.Println("Afterwards press CTRL+C to continue")
+               <-cont
+               fmt.Println("continuing...")
+       } else {
+               // Start VPP
+               vpp.container.execServer("su -c \"vpp -c " + startupFileName + " &> /proc/1/fd/1\"")
+       }
 
        // Connect to VPP and store the connection
        sockAddress := vpp.container.GetHostWorkDir() + defaultApiSocketFilePath